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

[Tor Lillqvist]

 patches/dev300/apply                                               |    5 ++
 patches/dev300/win32-multi-lang-installer-update-xml-filename.diff |   20 ++++++++++
 patches/dev300/win32-multi-lang-installer.diff                     |   20 ----------
 3 files changed, 25 insertions(+), 20 deletions(-)

New commits:
commit b4c0b4f3657610f29b886e4e7ba9bbd3474e13ff
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue May 25 14:24:51 2010 +0300

    Make patches apply on Windows again
    
    Split out a part from win32-multi-lang-installer.diff and don't apply
    that part for now.

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b99fe4c..a5b9b10 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1542,6 +1542,11 @@ win32-no-uninstall-survey.diff, tml
 # Multi-language installer stuff
 win32-multi-lang-installer.diff, i#66062, i#88638, i#88639, tml
 
+# FIXME dev300-m77: split out from the above diff, and commented out,
+# as this part causes buildfix-instsetoo_native-targets.diff not to
+# apply
+# win32-multi-lang-installer-update-xml-filename.diff, i#66062, i#88638, i#88639, tml
+
 [ GentooOnly ]
 SectionOwner => aprosky
 
diff --git a/patches/dev300/win32-multi-lang-installer-update-xml-filename.diff b/patches/dev300/win32-multi-lang-installer-update-xml-filename.diff
new file mode 100644
index 0000000..505d190
--- /dev/null
+++ b/patches/dev300/win32-multi-lang-installer-update-xml-filename.diff
@@ -0,0 +1,20 @@
+--- instsetoo_native/util/makefile.mk
++++ instsetoo_native/util/makefile.mk
+@@ -234,7 +234,7 @@
+ .ENDIF			# "$(MAKETARGETS)"!=""
+ openoffice_%{$(PKGFORMAT:^".") .archive} :
+     $(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 -format $(@:e:s/.//) $(VERBOSESWITCH)
+-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
++    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ 
+ $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
+ openofficewithjre_%{$(PKGFORMAT:^".")} :
+@@ -251,7 +251,7 @@
+ $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
+ openofficedev_%{$(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 -format $(@:e:s/.//) $(VERBOSESWITCH)
+-    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
++    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
+ 
+ $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
+ ooolanguagepack_%{$(PKGFORMAT:^".")} :
diff --git a/patches/dev300/win32-multi-lang-installer.diff b/patches/dev300/win32-multi-lang-installer.diff
index 35e0bf6..f2a4504 100644
--- a/patches/dev300/win32-multi-lang-installer.diff
+++ b/patches/dev300/win32-multi-lang-installer.diff
@@ -502,23 +502,3 @@
  	elsif ( $language eq "zh-CN" ) { $nsislanguage = "SimpChinese"; }
  	elsif ( $language eq "zh-TW" ) { $nsislanguage = "TradChinese"; }
  	else { 
---- instsetoo_native/util/makefile.mk
-+++ instsetoo_native/util/makefile.mk
-@@ -234,7 +234,7 @@
- .ENDIF			# "$(MAKETARGETS)"!=""
- openoffice_%{$(PKGFORMAT:^".") .archive} :
-     $(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 -format $(@:e:s/.//) $(VERBOSESWITCH)
--    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-+    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
- 
- $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")}
- openofficewithjre_%{$(PKGFORMAT:^".")} :
-@@ -251,7 +251,7 @@
- $(foreach,i,$(alllangiso) openofficedev_$i) : $$@{$(PKGFORMAT:^".")}
- openofficedev_%{$(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 -format $(@:e:s/.//) $(VERBOSESWITCH)
--    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
-+    $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice_Dev --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/`date +%Y%m%d_%H%M`_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml
- 
- $(foreach,i,$(alllangiso) ooolanguagepack_$i) : $$@{$(PKGFORMAT:^".")}
- ooolanguagepack_%{$(PKGFORMAT:^".")} :