Date: Tuesday, September 22, 2020 @ 00:08:46 Author: anatolik Revision: 711324
upgpkg: unarchiver 1.10.7-1 Move to the new up-to-date repo https://github.com/MacPaw/XADMaster/ Modified: unarchiver/trunk/PKGBUILD unarchiver/trunk/native_obj_exceptions.patch -----------------------------+ PKGBUILD | 37 ++++++++++++++++++++----------------- native_obj_exceptions.patch | 20 +++++--------------- 2 files changed, 25 insertions(+), 32 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-09-21 21:35:06 UTC (rev 711323) +++ PKGBUILD 2020-09-22 00:08:46 UTC (rev 711324) @@ -3,28 +3,32 @@ # Contributor: N30N <[email protected]> pkgname=unarchiver -pkgver=1.10.1 -_commit=1534a5cf6900 -pkgrel=10 +pkgver=1.10.7 +_UniversalDetector_pkgver=1.1 +pkgrel=1 pkgdesc="unar and lsar: Objective-C tools for uncompressing archive files" arch=(x86_64) -url="https://bitbucket.org/kosovan/theunarchiver"; +url="https://github.com/MacPaw/XADMaster"; license=('LGPL2.1') -depends=(gnustep-base openssl bzip2 icu gcc-libs zlib) +depends=(gnustep-base openssl bzip2 icu gcc-libs zlib wavpack) makedepends=(gcc-objc gnustep-make) -source=("https://bitbucket.org/kosovan/theunarchiver/get/unar-${pkgver}.tar.gz"; +source=("XADMaster-${pkgver}.tar.gz::https://github.com/MacPaw/XADMaster/archive/v${pkgver}.tar.gz"; + "UniversalDetector-${_UniversalDetector_pkgver}.tar.gz::https://github.com/MacPaw/universal-detector/archive/${_UniversalDetector_pkgver}.tar.gz"; "native_obj_exceptions.patch") -sha1sums=('d7dac2b1786e63787dbea74030ecdf8c425de730' - 'b8024026607dc2de758479b73d8b01ca6f692b59') +sha1sums=('edeb1078e36339869a4c48bfc4988016d0f55029' + '609aee66fe866f086d8c9eeb66f552d243927a85' + '9672c57d4a1705fb4f324ac909c3faa6ccfe33df') -prepare(){ - cd "$srcdir/kosovan-theunarchiver-${_commit}" +prepare() { + # The project requires UniversalDetector next to the source dir. See the project's README for more info about the build requirements. + ln -s universal-detector-${_UniversalDetector_pkgver} UniversalDetector - patch -p1 < ../native_obj_exceptions.patch + cd "$srcdir/XADMaster-${pkgver}" + patch < ../native_obj_exceptions.patch } build() { - cd "$srcdir/kosovan-theunarchiver-${_commit}/XADMaster" + cd "$srcdir/XADMaster-${pkgver}" . /usr/share/GNUstep/Makefiles/GNUstep.sh make -f Makefile.linux @@ -31,14 +35,13 @@ } package() { - cd "$srcdir/kosovan-theunarchiver-${_commit}/XADMaster" + cd "$srcdir/XADMaster-${pkgver}" install -d "$pkgdir/usr/bin/" install -m755 unar lsar "$pkgdir/usr/bin/" - cd "$srcdir/kosovan-theunarchiver-${_commit}/Extra" install -d "$pkgdir/usr/share/man/man1" - install -m644 lsar.1 unar.1 "$pkgdir/usr/share/man/man1/" + install -m644 Extra/{lsar.1,unar.1} "$pkgdir/usr/share/man/man1/" 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" + install -m644 Extra/unar.bash_completion "$pkgdir/usr/share/bash-completion/completions/unar" + install -m644 Extra/lsar.bash_completion "$pkgdir/usr/share/bash-completion/completions/lsar" } Modified: native_obj_exceptions.patch =================================================================== --- native_obj_exceptions.patch 2020-09-21 21:35:06 UTC (rev 711323) +++ native_obj_exceptions.patch 2020-09-22 00:08:46 UTC (rev 711324) @@ -1,7 +1,8 @@ -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 @@ +diff --git a/Makefile.linux b/Makefile.linux +index 153ef71..e44ff0e 100644 +--- a/Makefile.linux ++++ b/Makefile.linux +@@ -10,7 +10,6 @@ AR = ar GNUSTEP_OPTS = -DGNUSTEP \ -DGNU_RUNTIME=1 \ @@ -9,14 +10,3 @@ -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 \
