[Libreoffice-commits] .: Branch 'libreoffice-3-3' - patches/dev300

[Petr Mladek]

 patches/dev300/buildfix-instsetoo_native-archive.diff |   12 +++++++++++-
 patches/dev300/piece-binary-path.diff                 |    4 ++--
 patches/dev300/piece-sfx2.diff                        |    8 ++++----
 patches/dev300/piece-solenv.diff                      |    4 ++--
 4 files changed, 19 insertions(+), 9 deletions(-)

New commits:
commit e6fc718c414e5e92d4e131a1dafae381f4c471f2
Author: Petr Mladek <pmladek at suse.cz>
Date:   Tue Dec 14 20:01:14 2010 +0100

    fix patches to apply

diff --git a/patches/dev300/buildfix-instsetoo_native-archive.diff b/patches/dev300/buildfix-instsetoo_native-archive.diff
index ddf79e0..95f67a7 100644
--- a/patches/dev300/buildfix-instsetoo_native-archive.diff
+++ b/patches/dev300/buildfix-instsetoo_native-archive.diff
@@ -1,6 +1,6 @@
 --- instsetoo_native/util/makefile.mk	2010-06-25 15:19:33.000000000 +0100
 +++ instsetoo_native/util/makefile.mk	2010-06-25 15:36:17.000000000 +0100
-@@ -213,32 +213,32 @@ openoffice_%{$(PKGFORMAT:^".") .archive}
+@@ -213,40 +213,40 @@ openoffice_%{$(PKGFORMAT:^".") .archive}
      $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product LibreOffice --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:^".")}
@@ -24,6 +24,16 @@
 +ooodevlanguagepack_%{$(PKGFORMAT:^".") .archive} :
      $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
  
+ $(foreach,i,$(alllangiso) ooohelppack_$i) : $$@{$(PKGFORMAT:^".")}
+-ooohelppack_%{$(PKGFORMAT:^".")} :
++ooohelppack_%{$(PKGFORMAT:^".") .archive} :
+     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
+ $(foreach,i,$(alllangiso) ooodevhelppack_$i) : $$@{$(PKGFORMAT:^".")}
+-ooodevhelppack_%{$(PKGFORMAT:^".")} :
++ooodevhelppack_%{$(PKGFORMAT:^".") .archive} :
+     $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p LibreOffice_Dev -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIHELPPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -helppack -format $(@:e:s/.//) $(VERBOSESWITCH)
+ 
  $(foreach,i,$(alllangiso) sdkoo_$i) : $$@{$(PKGFORMAT:^".")}
 -sdkoo_%{$(PKGFORMAT:^".")} :
 +sdkoo_%{$(PKGFORMAT:^".") .archive} :
diff --git a/patches/dev300/piece-binary-path.diff b/patches/dev300/piece-binary-path.diff
index ff8cd66..d660d09 100644
--- a/patches/dev300/piece-binary-path.diff
+++ b/patches/dev300/piece-binary-path.diff
@@ -45,12 +45,12 @@
  GDBREGCOMPTRACE=$(GDBTRACE)
  .ENDIF
  
--REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
+-REGCOMP*=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBREGCOMPTRACE) $(SOLARBINDIR)/regcomp
 -CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/cppumaker
 -JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/javamaker
 -RDBMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/rdbmaker
 -CLIMAKER*=$(AUGMENT_LIBRARY_PATH) $(SOLARBINDIR)/climaker
-+REGCOMP*=$(AUGMENT_LIBRARY_PATH) $(GDBREGCOMPTRACE) regcomp
++REGCOMP*=$(AUGMENT_LIBRARY_PATH_LOCAL) $(GDBREGCOMPTRACE) regcomp
 +CPPUMAKER*=$(AUGMENT_LIBRARY_PATH) cppumaker
 +JAVAMAKER*=$(AUGMENT_LIBRARY_PATH) javamaker
 +RDBMAKER*=$(AUGMENT_LIBRARY_PATH) rdbmaker
diff --git a/patches/dev300/piece-sfx2.diff b/patches/dev300/piece-sfx2.diff
index c23fd2a..5eccf23 100644
--- a/patches/dev300/piece-sfx2.diff
+++ b/patches/dev300/piece-sfx2.diff
@@ -13,11 +13,11 @@
  # may not fit...
  .IF "$(CUSTOM_LICENSE)"==""
  .IF "$(GUI)" == "WNT"
--PACKLICDEPS=$(SOLARBINDIR)/osl/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
-+PACKLICDEPS=$(SOLARLICENSEDIR)/license$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+-PACKLICDEPS=$(SOLARBINDIR)/osl/license.txt
++PACKLICDEPS=$(SOLARLICENSEDIR)/license.txt
  .ELSE			# "$(GUI)" == "WNT"
--PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
-+PACKLICDEPS=$(SOLARLICENSEDIR)/LICENSE$$(@:b:s/_/./:e:s/./_/)$$(@:e)
+-PACKLICDEPS=$(SOLARBINDIR)/osl/LICENSE
++PACKLICDEPS=$(SOLARLICENSEDIR)/LICENSE
  .ENDIF			# "$(GUI)" == "WNT"
  .ELSE			# "$(CUSTOM_LICENSE)" == ""
  PACKLICDEPS=$(CUSTOM_LICENSE)
diff --git a/patches/dev300/piece-solenv.diff b/patches/dev300/piece-solenv.diff
index c3194fc..24395f7 100644
--- a/patches/dev300/piece-solenv.diff
+++ b/patches/dev300/piece-solenv.diff
@@ -188,8 +188,8 @@
      my $profilesinproductlanguageresolvedarrayref;
      my $profileitemsinproductlanguageresolvedarrayref;
  
--    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)))
-+    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && $ENV{OO_ALLOW_PROFILES})
+-    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && (!($installer::globals::helppack)))
++    if ((!($installer::globals::is_copy_only_project)) && (!($installer::globals::product =~ /ada/i )) && (!($installer::globals::languagepack)) && (!($installer::globals::helppack)) && $ENV{OO_ALLOW_PROFILES})
      {
          installer::logger::print_message( "... creating profiles ...\n" );