libre/pacman: Backport more patches

 - Fully remove whirlpoolsums=() support from makepkg, rather than having
   weird half-support.
 - Pass --stream to `hg clone` when creating the working copy.

1 files changed, 16 insertions, 3 deletions

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 1976af1fc..44099356d 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=pacman
 pkgver=5.1.1
 pkgrel=1
-pkgrel+=.parabola5
+pkgrel+=.parabola6
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 arch+=('i686' 'armv7h')
@@ -41,7 +41,9 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
         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)
+        0004-makepkg-Treat-pkgrel-more-similarly-to-pkgver.patch
+        0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch
+        0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.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)
@@ -56,7 +58,9 @@ sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
             '075ac1f8d782ac9868f5e7f3043f684a00da33915eba9ec7e4a8940992ddc269'
             '8065c468706be669bc6718a6634e5e58507cba9b8121bf5cfe1703daacab1c3e'
             'd01100d19b9868da8c689a7a14b6340574ecca0105a8d8ef866b281ad3d7e637'
-            'cc2c82ca0c3a45dd4e200fa2219da52912a8718ab7e16091ad2938ada657f033')
+            'cc2c82ca0c3a45dd4e200fa2219da52912a8718ab7e16091ad2938ada657f033'
+            'a73a98b395ec671575ceb0d18a22d1b9ff09935528104941b12a9a124024f9a1'
+            '1f6a0a8518dc912bc5d9df335b6da220bd3cc51630b6b47c09ec9d4cd47ae432')
 sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc'
                    '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9'
                    '2f586f72c34150330389854575a21be1d3ef3637c4f94bec2e948c2717a5aecb')
@@ -76,6 +80,15 @@ prepare() {
   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
+
+  # From Parabola
+  patch -p1 -i ../0001-makepkg-Pass-stream-to-hg-clone-when-creating-the-wo.patch
+
+  # From pacman-dev mailing list
+  # Properly drop whirlpoolsums support (instead of mysteriously
+  # failing).  Backported because some Parabola packages actually use
+  # whirlpoolsums.
+  patch -p1 -i ../0001-Revert-makepkg-add-whirlpool-to-the-list-of-hashing-.patch
 }
 
 build() {