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

[Petr Mladek]

 patches/dev300/apply                                       |    3 --
 patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff |   18 -------------
 2 files changed, 21 deletions(-)

New commits:
commit 0951e597ff4cc1ce622da985d87c14d7704f5301
Author: Petr Mladek <pmladek at suse.cz>
Date:   Fri Apr 15 16:49:43 2011 +0200

    bin obsolete buildfix-instsetoo_native-no-PKGFORMAT.diff
    
    solved another way in DEV300 (i#112761)

diff --git a/patches/dev300/apply b/patches/dev300/apply
index b3b7a9c..a57cfb9 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -163,9 +163,6 @@ warning-return-values-stlport.diff, jholesov
 # don't let HelpLinker be miscompiled with g++ 4.3
 gcc-HelpLinker.diff # RENAMED transex3 -> l10ntools
 
-[ TemporaryHacks ]
-buildfix-instsetoo_native-no-PKGFORMAT.diff, i#112761, rengelha
-
 [ TemporaryHacks and not MacOSXOnly ]
 
 # don't lstat() that much while creating absolute URLs - breaks unopkg
diff --git a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff b/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
deleted file mode 100644
index 19c113f..0000000
--- a/patches/dev300/buildfix-instsetoo_native-no-PKGFORMAT.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- instsetoo_native/util/makefile.mk
-+++ instsetoo_native/util/makefile.mk
-@@ -201,6 +201,7 @@
- 
- .ENDIF			# "$(BUILD_SPECIAL)"!=""
- 
-+.IF "$(PKGFORMAT)" != ""
- $(foreach,i,$(alllangiso) openoffice_$i) : $$@{$(PKGFORMAT:^".")}
- .IF "$(MAKETARGETS)"!=""
- .IF "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)"
-@@ -277,6 +278,7 @@
-     @echo cannot pack nothing...
- 
- .ENDIF			# "$(alllangiso)"!=""
-+.ENDIF
- 
- .IF "$(DISABLE_PYTHON)" != "TRUE"
- .IF "$(LOCALPYFILES)"!=""