From 5cacc86e47132dcd05881a53fb96c67dea95d518 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Tue, 28 Nov 2017 20:40:00 +0100 Subject: libre/unar: fixed PKGBUILD and icu dependencies --- libre/unar/PKGBUILD | 49 +++++++++++++++++++++------------- libre/unar/native_obj_exceptions.patch | 12 ++++----- 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/libre/unar/PKGBUILD b/libre/unar/PKGBUILD index 4fa401e3b..030905555 100644 --- a/libre/unar/PKGBUILD +++ b/libre/unar/PKGBUILD @@ -5,41 +5,54 @@ # Contributor (Hyperbola): André Silva pkgname=unar + pkgver=1.10.1 -pkgrel=5 +pkgrel=6 +arch=(x86_64 i686 armv7h) + pkgdesc="An Objective-C application for uncompressing archive files" -arch=('x86_64' 'i686' 'armv7h') url="http://unarchiver.c3.cx/" -license=('LGPL2.1') -depends=('gnustep-base' 'openssl' 'bzip2' 'icu=60.1' 'gcc-libs' 'zlib') -makedepends=('gcc-objc') -replaces=('unarchiver' 'unrar') -conflicts=('unarchiver' 'unrar') -provides=('unarchiver' 'unrar') -source=("http://unarchiver.c3.cx/downloads/${pkgname}${pkgver}_src.zip" +license=(LGPL2.1) + +depends=(gnustep-base openssl bzip2 gcc-libs zlib) +depends_x86_64=(icu=60.1) +depends_i686=(icu=60.1) +depends_armv7h=(icu=58.2) +makedepends=(gcc-objc unzip) +replaces=(unarchiver unrar) +conflicts=(unarchiver unrar) +provides=(unarchiver unrar) + +source=("$pkgname-$pkgver.zip::https://theunarchiver.com/downloads/TheUnarchiverSource.zip" "native_obj_exceptions.patch") +sha256sums=('ac4cedf9b49375c0f805bda010fa03629d05ab283a0a8e35bf2dd01ae477e0a1' + '8b5be982e9cfd8cb800443d0f11c1e474ccfa3d9d81e1e869ee84b8f73f74cdd') +noextract=("$pkgname-$pkgver.zip") -build() { - cd "$srcdir/The Unarchiver" +prepare() +{ + mkdir $pkgname-$pkgver + cd $pkgname-$pkgver + unzip ../$pkgname-$pkgver.zip - patch -p1 < ../native_obj_exceptions.patch + patch -p1 < "$srcdir/native_obj_exceptions.patch" cd XADMaster . /usr/share/GNUstep/Makefiles/GNUstep.sh +} + +build() { + cd "$srcdir/$pkgname-$pkgver/XADMaster" make -f Makefile.linux } package() { - cd "$srcdir/The Unarchiver/XADMaster" + cd "$srcdir/$pkgname-$pkgver/XADMaster" install -d "$pkgdir/usr/bin/" install -m755 unar lsar "$pkgdir/usr/bin/" - cd "$srcdir/The Unarchiver/Extra" + cd "$srcdir/$pkgname-$pkgver/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: -sha256sums=('40967014a505b7a27864c49dc3b5d30b98ae4e6d4873783b2ef9ef9215fd092b' - '90513ae4c949cc4b842b92d229d8f87d953632cd9b9c289bc550771a9cebd07d') diff --git a/libre/unar/native_obj_exceptions.patch b/libre/unar/native_obj_exceptions.patch index 9c84918b2..600c469f1 100644 --- a/libre/unar/native_obj_exceptions.patch +++ b/libre/unar/native_obj_exceptions.patch @@ -1,6 +1,6 @@ -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 +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 @@ -16,7 +16,6 @@ GNUSTEP_OPTS = -DGNUSTEP \ @@ -9,9 +9,9 @@ diff -Naur The Unarchiver/UniversalDetector/Makefile.linux The Unarchiver_patche -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 +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 @@ -16,7 +16,6 @@ GNUSTEP_OPTS = -DGNUSTEP \ -- cgit v1.2.3