ooo-build r12019 - in trunk: . patches/dev300 patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Thu Mar 27 13:20:55 2008
New Revision: 12019
URL: http://svn.gnome.org/viewvc/ooo-build?rev=12019&view=rev

Log:
2008-03-27  Jan Holesovsky  <kendy suse cz>

        * patches/src680/cws-commit-patch-default-dev300.diff: 'cvs rm' the
          files that are removed in the patch.

        * patches/dev300/unxsplash-rework.diff,
          patches/dev300/unxsplash-rpath.diff,
          patches/dev300/apply: Make oosplash.bin working with dev300.


Added:
   trunk/patches/dev300/unxsplash-rpath.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply
   trunk/patches/dev300/unxsplash-rework.diff
   trunk/patches/src680/cws-commit-patch-default-dev300.diff

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Thu Mar 27 13:20:55 2008
@@ -521,6 +521,9 @@
 # when OOo fails during startup, don't loop endlessly
 unxsplash-finish-on-hangup.diff, i#60696, n#357659, jholesov
 
+# the 'three layer OOo' needs rpath
+unxsplash-rpath.diff, i#60696, jholesov
+
 
 [ WriterFixes ]
 # Allows to copy/paste html text which is between 2 unknown tags.

Modified: trunk/patches/dev300/unxsplash-rework.diff
==============================================================================
--- trunk/patches/dev300/unxsplash-rework.diff	(original)
+++ trunk/patches/dev300/unxsplash-rework.diff	Thu Mar 27 13:20:55 2008
@@ -46,17 +46,18 @@
 index 7fd1393..20936bd 100644
 --- desktop/scripts/soffice.sh
 +++ desktop/scripts/soffice.sh
-@@ -262,6 +262,10 @@ else
- fi
+@@ -147,6 +147,11 @@ else
+ PATH=$sd_prog${PATH+:$PATH}
  export PATH
  
 +# test for availability of the fast external splash
 +if [ "$sd_binary" = "soffice.bin" -a -x "$sd_prog/oosplash.bin" ] ; then
 +    sd_binary="oosplash.bin"
 +fi
- 
++
  # execute soffice binary
  "$sd_prog/$sd_binary" "$@" &
+ trap 'kill -9 $!' TERM
 diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
 index faeafe5..681b6c6 100644
 --- desktop/source/app/app.cxx

Added: trunk/patches/dev300/unxsplash-rpath.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/unxsplash-rpath.diff	Thu Mar 27 13:20:55 2008
@@ -0,0 +1,12 @@
+diff --git desktop/unx/source/makefile.mk desktop/unx/source/makefile.mk
+index 110d081..5a2e86f 100644
+--- desktop/unx/source/makefile.mk
++++ desktop/unx/source/makefile.mk
+@@ -13,6 +13,7 @@ OBJFILES= \
+ 	$(OBJ)$/start.obj
+ 
+ APP1TARGET = $(TARGET)
++APP1RPATH  = BRAND
+ APP1OBJS   = $(OBJFILES)
+ APP1LIBSALCPPRT=
+ APP1CODETYPE = C

