p7zip-libre-9.20.1-9.3: optimized removing source and patching package

1 files changed, 19 insertions, 17 deletions

diff --git a/libre/p7zip-libre/PKGBUILD b/libre/p7zip-libre/PKGBUILD
index fb803b74c..ef3075c53 100644
--- a/libre/p7zip-libre/PKGBUILD
+++ b/libre/p7zip-libre/PKGBUILD
@@ -8,7 +8,7 @@
 pkgname=p7zip-libre
 _pkgname=${pkgname%-libre}
 pkgver=9.20.1
-pkgrel=9.2
+pkgrel=9.3
 pkgdesc='Command-line version of the 7zip compressed file archiver, without nonfree unrar support'
 url='http://p7zip.sourceforge.net/'
 license=('GPL')
@@ -20,34 +20,36 @@ depends=('gcc-libs' 'bash')
 optdepends=('wxgtk2.8: GUI'
             'desktop-file-utils: desktop entries')
 makedepends=('yasm' 'nasm' 'wxgtk2.8')
-mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2"
-          'p7zip-libre.patch' 'parent-folder-icon.patch')
+mksource=("http://downloads.sourceforge.net/project/${_pkgname}/${_pkgname}/${pkgver}/${_pkgname}_${pkgver}_src_all.tar.bz2")
 source=("https://repo.parabolagnulinux.org/other/${pkgname}/${pkgname}_${pkgver}_src_all.tar.bz2"
-        '7zFM.desktop')
-mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7'
-            '8fc0e6e80aeec371a8c80e7a6082594ac6d08aed'
-            '335a4a38d457d2b0166538d514ffd3c183bbb37f')
-sha1sums=('ef3f668f5d75941f7a3ba7873e4b234b9f97445b'
-          'f2c370d6f1b286b7ce9a2804e22541b755616a40')
+        '7zFM.desktop' 'libre.patch')
+mksha1sums=('1cd567e043ee054bf08244ce15f32cb3258306b7')
+sha1sums=('4e5ba097a90f3e00ad072023030c87f0707733b8'
+          'f2c370d6f1b286b7ce9a2804e22541b755616a40'
+          'bd929fdcbc05dcc783f7fa7d156ed15d38b0b4b3')
 
 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
-	msg 'Replacing the parent folder icon'
+	
+        # 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/Crypto/{Rar20Crypto,RarAes}.{cpp,h}
+        rm -v DOCS/unRarLicense.txt
+
+	# Remove nonfree parent folder icon
 	rm CPP/7zip/UI/FileManager/res/ParentFolder.h
-	patch -Np1 -i ../parent-folder-icon.patch
 }
 
 prepare() {
 	cd "${srcdir}/${_pkgname}_${pkgver}"
+
+        # 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 \