diff options
author | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-08-28 01:35:32 +0200 |
---|---|---|
committer | Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> | 2022-08-28 01:45:54 +0200 |
commit | 3e90ee2fb3bcc5cb054ac512a5065156b2afb7b5 (patch) | |
tree | 59944b1b07b17bfa8388bf5b4f202413481ddf87 /libre/libretools | |
parent | a0e6ce8cbfcd979242e6bfddd39faa6e0cb316e4 (diff) |
libretools: librefetch: fix "does not contain a valid package suffix"
Without that fix we have the following error when trying to build a
tarball that needs to be created with librefetch:
$PKGEXT does not contain a valid package suffix (needs '.pkg.tar*',
got '<pkgname>-<pkgver>.pkg.tar.xz')
I was told by bill-auger on #parabola that it could be fixed by applying this change:
https://git.parabola.nu/packages/libretools.git/commit/?h=wip-2022-01&id=23321a3f77ecbb76b4fc79adfbf212d07dc3a0f1
So I'm adding this patch to the libretools package.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Diffstat (limited to 'libre/libretools')
-rw-r--r-- | libre/libretools/PKGBUILD | 7 | ||||
-rw-r--r-- | libre/libretools/librefetch-pkgext.patch | 12 |
2 files changed, 17 insertions, 2 deletions
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD index df0983279..ec1224550 100644 --- a/libre/libretools/PKGBUILD +++ b/libre/libretools/PKGBUILD @@ -12,11 +12,13 @@ license=('GPL3' 'GPL2') pkgver=20220118 source=(https://repo.parabola.nu/other/$pkgname/$pkgname-$pkgver.tar.gz{,.sig} 0001-libremakepkg-rw-startdir.patch - 0002-libremakepkg-pacman_5_2.patch) + 0002-libremakepkg-pacman_5_2.patch + librefetch-pkgext.patch) sha256sums=('033fe25cd972296b7fc8b5c05ef048fac296194a3b24e4cf6459544616ada49c' 'SKIP' '19ed0fd21c9c789dd336b63b22094c45363b6ac5d7d1ab0eecd852d7f00d1883' - '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df') + '8986adf14a81b979b2ff4c4e3e76483115c146782e4ba30640649299f98355df' + 'SKIP') validpgpkeys=('99195DD3BB6FE10A2F36ED8445698744D4FFBFC9' # Luke Shumaker 'BFA8008A8265677063B11BF47171986E4B745536') # Andreas Grapentin @@ -36,6 +38,7 @@ prepare() { 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 + patch -N -p1 -i $srcdir/librefetch-pkgext.patch } build() { diff --git a/libre/libretools/librefetch-pkgext.patch b/libre/libretools/librefetch-pkgext.patch new file mode 100644 index 000000000..9fede99a5 --- /dev/null +++ b/libre/libretools/librefetch-pkgext.patch @@ -0,0 +1,12 @@ +Index: libretools-20220118/src/librefetch/librefetch +=================================================================== +--- libretools-20220118.orig/src/librefetch/librefetch ++++ libretools-20220118/src/librefetch/librefetch +@@ -221,7 +221,6 @@ doit() { + mv -f "$base_dst" "$dst" + fi + else +- export PKGEXT=${base_dst##*/} + export PKGDEST=${dst%/*} + export pkg_file=$dst + |