From 2e8cf60b1228c1b2a6e04f5c1e4c43b2b203789e Mon Sep 17 00:00:00 2001 From: Cedric Girard Date: Fri, 12 Jun 2015 17:55:57 +0200 Subject: [PATCH] moved unarchiver to AUR4 and submodule --- .gitmodules | 4 ++ pkgbuild/unarchiver | 1 + pkgbuild/unarchiver/PKGBUILD | 47 ------------------- .../unarchiver/native_obj_exceptions.patch | 22 --------- 4 files changed, 5 insertions(+), 69 deletions(-) create mode 160000 pkgbuild/unarchiver delete mode 100644 pkgbuild/unarchiver/PKGBUILD delete mode 100644 pkgbuild/unarchiver/native_obj_exceptions.patch diff --git a/.gitmodules b/.gitmodules index b6ad8c5..a077e89 100644 --- a/.gitmodules +++ b/.gitmodules @@ -30,3 +30,7 @@ path = pkgbuild/libcec-git url = https://aur@aur4.archlinux.org/libcec-git.git pushurl = ssh+git://aur@aur4.archlinux.org/libcec-git.git +[submodule "pkgbuild/unarchiver"] + path = pkgbuild/unarchiver + url = https://aur@aur4.archlinux.org/unarchiver.git + pushurl = ssh+git://aur@aur4.archlinux.org/unarchiver.git diff --git a/pkgbuild/unarchiver b/pkgbuild/unarchiver new file mode 160000 index 0000000..fb580d0 --- /dev/null +++ b/pkgbuild/unarchiver @@ -0,0 +1 @@ +Subproject commit fb580d08f2bc024c3265009b3bf560e0d57f3c0f diff --git a/pkgbuild/unarchiver/PKGBUILD b/pkgbuild/unarchiver/PKGBUILD deleted file mode 100644 index 3a7b028..0000000 --- a/pkgbuild/unarchiver/PKGBUILD +++ /dev/null @@ -1,47 +0,0 @@ -# Maintainer: Cedric Girard -# Contributor: N30N - -pkgname=unarchiver -epoch=1 -pkgver=1.8.1 -pkgrel=1 -pkgdesc="unar and lsar: Objective-C tools 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/unar${pkgver}_src.zip" - "native_obj_exceptions.patch") -sha1sums=('fe052cd7042651cccc7ba0e9c4d6d7dba5102fd4' - 'b8024026607dc2de758479b73d8b01ca6f692b59') - -prepare(){ - cd "$srcdir/The Unarchiver" - - patch -p1 < ../native_obj_exceptions.patch - -} - -build() { - cd "$srcdir/The Unarchiver/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 - install -d "$pkgdir/usr/share/bash-completion/completions/" - install -m644 unar.bash_completion "$pkgdir/usr/share/bash-completion/completions/unar" - install -m644 lsar.bash_completion "$pkgdir/usr/share/bash-completion/completions/lsar" -} - -# vim:set ts=2 sw=2 et: diff --git a/pkgbuild/unarchiver/native_obj_exceptions.patch b/pkgbuild/unarchiver/native_obj_exceptions.patch deleted file mode 100644 index 9c84918..0000000 --- a/pkgbuild/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 \