Modified: trunk/patches/src680/cws-commit-patch-default-dev300.diff
==============================================================================
--- trunk/patches/src680/cws-commit-patch-default-dev300.diff	(original)
+++ trunk/patches/src680/cws-commit-patch-default-dev300.diff	Thu Mar 27 13:20:55 2008
@@ -9,3 +9,144 @@
  
  sub usage()
  {
+@@ -109,13 +109,20 @@ sub cws_add_modules($$$@)
+             print STDERR "Unable to open patch '$patch'.";
+             exit 1;
+         }
++        my $minus_name;
+         while (<$PATCH>) {
+-            if ( /^\+\+\+ ([^\/]*)/ ) {
++            if ( /^--- ([^\/]*)/ ) {
++                $minus_name = $1;
++            }
++            elsif ( /^\+\+\+ ([^\/]*)/ ) {
+                 if ( $1 ne "" ) {
+                     $modules{$1} = "add";
+                 }
++                elsif ( $minus_name ne "" ) {
++                    $modules{$minus_name} = "add";
++                }
+                 else {
+-                    print STDERR "Unable to guess module name ($1) from $patch.\n";
++                    print STDERR "Unable to guess module name from $patch.\n";
+                     close( $PATCH );
+                     exit 1;
+                 }
+@@ -183,10 +190,10 @@ sub apply_patches(@)
+     }
+ }
+ 
+-sub cvs_add_files(@)
++sub cvs_add_rm_files(@)
+ {
+     my ( @patches ) = @_;
+-    system( "echo '===== cvs_add_files =====' >> .log" );
++    system( "echo '===== cvs_add_rm_files =====' >> .log" );
+ 
+     my %modules = ();
+ 
+@@ -195,30 +202,48 @@ sub cvs_add_files(@)
+             print STDERR "Unable to open patch '$patch'.";
+             exit 1;
+         }
+-	my $file_add = "";
++        my $file_add = "";
++        my $file_rm = "";
+         while (<$PATCH>) {
+-            if ( /^\+\+\+ ([^\s]*)/ ) {
++            if ( /^--- ([^\s]*)/ ) {
++                if ( $1 ne "" ) {
++                    $file_rm = $1;
++                }
++            }
++            elsif ( /^\+\+\+ ([^\s]*)/ ) {
+                 if ( $1 ne "" ) {
+-		    $file_add = $1;
++                    $file_add = $1;
++                }
++            }
++            elsif ( /^\ \@ .* \+0,0 \ \@$/ && $file_rm ne "" ) {
++                if ( $file_rm =~ /^([^\/]+)\/(.*)/ ) {
++                    my $dir = $1;
++                    my $file = $2;
++
++                    if ( system( "cd $dir && cvs rm $file" ) != 0 ) {
++                        print STDERR "Unable to exec 'cd $dir && cvs rm $file'.\n";
++                        close( $PATCH );
++                        exit 1;
++                    }
+                 }
+             }
+             elsif ( /^\ \@ -0,0 / && $file_add ne "" ) {
+-		my @to_add = split( /\//, $file_add );
+-		my $current = "";
+-		for my $add ( @to_add ) {
+-		    $current .= "/" unless ( $current eq "" );
+-		    my $where_add_dir = $current;
+-		    $current .= $add;
+-
+-		    if ( ( -d "$current" && ! -d "$current/CVS" ) || ( -f "$current" ) ) {
+-			if ( system( "cd $where_add_dir && cvs add $add" ) != 0 ) {
+-			    print STDERR "Unable to exec 'cd $where_add_dir && cvs add $add'.\n";
+-			    close( $PATCH );
+-			    exit 1;
+-			}
+-		    }
+-		}
+-	    }
++                my @to_add = split( /\//, $file_add );
++                my $current = "";
++                for my $add ( @to_add ) {
++                    $current .= "/" unless ( $current eq "" );
++                    my $where_add_dir = $current;
++                    $current .= $add;
++
++                    if ( ( -d "$current" && ! -d "$current/CVS" ) || ( -f "$current" ) ) {
++                        if ( system( "cd $where_add_dir && cvs add $add" ) != 0 ) {
++                            print STDERR "Unable to exec 'cd $where_add_dir && cvs add $add'.\n";
++                            close( $PATCH );
++                            exit 1;
++                        }
++                    }
++                }
++            }
+         }
+         close( $PATCH );
+     }
+@@ -234,7 +259,7 @@ sub cws_commit($$$$$@)
+ 
+     apply_patches( @patches );
+ 
+-    cvs_add_files( @patches );
++    cvs_add_rm_files( @patches );
+ 
+     my @cws_modules = cws_modules( $mws, $cws );
+     my $commit_message = "#i$iz#\n" . $summary;
+@@ -261,10 +286,10 @@ if ( !defined( $ENV{'SOLARENV'} ) || $EN
+     $build_dir =~ s#/solenv/bin/[^/]*$##;
+     my $env_script = "";
+     if ( -f "$build_dir/LinuxIntelEnv.Set.sh" ) {
+-	$env_script = "$build_dir/LinuxIntelEnv.Set.sh";
++        $env_script = "$build_dir/LinuxIntelEnv.Set.sh";
+     }
+     elsif ( -f "$build_dir/LinuxX86-64Env.Set.sh" ) {
+-	$env_script = "$build_dir/LinuxX86-64Env.Set.sh";
++        $env_script = "$build_dir/LinuxX86-64Env.Set.sh";
+     }
+     else {
+         print STDERR "Unable to find '$build_dir/Linux(Intel|X86-64)Env.Set.sh'.\n";
+@@ -312,10 +337,10 @@ while (@ARGV) {
+     }
+     elsif ( $opt eq "-m" || $opt eq "--milestone" ) {
+         $milestone = shift @ARGV;
+-	if (! ( $milestone =~ m/^m/ ) ) {
+-	    $milestone = "m$milestone";
+-	    print "Re-writing milestone to $milestone\n";
+-	}
++        if (! ( $milestone =~ m/^m/ ) ) {
++            $milestone = "m$milestone";
++            print "Re-writing milestone to $milestone\n";
++        }
+     }
+     elsif ( $opt eq "-w" || $opt eq "--mws" ) {
+         $mws = shift @ARGV;