p7zip-libre-9.20.1-9: rebuild against wxgtk 3.0.0 and add mksource

1 files changed, 24 insertions, 16 deletions

diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index 7f8c3b789..f1bce25ec 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 195474 2013-09-30 18:46:35Z bisson $
+# $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $
 # Contributor: Thayer Williams <thayer@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 # Contributor: TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
@@ -8,8 +8,8 @@
 pkgname=p7zip-libre
 _pkgname=${pkgname%-libre}
 pkgver=9.20.1
-pkgrel=8
-pkgdesc='Command-line version of the 7zip compressed file archiver without Rar'
+pkgrel=9
+pkgdesc='Command-line version of the 7zip compressed file archiver, without unrar support'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,36 +17,44 @@ provides=("p7zip=$pkgver")
 conflicts=('p7zip')
 replaces=('p7zip')
 depends=('gcc-libs' 'bash')
-optdepends=('wxgtk: GUI'
+optdepends=('wxgtk2.8: GUI'
             'desktop-file-utils: desktop entries')
-makedepends=('yasm' 'nasm' 'wxgtk')
-source=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2"
-        'p7zip-libre.patch'
+makedepends=('yasm' 'nasm' 'wxgtk2.8')
+mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2"
+          'p7zip-libre.patch')
+source=("https://repo.parabolagnulinux.org/sources/${pkgname}_${pkgver}_src_all.tar.bz2"
         '7zFM.desktop')
-sha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
-          '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed'
+mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
+            '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed')
+sha1sums=('82a54887878e3fd90bfbd3c66d2ce3b6a3532a95'
           'f2c370d6f1b286b7ce9a2804e22541b755616a40')
 
 options=('!makeflags')
 install=install
 
+mksource() {
+        cd "${srcdir}/${_pkgname}_${pkgver}"
+    msg "Removing unRar"
+# Generate patch
+#       sed -e '/Rar/d' -i makefile*
+#   find -name '*Rar*' -print0 | xargs -0 rm -rvf
+# Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile
+    patch -Np1 -i ../p7zip-libre.patch
+}
+
 prepare() {
 	cd "${srcdir}/${_pkgname}_${pkgver}"
 	rm GUI/kde4/p7zip_compress.desktop
 	[[ $CARCH = x86_64 ]] \
 	&& cp makefile.linux_amd64_asm makefile.machine \
 	|| cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+
+	sed -i 's/wx-config/wx-config-2.8/g' CPP/7zip/TEST/TestUI/makefile \
+		CPP/7zip/UI/{FileManager,GUI,P7ZIP}/makefile
 }
 
 build() {
 	cd "${srcdir}/${_pkgname}_${pkgver}"
-    msg "Removing unRar"
-# Generate patch
-#	sed -e '/Rar/d' -i makefile*
-#   find -name '*Rar*' -print0 | xargs -0 rm -rvf 
-# Remove Rar mentions in CPP/7zip/Bundles/Format7zFree/makefile
-    patch -Np1 -i ../p7zip-libre.patch
-
 	make all4 OPTFLAGS="${CXXFLAGS}"
 }