From 1c3f77e9c90b371bbb5ccd3b1c8fd79ca6629510 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Wed, 3 Dec 2014 21:34:31 +0000
Subject: unrar: update to 5.2.2

---
 abs/extra/unrar/PKGBUILD                 | 27 ++++++++++++++-------------
 abs/extra/unrar/unrar-4.2.1-soname.patch | 11 -----------
 abs/extra/unrar/unrar-5.2.2-soname.patch | 11 +++++++++++
 3 files changed, 25 insertions(+), 24 deletions(-)
 delete mode 100644 abs/extra/unrar/unrar-4.2.1-soname.patch
 create mode 100644 abs/extra/unrar/unrar-5.2.2-soname.patch

diff --git a/abs/extra/unrar/PKGBUILD b/abs/extra/unrar/PKGBUILD
index f4ef1a1..68bd852 100644
--- a/abs/extra/unrar/PKGBUILD
+++ b/abs/extra/unrar/PKGBUILD
@@ -1,35 +1,37 @@
-# $Id: PKGBUILD 161802 2012-06-14 17:00:58Z giovanni $
+# $Id$
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: dorphell <dorphell@gmx.net>
 
 pkgbase=unrar
 pkgname=('unrar' 'libunrar')
-pkgver=4.2.4
+pkgver=5.2.2
 pkgrel=1
+epoch=1
 arch=('i686' 'x86_64')
 url="http://www.rarlab.com/rar_add.htm"
 license=('custom')
 makedepends=('gcc-libs')
 source=("http://www.rarlab.com/rar/unrarsrc-${pkgver}.tar.gz"
-        'unrar-4.2.1-soname.patch')
-md5sums=('8ea9d1b4139474b282d76e627a2de3e4'
-         'b9ec767da9a36f5ac38034c974e77758')
+        'unrar-5.2.2-soname.patch')
+md5sums=('69ef5af8442cbb7dfdebe298bfb9c61a'
+         'cd9a5291db0379d73148872cf6e6d3ce')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgbase}"
+  patch -Np1 -i "${srcdir}/unrar-5.2.2-soname.patch"
+}
 
-  patch -Np0 -i "${srcdir}/unrar-4.2.1-soname.patch"
-
+build() {
+  cd "${srcdir}/${pkgbase}"
   cp -a ${srcdir}/unrar ${srcdir}/libunrar
-  make -C "${srcdir}"/libunrar -f makefile.unix lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}"
-  make -f makefile.unix CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true"
+  make -C "${srcdir}"/libunrar lib libversion=${pkgver} CXXFLAGS="-fPIC ${CXXFLAGS}"
+  make CXXFLAGS="-fPIC ${CXXFLAGS}" STRIP="true"
 }
 
 package_unrar() {
   pkgdesc="The RAR uncompression program"
   depends=('gcc-libs')
   cd "${srcdir}/${pkgbase}"
-
   install -Dm755 unrar "${pkgdir}/usr/bin/unrar"
   # install license
   install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
@@ -39,10 +41,9 @@ package_libunrar() {
   pkgdesc="Library and header file for applications that use libunrar"
   depends=('gcc-libs')
   cd "${srcdir}/libunrar"
-
   install -Dm755 libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.${pkgver}"
   install -Dm644 dll.hpp "${pkgdir}/usr/include/unrar/dll.hpp"
-  ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.4"
+  ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so.5"
   ln -s libunrar.so.${pkgver} "${pkgdir}/usr/lib/libunrar.so"
   # install license
   install -Dm644 license.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/abs/extra/unrar/unrar-4.2.1-soname.patch b/abs/extra/unrar/unrar-4.2.1-soname.patch
deleted file mode 100644
index 83ebe96..0000000
--- a/abs/extra/unrar/unrar-4.2.1-soname.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- makefile.unix	2012-02-23 10:23:14.000000000 +0100
-+++ makefile.unix	2012-05-05 12:58:13.000000000 +0200
-@@ -131,7 +131,7 @@
- lib:	CXXFLAGS+=$(LIBFLAGS)
- lib:	clean $(OBJECTS) $(LIB_OBJ)
- 	@rm -f libunrar.so
--	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
-+	$(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
- 
- install-unrar:
- 			install -D unrar $(DESTDIR)/bin/unrar
diff --git a/abs/extra/unrar/unrar-5.2.2-soname.patch b/abs/extra/unrar/unrar-5.2.2-soname.patch
new file mode 100644
index 0000000..24d250a
--- /dev/null
+++ b/abs/extra/unrar/unrar-5.2.2-soname.patch
@@ -0,0 +1,11 @@
+--- a/makefile	2013-04-29 16:27:05.000000000 +0200
++++ b/makefile	2013-10-01 22:07:29.611485989 +0200
+@@ -133,7 +133,7 @@
+ lib:	CXXFLAGS+=$(LIBFLAGS)
+ lib:	clean $(OBJECTS) $(LIB_OBJ)
+ 	@rm -f libunrar.so
+-	$(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
++	$(LINK) -shared -Wl,-soname,libunrar.so.$(libversion) -o libunrar.so.$(libversion) $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ 
+ install-unrar:
+ 			install -D unrar $(DESTDIR)/bin/unrar
-- 
cgit v0.12

