summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--elementary/gtk-engine-equinox/PKGBUILD2
-rw-r--r--libre/unarchiver/PKGBUILD25
-rw-r--r--libre/unarchiver/libz.patch13
-rw-r--r--libre/unarchiver/native_obj_exceptions.patch22
4 files changed, 53 insertions, 9 deletions
diff --git a/elementary/gtk-engine-equinox/PKGBUILD b/elementary/gtk-engine-equinox/PKGBUILD
index 32f5db368..d2c08627b 100644
--- a/elementary/gtk-engine-equinox/PKGBUILD
+++ b/elementary/gtk-engine-equinox/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=gtk-engine-equinox
pkgver=1.50
-pkgrel=1
+pkgrel=2
pkgdesc="A heavily modified version of the beautiful Aurora engine"
url="http://gnome-look.org/content/show.php/Equinox+GTK+Engine?content=121881"
license=('GPL2')
diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD
index a02607b28..f0a08e8d1 100644
--- a/libre/unarchiver/PKGBUILD
+++ b/libre/unarchiver/PKGBUILD
@@ -1,28 +1,37 @@
# Maintainer: Cedric Girard <girard.cedric@gmail.com>
+# Contributor: N30N <archlinux@alunamation.com>
+
pkgname=unarchiver
-pkgver=2.7.1
-pkgrel=3
+pkgver=3.0
+pkgrel=1
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-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
-conflicts=('gnustep-base>=1.24')
+depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
makedepends=('gcc-objc')
-source=(http://theunarchiver.googlecode.com/files/TheUnarchiver"$pkgver"_src.zip)
+source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip"
+ "native_obj_exceptions.patch"
+ "libz.patch")
build() {
- cd "$srcdir/The Unarchiver/XADMaster"
+ cd $srcdir/
+ patch -Np1 -i native_obj_exceptions.patch
+ patch -Np1 -i libz.patch
+
+ cd XADMaster
. /usr/share/GNUstep/Makefiles/GNUstep.sh
make -f Makefile.linux
}
package() {
- cd "$srcdir/The Unarchiver/XADMaster"
+ cd "$srcdir/XADMaster"
install -d "$pkgdir/usr/bin/"
install -m755 unar lsar "$pkgdir/usr/bin/"
}
# vim:set ts=2 sw=2 et:
-md5sums=('498ea1c984d5783322e070a71922b422')
+md5sums=('c7c42cd3640bf477b79b21436344f098'
+ '4fa4ecc6e4ba14d3b6952d064e728511'
+ '665d01bf93191cc6f57dc80d8c1d3d5a')
diff --git a/libre/unarchiver/libz.patch b/libre/unarchiver/libz.patch
new file mode 100644
index 000000000..acba51463
--- /dev/null
+++ b/libre/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/libre/unarchiver/native_obj_exceptions.patch b/libre/unarchiver/native_obj_exceptions.patch
new file mode 100644
index 000000000..9c84918b2
--- /dev/null
+++ b/libre/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 \