diff options
| -rw-r--r-- | 0001-libremakepkg-rw-startdir.patch (renamed from 0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch) | 0 | ||||
| -rw-r--r-- | 0002-libremakepkg-pacman_5_2.patch | 23 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
3 files changed, 34 insertions, 7 deletions
diff --git a/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch b/0001-libremakepkg-rw-startdir.patch index 75b2d6f..75b2d6f 100644 --- a/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch +++ b/0001-libremakepkg-rw-startdir.patch diff --git a/0002-libremakepkg-pacman_5_2.patch b/0002-libremakepkg-pacman_5_2.patch new file mode 100644 index 0000000..186b05d --- /dev/null +++ b/0002-libremakepkg-pacman_5_2.patch @@ -0,0 +1,23 @@ +--- libretools-20181004.orig/src/lib/common.sh.in 2018-10-04 14:31:05.000000000 -0500 ++++ libretools-20181004/src/lib/common.sh.in 2019-10-26 03:17:40.383684905 -0500 +@@ -58,7 +58,7 @@ + declare -f "${fns[@]}" | sed 's/^[a-z]/_makepkg_&/' + + # re-declare ${fn} as a wrapper around _makepkg_${fn} +- printf '%s() { local mesg; mesg="$(_ "$1")"; _p _makepkg_"${FUNCNAME[0]}" "$mesg" "${@:2}"; }\n' \ ++ printf '%s() { local mesg; local QUIET=$(true); mesg="$(_ "$1")"; _p _makepkg_"${FUNCNAME[0]}" "$mesg" "${@:2}"; }\n' \ + "${fns[@]}" + )" + +--- libretools-20181004.orig/src/lib/conf.sh.in 2018-10-04 14:31:05.000000000 -0500 ++++ libretools-20181004/src/lib/conf.sh.in 2019-10-26 03:11:48.993679739 -0500 +@@ -200,9 +200,6 @@ + done + } + +- # This line is taken from the makepkg source +- local known_hash_algos=('md5' 'sha1' 'sha224' 'sha256' 'sha384' 'sha512') +- + # From the "OPTIONS AND DIRECTIVES" section (in order of mention) + unset -v pkgname pkgver + unset -f pkgver @@ -16,26 +16,30 @@ license=('GPL3' 'GPL2') pkgver=20181004 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} - 0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch) + 0001-libremakepkg-rw-startdir.patch + 0002-libremakepkg-pacman_5_2.patch) sha256sums=('2bdefd1803ba3e6cbd1eb955fad3de9ce8a4abfd23a0bd96a60772762df7b53b' 'SKIP' - '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883') + '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883' + '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df') validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9') # Luke Shumaker -pkgrel=5 +pkgrel=6.1 arch=('any') makedepends=(ruby-ronn) checkdepends=( bash-bats git - 'pacman>=5.1.1-1' 'pacman<5.2' + 'pacman>=5.1.1-1' 'pacman<5.3' expac openssh rsync tokyocabinet ) + prepare() { - cd "$srcdir/$pkgbase-$pkgver" - patch -N -p1 -i $srcdir/0001-libremakepkg-fix-building-packages-requring-a-rw-sta.patch + cd "$srcdir/$pkgbase-$pkgver" + patch -N -p1 -i $srcdir/0001-libremakepkg-rw-startdir.patch + patch -N -p1 -i $srcdir/0002-libremakepkg-pacman_5_2.patch } build() { @@ -96,7 +100,7 @@ package_libretools() { depends=( "librelib=$pkgver" "gitget=$pkgver" # `createworkdir` - 'pacman>=5.1.1-1' 'pacman<5.2' + 'pacman>=5.1.1-1' 'pacman<5.3' arch-install-scripts # `mkarchroot` uses `pacstrap` binutils # `libremakepkg` uses `makepkg` uses `strip` expac # `libredbdiff` |