[arch-commits] Commit in p7zip/trunk (PKGBUILD)

[Evangelos Foutras]

    Date: Tuesday, January 19, 2021 @ 14:11:41
  Author: foutrelis
Revision: 406413

upgpkg: p7zip 17.03-2: fix Zip extraction issue (FS#69253)

Revert the commit that caused this until it is fixed upstream.

Modified:
  p7zip/trunk/PKGBUILD

----------+
 PKGBUILD |   23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-01-19 13:43:09 UTC (rev 406412)
+++ PKGBUILD	2021-01-19 14:11:41 UTC (rev 406413)
@@ -7,26 +7,37 @@
 
 pkgname=p7zip
 pkgver=17.03
-pkgrel=1
+pkgrel=2
 pkgdesc="Command-line file archiver with high compression ratio"
 arch=('x86_64')
 url="https://github.com/jinfeihan57/p7zip"
 license=('LGPL' 'custom:unRAR')
 depends=('gcc-libs' 'sh')
-source=(https://github.com/jinfeihan57/p7zip/archive/v$pkgver/$pkgname-$pkgver.tar.gz)
-sha256sums=('bb4b9b21584c0e076e0b4b2705af0dbe7ac19d378aa7f09a79da33a5b3293187')
+source=(https://github.com/jinfeihan57/p7zip/archive/v$pkgver/$pkgname-$pkgver.tar.gz
+        oemcp-iconv.patch::https://github.com/jinfeihan57/p7zip/commit/c104127e6a93.patch
+        oemcp-cygwin.patch::https://github.com/jinfeihan57/p7zip/commit/0e0a1a8316b6.patch
+        oemcp-apple.patch::https://github.com/jinfeihan57/p7zip/commit/334a01e3f8bc.patch)
+sha256sums=('bb4b9b21584c0e076e0b4b2705af0dbe7ac19d378aa7f09a79da33a5b3293187'
+            'e32636aa03b9c75a2b9d9138e03a738ceed6ca5da4c3c67e7f5981e135fb9e24'
+            'fa658d42cc1da2b567a210a819502bd8e3bb1e02d5d23e087e2278c4aaffe15e'
+            'a1b21ceb5582633d85d41ec9e4995f758cba1731dd80fb6f45a7bc6b18bfe394')
 
 prepare() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
+
+  # https://github.com/jinfeihan57/p7zip/issues/112
+  patch -Rp1 -i ../oemcp-apple.patch
+  patch -Rp1 -i ../oemcp-cygwin.patch
+  patch -Rp1 -i ../oemcp-iconv.patch
 }
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
   make OPTFLAGS="$CPPFLAGS $CFLAGS" 7z 7zr 7za
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
   make install \
     DEST_DIR="$pkgdir" \