p7zip-9.38-1.parabola1: updating version

1 files changed, 26 insertions, 22 deletions

diff --git a/libre/p7zip/PKGBUILD b/libre/p7zip/PKGBUILD
index 3dab7ab64..5c699e2bc 100644
--- a/libre/p7zip/PKGBUILD
+++ b/libre/p7zip/PKGBUILD
@@ -1,14 +1,15 @@
-# $Id: PKGBUILD 203246 2014-01-06 19:32:24Z bpiotrowski $
+# $Id: PKGBUILD 231209 2015-02-09 23:18:55Z bisson $
 # Contributor (Arch): Thayer Williams <thayer@archlinux.org>
 # Contributor (Arch): Hugo Doria <hugo@archlinux.org>
 # Contributor (Arch): TuxSpirit<tuxspirit@archlinux.fr>  2007/11/17 21:22:36 UTC
 # Contributor (Arch): Daniel J Griffiths <ghost1227@archlinux.us>
 # Maintainer (Arch): Gaetan Bisson <bisson@archlinux.org>
+# Maintainer: André Silva <emulatorman@parabola.nu>
 
 _pkgname=p7zip-libre
 pkgname=p7zip
-pkgver=9.20.1
-pkgrel=9.parabola1
+pkgver=9.38
+pkgrel=1.parabola1
 pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree decompression engine for RAR archives'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
@@ -16,16 +17,19 @@ arch=('i686' 'x86_64' 'mips64el')
 conflicts=('p7zip-libre')
 replaces=('p7zip-libre')
 depends=('gcc-libs' 'bash')
-optdepends=('wxgtk2.8: GUI'
+optdepends=('wxgtk: GUI'
             'desktop-file-utils: desktop entries')
-makedepends=('yasm' 'nasm' 'wxgtk2.8')
+makedepends=('yasm' 'nasm' 'wxgtk')
 mksource=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}_${pkgver}_src_all.tar.bz2")
 source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}_${pkgver}_src_all.tar.bz2"
-        '7zFM.desktop' 'libre.patch')
-mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7')
-sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8'
+        '7zFM.desktop'
+        'osversion.patch'
+        'libre.patch')
+mksha1sums=('693bc2a1426df7a12762b4542a8327add23f0dc3')
+sha1sums=('b8e52e929577e603380a20371f359863d3e22466'
           'f2c370d6f1b286b7ce9a2804e22541b755616a40'
-          'bd929fdcbc05dcc783f7fa7d156ed15d38b0b4b3')
+          '8c086db1c7be0d52d2ac971f44adbdccf6dd82de'
+          '33821327ea734f218ed284ff03e8a0d0ac945070')
 
 options=('!makeflags')
 install=install
@@ -35,9 +39,10 @@ mksource() {
 
 	# Remove nonfree unRAR utility files from the source
 	rm -rv CPP/7zip/{Archive,Compress}/Rar
-	rm -v CPP/7zip/Compress/{Rar{2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp}
+	rm -v CPP/7zip/Compress/{Rar{1,2,3}Decoder.{cpp,h},Rar3Vm.{cpp,h},RarCodecsRegister.cpp}
 	rm -v CPP/7zip/Crypto/{Rar20Crypto,RarAes}.{cpp,h}
-	rm -v DOCS/unRarLicense.txt
+	rm -v Utils/file_Codecs_Rar29_so.py
+	rm -v DOC/unRarLicense.txt
 
 	# Remove nonfree parent folder icon
 	rm CPP/7zip/UI/FileManager/res/ParentFolder.h
@@ -45,17 +50,15 @@ mksource() {
 
 prepare() {
 	cd "${srcdir}/${pkgname}_${pkgver}"
+	[[ $CARCH = x86_64 ]] &&
+	cp makefile.linux_amd64_asm makefile.machine ||
+	cp makefile.linux_x86_asm_gcc_4.X makefile.machine
+
+	patch -p1 -i ../osversion.patch
+	sed -i 's/x86_64-linux-gnu//g' CPP/7zip/*/*/*.depend
 
 	# remove rar and parent folder icon references
 	patch -Np1 -i ../libre.patch
-
-	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() {
@@ -70,10 +73,11 @@ package() {
 		DEST_HOME="/usr" \
 		DEST_MAN="/usr/share/man"
 
-	# Licenses
+	# Doc and licenses
+	cp -a DOC/* "${pkgdir}"/usr/share/doc/p7zip
 	install -d "${pkgdir}"/usr/share/licenses/p7zip
 	ln -s -t "${pkgdir}"/usr/share/licenses/p7zip \
-		/usr/share/doc/p7zip/DOCS/License.txt
+		/usr/share/doc/p7zip/License.txt
 
 	# Integration with stuff...
 	install -Dm644 GUI/p7zip_32.png "${pkgdir}"/usr/share/icons/hicolor/32x32/apps/p7zip.png
@@ -85,5 +89,5 @@ package() {
 	find GUI/help -type d -exec chmod 755 {} \;
 	cp -r GUI/help "${pkgdir}"/usr/lib/p7zip/
 
-	chmod -R u+w "${pkgdir}/usr"
+	chmod -R u+w,o+r "${pkgdir}/usr"
 }