From 323950ce5e896810f6ea9f0a2401813e1d7573c7 Mon Sep 17 00:00:00 2001 From: Nicolás Reynolds Date: Wed, 21 Nov 2012 15:44:14 -0300 Subject: Moving unarchiver to unar and fixing #227 --- libre/unar/PKGBUILD | 42 ++++++++++++++++++++++++++++ libre/unar/libz.patch | 13 +++++++++ libre/unar/native_obj_exceptions.patch | 22 +++++++++++++++ libre/unarchiver/PKGBUILD | 42 ---------------------------- libre/unarchiver/libz.patch | 13 --------- libre/unarchiver/native_obj_exceptions.patch | 22 --------------- 6 files changed, 77 insertions(+), 77 deletions(-) create mode 100755 libre/unar/PKGBUILD create mode 100755 libre/unar/libz.patch create mode 100755 libre/unar/native_obj_exceptions.patch delete mode 100755 libre/unarchiver/PKGBUILD delete mode 100755 libre/unarchiver/libz.patch delete mode 100755 libre/unarchiver/native_obj_exceptions.patch diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD new file mode 100755 index 000000000..e1664e809 --- /dev/null +++ b/libre/unar/PKGBUILD @@ -0,0 +1,42 @@ +# Maintainer: Cedric Girard +# Contributor: N30N + +pkgname=unar +pkgver=1.4 +pkgrel=1 +pkgdesc="An Objective-C application for uncompressing archive files" +arch=('x86_64' 'i686' 'mips64el') +url="http://unarchiver.c3.cx/" +license=('LGPL2.1') +depends=('gnustep-base' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib') +makedepends=('gcc-objc') +replaces=("unarchiver") +conflicts=("unarchiver") +provides=("unarchiver") +source=("http://theunarchiver.googlecode.com/files/${pkgname}${pkgver}_src.zip" + "native_obj_exceptions.patch") + +build() { + cd "$srcdir/The Unarchiver" + + patch -p1 < ../native_obj_exceptions.patch + + cd XADMaster + . /usr/share/GNUstep/Makefiles/GNUstep.sh + make -f Makefile.linux +} + +package() { + cd "$srcdir/The Unarchiver/XADMaster" + install -d "$pkgdir/usr/bin/" + install -m755 unar lsar "$pkgdir/usr/bin/" + + cd "$srcdir/The Unarchiver/Extra" + install -d "$pkgdir/usr/share/man/man1" + gzip -c lsar.1 > "$pkgdir/usr/share/man/man1"/lsar.1.gz + gzip -c unar.1 > "$pkgdir/usr/share/man/man1"/unar.1.gz +} + +# vim:set ts=2 sw=2 et: +md5sums=('ae5233dd835229f867f0948d28dde0d6' + '4fa4ecc6e4ba14d3b6952d064e728511') diff --git a/libre/unar/libz.patch b/libre/unar/libz.patch new file mode 100755 index 000000000..acba51463 --- /dev/null +++ b/libre/unar/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/unar/native_obj_exceptions.patch b/libre/unar/native_obj_exceptions.patch new file mode 100755 index 000000000..9c84918b2 --- /dev/null +++ b/libre/unar/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 \ diff --git a/libre/unarchiver/PKGBUILD b/libre/unarchiver/PKGBUILD deleted file mode 100755 index 9921c6d9d..000000000 --- a/libre/unarchiver/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: Cedric Girard -# Contributor: N30N - -pkgname=unarchiver -pkgver=3.2 -pkgrel=1 -pkgdesc="An Objective-C application for uncompressing archive files" -arch=('x86_64' 'i686') -url="http://unarchiver.c3.cx/" -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" - "native_obj_exceptions.patch" - "libz.patch") -md5sums=('a23d7fbfe1f66b0950a359f206df5c8d' - '4fa4ecc6e4ba14d3b6952d064e728511' - '665d01bf93191cc6f57dc80d8c1d3d5a') - -build() { - 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 -} - -package() { - cd "$srcdir/The Unarchiver/XADMaster" - install -d "$pkgdir/usr/bin/" - install -m755 unar lsar "$pkgdir/usr/bin/" - - cd "$srcdir/The Unarchiver/Extra" - install -d "$pkgdir/usr/share/man/man1" - gzip -c lsar.1 > "$pkgdir/usr/share/man/man1"/lsar.1.gz - gzip -c unar.1 > "$pkgdir/usr/share/man/man1"/unar.1.gz -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/unarchiver/libz.patch b/libre/unarchiver/libz.patch deleted file mode 100755 index acba51463..000000000 --- a/libre/unarchiver/libz.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100755 index 9c84918b2..000000000 --- a/libre/unarchiver/native_obj_exceptions.patch +++ /dev/null @@ -1,22 +0,0 @@ -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 \ -- cgit v1.2.3-54-g00ecf