From e73c4b99e70022556acffb33e97f6634da5f2693 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@lukeshu.com>
Date: Sat, 29 Sep 2018 11:51:05 -0400
Subject: libre/pacman: Drop the `hg clone --stream` patch, fix build on
 automake-1.16

https://lists.archlinux.org/pipermail/pacman-dev/2018-September/022834.html
---
 libre/pacman/PKGBUILD | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'libre/pacman')

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index 44099356d..9c19b4c82 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -12,7 +12,7 @@
 pkgname=pacman
 pkgver=5.1.1
 pkgrel=1
-pkgrel+=.parabola6
+pkgrel+=.parabola7
 pkgdesc="A library-based package manager with dependency support"
 arch=('x86_64')
 arch+=('i686' 'armv7h')
@@ -34,6 +34,7 @@ options=('strip' 'debug')
 validpgpkeys=('6645B0A8C7005E78DB1D7864F99FFE0FEAE999BD'  # Allan McRae <allan@archlinux.org>
               'B8151B117037781095514CA7BBDFFC92306B1121') # Andrew Gregory (pacman) <andrew@archlinux.org>
 source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig}
+        ltmain-asneeded.patch::"https://git.archlinux.org/pacman.git/plain/build-aux/ltmain-asneeded.patch?id=28cb22e3c20676c42a08593b5553ee896b53e030"
         "${arch[@]/#/pacman.conf.}"
         makepkg.conf.in
         pacman-keyring.service
@@ -42,13 +43,13 @@ source=(https://sources.archlinux.org/other/pacman/$pkgname-$pkgver.tar.gz{,.sig
         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
-        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)
 sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
             'SKIP'
+            '8e29d09b8ccf78eda393c44acc027b7b6125d89e5a586ad78991752fc9e62a8c'
             '53c3d28314fd8fc6f92a0720c41fc5bd4c7b24793f84158d07988b294c5480a2'
             '6baddd5a4651f147b9412d86dc8c5b4763e4f34deaf140a7fb986fb4d4a05949'
             '435f4e93355048f83697317b35aad7788162bab5f58f1b9268bc83ad03ed41d8'
@@ -59,7 +60,6 @@ sha256sums=('be04b9162d62d2567e21402dcbabb5bedfdb03909fa5ec6e8568e02ab325bd8d'
             '8065c468706be669bc6718a6634e5e58507cba9b8121bf5cfe1703daacab1c3e'
             'd01100d19b9868da8c689a7a14b6340574ecca0105a8d8ef866b281ad3d7e637'
             'cc2c82ca0c3a45dd4e200fa2219da52912a8718ab7e16091ad2938ada657f033'
-            'a73a98b395ec671575ceb0d18a22d1b9ff09935528104941b12a9a124024f9a1'
             '1f6a0a8518dc912bc5d9df335b6da220bd3cc51630b6b47c09ec9d4cd47ae432')
 sha256sums_armv7h=('8d70fb5094f58aad98b601bbc42be354c2014b9fe734a1ee0b1e14bb041cc9cc'
                    '0e771370da68c855bfb4eaad4c2ae137883a474886a049b934dac2e775574cb9'
@@ -81,14 +81,19 @@ prepare() {
   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
+
+  # Because a Makefile.am was edited by
+  # 0001-makepkg-Better-error-messages-for-versions-in-check-.patch
+  #
+  # This is based of of the 'autogen.sh' script, which is in
+  # pacman.it, but not included in the tarball.
+  autoreconf -i
+  patch -d build-aux -Np0 -i "$srcdir/ltmain-asneeded.patch"
 }
 
 build() {
-- 
cgit v1.2.3