From eb99291fa9f8df79b0f7c63e097fb1a9e327e971 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Tue, 3 Apr 2018 11:29:14 +0200 Subject: libre/unar: rebuilt against updated icu --- libre/unar/PKGBUILD | 60 +++++++++++++++------------------- libre/unar/native_obj_exceptions.patch | 12 +++---- 2 files changed, 33 insertions(+), 39 deletions(-) diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index 95241bc48..e5b6f8c1a 100644 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -1,58 +1,52 @@ +# Maintainer (Arch): Anatol Pomozov +# Contributor (Arch): Cedric Girard +# Contributor (Arch): N30N # Maintainer: Andreas Grapentin # Contributor: Omar Vega Ramos -# Maintainer (Arch): Cedric Girard -# Contributor (Arch): N30N # Contributor (Hyperbola): André Silva pkgname=unar - pkgver=1.10.1 -pkgrel=8 -arch=(x86_64 i686 armv7h) - -pkgdesc="An Objective-C application for uncompressing archive files" +_commit=1534a5cf6900 +pkgrel=8.1 +pkgdesc="unar and lsar: Objective-C tools for uncompressing archive files" +arch=(x86_64) +arch+=(i686 armv7h) url="http://unarchiver.c3.cx/" -license=(LGPL2.1) - -depends=(gnustep-base openssl bzip2 gcc-libs zlib) -depends_x86_64=("icu>=60" "icu<61") -depends_i686=("icu>=60" "icu<61") -depends_armv7h=("icu>=60" "icu<61") -makedepends=(gcc-objc unzip) +license=('LGPL2.1') +depends=(gnustep-base openssl bzip2 icu gcc-libs zlib) +depends+=('icu>=61' 'icu<62') +makedepends=(gcc-objc gnustep-make) replaces=(unarchiver unrar) conflicts=(unarchiver unrar) provides=(unarchiver unrar) - -source=("$pkgname-$pkgver.zip::https://theunarchiver.com/downloads/TheUnarchiverSource.zip" +source=("https://bitbucket.org/kosovan/theunarchiver/get/unar-${pkgver}.tar.gz" "native_obj_exceptions.patch") -sha256sums=('ac4cedf9b49375c0f805bda010fa03629d05ab283a0a8e35bf2dd01ae477e0a1' - '8b5be982e9cfd8cb800443d0f11c1e474ccfa3d9d81e1e869ee84b8f73f74cdd') -noextract=("$pkgname-$pkgver.zip") - -prepare() -{ - mkdir $pkgname-$pkgver - cd $pkgname-$pkgver - unzip ../$pkgname-$pkgver.zip +sha1sums=('d7dac2b1786e63787dbea74030ecdf8c425de730' + 'b8024026607dc2de758479b73d8b01ca6f692b59') - patch -p1 < "$srcdir/native_obj_exceptions.patch" +prepare(){ + cd "$srcdir/kosovan-theunarchiver-${_commit}" - cd XADMaster - . /usr/share/GNUstep/Makefiles/GNUstep.sh + patch -p1 < ../native_obj_exceptions.patch } build() { - cd "$srcdir/$pkgname-$pkgver/XADMaster" + cd "$srcdir/kosovan-theunarchiver-${_commit}/XADMaster" + + . /usr/share/GNUstep/Makefiles/GNUstep.sh make -f Makefile.linux } package() { - cd "$srcdir/$pkgname-$pkgver/XADMaster" + cd "$srcdir/kosovan-theunarchiver-${_commit}/XADMaster" install -d "$pkgdir/usr/bin/" install -m755 unar lsar "$pkgdir/usr/bin/" - cd "$srcdir/$pkgname-$pkgver/Extra" + cd "$srcdir/kosovan-theunarchiver-${_commit}/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 -m644 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" } diff --git a/libre/unar/native_obj_exceptions.patch b/libre/unar/native_obj_exceptions.patch index 600c469f1..9c84918b2 100644 --- a/libre/unar/native_obj_exceptions.patch +++ b/libre/unar/native_obj_exceptions.patch @@ -1,6 +1,6 @@ -diff -Naur a/UniversalDetector/Makefile.linux b/UniversalDetector/Makefile.linux ---- a/UniversalDetector/Makefile.linux 2011-04-27 03:32:21.000000000 +0200 -+++ b/UniversalDetector/Makefile.linux 2011-12-22 10:48:32.138621163 +0100 +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 \ @@ -9,9 +9,9 @@ diff -Naur a/UniversalDetector/Makefile.linux b/UniversalDetector/Makefile.linux -fgnu-runtime \ -fexceptions \ -fobjc-exceptions \ -diff -Naur a/XADMaster/Makefile.linux b/XADMaster/Makefile.linux ---- a/XADMaster/Makefile.linux 2011-04-27 03:32:21.000000000 +0200 -+++ b/XADMaster/Makefile.linux 2011-12-22 10:48:15.488721721 +0100 +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 \ -- cgit v1.2.3