[ooo-build-commit] .: patches/dev300

[Fridrich Strba]

 patches/dev300/win32-multi-lang-installer.diff |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

New commits:
commit 86e1ec3294480e3afe0c40f35b1b8b04850f21c9
Author: Fridrich Strba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 2 15:21:26 2010 +0100

    Massage patch to apply correctly
    
    * patches/dev300/win32-multi-lang-installer.diff:

diff --git a/patches/dev300/win32-multi-lang-installer.diff b/patches/dev300/win32-multi-lang-installer.diff
index 0b3ae5d..55aecc6 100644
--- a/patches/dev300/win32-multi-lang-installer.diff
+++ b/patches/dev300/win32-multi-lang-installer.diff
@@ -1,6 +1,6 @@
 --- scp2/source/ooo/file_library_ooo.scp
 +++ scp2/source/ooo/file_library_ooo.scp
-@@ -2168,3 +2168,12 @@
+@@ -1913,3 +1913,12 @@
  STD_UNO_LIB_FILE( gid_File_Lib_For, for)
  STD_LIB_FILE( gid_File_Lib_Forui, forui)
  
@@ -15,10 +15,10 @@
 +#endif
 --- scp2/source/ooo/windowscustomaction_ooo.scp
 +++ scp2/source/ooo/windowscustomaction_ooo.scp
-@@ -443,2 +443,11 @@
-	 Assignment2 = ("AdminExecuteSequence", "Not REMOVE=\"ALL\"", "end");
+@@ -501,6 +501,15 @@
+ 	Assignment1 = ("InstallExecuteSequence", "(Not Installed or ISPATCH) and Not REMOVE=\"ALL\"", "end");
  End
-+
+ 
 +WindowsCustomAction gid_Customaction_SelectLanguage
 +	Name = "SelectLanguage";
 +	Typ = "321";
@@ -27,9 +27,13 @@
 +	Inbinarytable = 1;
 +	Assignment1 = ("ControlEvent", "SetupType", "Next", "DoAction", "SelectLanguage", "1", "1");
 +End
++
+ WindowsCustomAction gid_Customaction_RebaseLibrariesonproperties
+ 	Name = "RebaseLibrariesOnProperties";
+ 	Typ = "65";
 --- setup_native/prj/build.lst
 +++ setup_native/prj/build.lst
-@@ -5,6 +5,7 @@
+@@ -9,6 +9,7 @@
  pk  setup_native\source\win32\customactions\regactivex    nmake   -  w   sn_regactivex NULL
  pk  setup_native\source\win32\customactions\regpatchactivex nmake -  w   sn_regpatchactivex NULL
  pk  setup_native\source\win32\customactions\reg4allmsdoc  nmake   -  w   sn_reg4allmsdoc NULL
@@ -476,7 +480,7 @@
 +}
 --- solenv/bin/modules/installer/download.pm.orig	2008-06-05 12:22:33.000000000 +0800
 +++ solenv/bin/modules/installer/download.pm	2008-06-05 12:23:44.000000000 +0800
-@@ -827,12 +827,9 @@ sub put_windows_productpath_into_templat
+@@ -935,12 +935,9 @@ sub put_windows_productpath_into_templat
  	
  	my $productpath = $variableshashref->{'PROPERTYTABLEPRODUCTNAME'};
  	
@@ -490,7 +494,7 @@
  	# if (( $installer::globals::languagepack ) && ( $installer::globals::unicodensis )) { $productpath = convert_textstring_to_utf16($productpath, $localnsisdir, "stringhelper.txt"); }
  	
  	replace_one_variable($templatefile, "PRODUCTPATHPLACEHOLDER", $productpath);
-@@ -1041,7 +1041,6 @@
+@@ -1086,7 +1083,6 @@
  	elsif ( $language eq "ja" ) { $nsislanguage = "Japanese"; }
  	elsif ( $language eq "ko" ) { $nsislanguage = "Korean"; }
  	elsif ( $language eq "th" ) { $nsislanguage = "Thai"; }
@@ -500,7 +504,7 @@
  	else { 
 --- instsetoo_native/util/makefile.mk
 +++ instsetoo_native/util/makefile.mk
-@@ -222,7 +222,7 @@
+@@ -234,7 +234,7 @@
  openoffice_% :
  .ENDIF			# "$(PKGFORMAT)"!=""
  	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))
@@ -509,7 +513,7 @@
  
  .IF "$(PKGFORMAT)"!=""
  $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
-@@ -250,7 +250,7 @@
+@@ -251,7 +251,7 @@
  openofficedev_% :
  .ENDIF			# "$(PKGFORMAT)"!=""
  	$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles $(subst,xxx,$(@:e:s/.//) $(PKGFORMATSWITCH) $(VERBOSESWITCH))