From 67bf884802bfd4b190fb5f8cd521c37660f05d53 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Tue, 7 Aug 2018 00:10:08 -0400
Subject: libre/pacman: Try out some new patches

---
 libre/pacman/PKGBUILD | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

(limited to 'libre/pacman/PKGBUILD')

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 0d81747eb..9f6f1e699 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=pacman
 pkgver=5.1.1
 pkgrel=1
-pkgrel+=.parabola1
+pkgrel+=.parabola2
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 arch+=('i686' 'armv7h')
@@ -38,7 +38,10 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
         makepkg.conf.in
         pacman-keyring.service
         pacman-keyring.timer
-        0001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch)
+        0001-makepkg-Better-error-messages-for-versions-in-check-.patch
+        0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch
+        0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch
+        0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch)
 source_armv7h=(0001-Sychronize-filesystem.patch
                0002-Revert-close-stdin-before-running-install-scripts.patch
                0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch)
@@ -50,7 +53,10 @@ sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
             'ecef1e98eaaf207f4f2c3d07cfe13533866e1e774240eb833e8b3bd691ada95f'
             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
-            'a145dca282ad3a130983493f675a5439dfb88c70da8c44b4bf69a5f006dc8a01')
+            '4ada85b022f3fa7a39a0b67dce145d1da356665aa1d703005a698029e83e0515'
+            '7188edbc27382e1c1d29b0c3c7e1711ba407423447f4e135e451cf611aa4cea4'
+            '45c071c6005c590612f619419acd3685cc12cee2a46b9773b80cdb7aa5c6d1e2'
+            '5205b3b1d8872bbb421d8fe7518d0316d9c827ef2e2b24cb11440b5ba38d79a6')
 sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc'
                    '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9'
                    '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb')
@@ -60,13 +66,16 @@ prepare() {
 
   # From Arch ARM
   if [ "${CARCH}" = "armv7h" ]; then
-    patch -p1 -i $srcdir/0001-Sychronize-filesystem.patch
-    patch -p1 -i $srcdir/0002-Revert-close-stdin-before-running-install-scripts.patch
-    patch -p1 -i $srcdir/0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
+    patch -p1 -i ../0001-Sychronize-filesystem.patch
+    patch -p1 -i ../0002-Revert-close-stdin-before-running-install-scripts.patch
+    patch -p1 -i ../0003-Revert-alpm_run_chroot-always-connect-parent2child-p.patch
   fi
 
   # From Parabola
-  patch -p1 -i $srcdir/0001-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
+  patch -p1 -i ../0001-makepkg-Better-error-messages-for-versions-in-check-.patch
+  patch -p1 -i ../0002-makepkg-check_pkgrel-Don-t-say-decimal-in-the-error-.patch
+  patch -p1 -i ../0003-makepkg-check_pkgver-Report-what-the-bad-pkgver-is.patch
+  patch -p1 -i ../0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
 }
 
 build() {
-- 
cgit v1.2.3