From 8d495edc6dc13d4a6205d4203e93b2e95bd6c5ff Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Wed, 4 Jan 2012 11:37:07 +0100 Subject: [PATCH] Unarchiver now need some patches --- pkgbuild/unarchiver/PKGBUILD | 17 ++++++++++---- pkgbuild/unarchiver/libz.patch | 13 +++++++++++ .../unarchiver/native_obj_exceptions.patch | 22 +++++++++++++++++++ 3 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 pkgbuild/unarchiver/libz.patch create mode 100644 pkgbuild/unarchiver/native_obj_exceptions.patch diff --git a/pkgbuild/unarchiver/PKGBUILD b/pkgbuild/unarchiver/PKGBUILD index cb944cc..a6f4ca0 100644 --- a/pkgbuild/unarchiver/PKGBUILD +++ b/pkgbuild/unarchiver/PKGBUILD @@ -3,18 +3,27 @@ pkgname=unarchiver pkgver=2.7.1 -pkgrel=1 +pkgrel=2 pkgdesc="An Objective-C application for uncompressing archive files" arch=('x86_64' 'i686') url="http://wakaba.c3.cx/s/apps/unarchiver.html" license=('LGPL2.1') depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') makedepends=('gcc-objc') -source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip") -sha1sums=('dba7a5aee159435a7ad6d1879443ab66a809c970') +source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip" + "native_obj_exceptions.patch" + "libz.patch") +sha1sums=('dba7a5aee159435a7ad6d1879443ab66a809c970' + 'b8024026607dc2de758479b73d8b01ca6f692b59' + '003d114a0ba9a919af602881ef5e04cdba2e4c50') build() { - cd "$srcdir/The Unarchiver/XADMaster" + cd "$srcdir/The Unarchiver" + + patch -p1 < ../native_obj_exceptions.patch + patch -p1 < ../libz.patch + + cd XADMaster . /usr/share/GNUstep/Makefiles/GNUstep.sh make -f Makefile.linux } diff --git a/pkgbuild/unarchiver/libz.patch b/pkgbuild/unarchiver/libz.patch new file mode 100644 index 0000000..acba514 --- /dev/null +++ b/pkgbuild/unarchiver/libz.patch @@ -0,0 +1,13 @@ +diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux +--- The Unarchiver/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200 ++++ The Unarchiver_patched/XADMaster/Makefile.linux 2011-12-22 10:56:13.749166606 +0100 +@@ -51,7 +51,8 @@ + -licuuc \ + -lobjc \ + -lstdc++ \ +- -lm ++ -lm \ ++ -lz + + LDFLAGS = -Wl,--whole-archive \ + -fexceptions \ diff --git a/pkgbuild/unarchiver/native_obj_exceptions.patch b/pkgbuild/unarchiver/native_obj_exceptions.patch new file mode 100644 index 0000000..9c84918 --- /dev/null +++ b/pkgbuild/unarchiver/native_obj_exceptions.patch @@ -0,0 +1,22 @@ +diff -Naur The Unarchiver/UniversalDetector/Makefile.linux The Unarchiver_patched/UniversalDetector/Makefile.linux +--- The Unarchiver/UniversalDetector/Makefile.linux 2011-04-27 03:32:21.000000000 +0200 ++++ The Unarchiver_patched/UniversalDetector/Makefile.linux 2011-12-22 10:48:32.138621163 +0100 +@@ -16,7 +16,6 @@ + + GNUSTEP_OPTS = -DGNUSTEP \ + -DGNU_RUNTIME=1 \ +- -D_NATIVE_OBJC_EXCEPTIONS \ + -fgnu-runtime \ + -fexceptions \ + -fobjc-exceptions \ +diff -Naur The Unarchiver/XADMaster/Makefile.linux The Unarchiver_patched/XADMaster/Makefile.linux +--- The Unarchiver/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200 ++++ The Unarchiver_patched/XADMaster/Makefile.linux 2011-12-22 10:48:15.488721721 +0100 +@@ -16,7 +16,6 @@ + + GNUSTEP_OPTS = -DGNUSTEP \ + -DGNU_RUNTIME=1 \ +- -D_NATIVE_OBJC_EXCEPTIONS \ + -fgnu-runtime \ + -fexceptions \ + -fobjc-exceptions \