[Libreoffice-commits] .: patches/dev300

[Petr Mladek]

 patches/dev300/apply                  |    4 ----
 patches/dev300/solenv-unpack-oxt.diff |   15 ---------------
 2 files changed, 19 deletions(-)

New commits:
commit f38bcf98f844a6a867e7a86595cf3842caee837c
Author: Petr Mladek <pmladek at suse.cz>
Date:   Thu Mar 31 18:17:21 2011 +0200

    pushed solenv-unpack-oxt.diff into git

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1ce9db6..c11593c 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -1640,10 +1640,6 @@ dlopen-global-symbols.diff, thorsten
 # needs some more love, see comments in issue
 framework-extra-job-config.diff, i#107568, thorsten
 
-[ BuildBits ]
-# know how to unpack .oxt files if you want to update a 3rd party one
-solenv-unpack-oxt.diff, pmladek
-
 [ DebianBaseOnly ]
 # link with -lcolamd, needed because our liblpsolve55{,_pic}.a doesn't include it
 system-lpsolve-link-with-colamd.diff, rengelha
diff --git a/patches/dev300/solenv-unpack-oxt.diff b/patches/dev300/solenv-unpack-oxt.diff
deleted file mode 100644
index 4c47f80..0000000
--- a/patches/dev300/solenv-unpack-oxt.diff
+++ /dev/null
@@ -1,15 +0,0 @@
---- solenv/inc/tg_ext.mk
-+++ solenv/inc/tg_ext.mk
-@@ -151,6 +151,12 @@ $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.zip
-     @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-     @$(RENAME) $@.$(INPATH) $@
- 
-+$(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.oxt
-+    @-$(RM) $@
-+    @noop $(assign UNPACKCMD := unzip $(unzip_quiet_switch)  -o $(TARFILE_LOCATION)/$(TARFILE_MD5)-$(TARFILE_NAME).oxt)
-+    @$(TYPE) $(mktmp $(UNPACKCMD)) > $@.$(INPATH)
-+    @$(RENAME) $@.$(INPATH) $@
-+
- $(MISC)/%.unpack : $(TARFILE_LOCATION2)/%.jar
-     @-$(RM) $@
- .IF "$(OS)"=="SOLARIS"