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

Tor Lillqvist tml at kemper.freedesktop.org
Wed Apr 6 11:49:33 PDT 2011


 patches/dev300/buildfix-instsetoo_native-archive.diff |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a38a5c05cadae695c889bbe64e7dcd971e8878cb
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Apr 6 21:47:19 2011 +0300

    Revert "Make buildfix-instsetoo_native-archive.diff apply again"
    
    It was a mistake, reason unknown.
    
    This reverts commit ed27682e99ea231b5a7a47a5c19864c05d78127d.

diff --git a/patches/dev300/buildfix-instsetoo_native-archive.diff b/patches/dev300/buildfix-instsetoo_native-archive.diff
index 95f67a7..61e9155 100644
--- a/patches/dev300/buildfix-instsetoo_native-archive.diff
+++ b/patches/dev300/buildfix-instsetoo_native-archive.diff
@@ -75,4 +75,4 @@
 +broolanguagepack_%{$(PKGFORMAT:^".") .archive} :
      +$(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p BrOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSILANGPACKTEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -languagepack -format $(@:e:s/.//) $(VERBOSESWITCH)
  
- .ELSE			# "$(alllangiso)"!=""
+ $(foreach,i,$(alllangiso) oxygenoffice_$i) : $$@{$(PKGFORMAT:^".")}


More information about the Libreoffice-commits mailing list