Update sources. Add pgp verification. Cosmetic changes.

1 files changed, 16 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 55176bc3c39e..3a7bd057498e 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,44 +2,42 @@
 
 pkgname=libfpx
 pkgver=1.3.1.10
-_srcver="$(printf '%s' "$pkgver" | sed -E s'/(\.)([0-9]*)$/-\2/')"
-pkgrel=4
+pkgrel=5
 pkgdesc='FlashPIX OpenSource Toolkit'
 arch=('x86_64')
 url='https://github.com/ImageMagick/libfpx/'
 license=('custom')
 depends=('gcc-libs')
-source=("https://www.imagemagick.org/download/delegates/${pkgname}-${_srcver}.tar.xz"
-        '010-libfpx-gcc10-fix.patch')
+source=("https://imagemagick.org/archive/delegates/${pkgname}-${pkgver%.*}-${pkgver##*.}.tar.xz"{,.asc}
+        '010-libfpx-gcc10-fix.patch'::'https://github.com/ImageMagick/libfpx/commit/c32b340581ba6c88c5092f374f655c7579b598a6.patch')
 sha256sums=('491b55535580d27355669c45fe995446bd34df5dbcdc15312e58c3ebecc6a455'
-            'e93f193b199023c5e2e2557c4f21fc276b8784f5a07363729235c42c16066cbd')
+            'SKIP'
+            '3223461ed0c79cf1e59c7d684efccceed28a16c6dbbcb54ecd6512f24e1330a1')
+validpgpkeys=('D8272EF51DA223E4D05B466989AB63D48277377A')  # Lexie Parsimoniae
 
 prepare() {
     # create a 'LICENSE' file (note: license is in the file 'flashpix.h')
-    cp -af "${pkgname}-${_srcver}"/{flashpix.h,LICENSE}
+    cp -af "${pkgname}-${pkgver%.*}-${pkgver##*.}"/{flashpix.h,LICENSE}
     
     # erase characters denoting comments
-    sed -i '1s/^.\{,3\}//'    "${pkgname}-${_srcver}/LICENSE"
-    sed -i '2,79s/^.\{,2\}//' "${pkgname}-${_srcver}/LICENSE"
-    sed -i '80s/^.\{,3\}//'   "${pkgname}-${_srcver}/LICENSE"
+    sed -i '1s/^.\{,3\}//'    "${pkgname}-${pkgver%.*}-${pkgver##*.}/LICENSE"
+    sed -i '2,79s/^.\{,2\}//' "${pkgname}-${pkgver%.*}-${pkgver##*.}/LICENSE"
+    sed -i '80s/^.\{,3\}//'   "${pkgname}-${pkgver%.*}-${pkgver##*.}/LICENSE"
     
-    patch -d "${pkgname}-${_srcver}" -Np1 -i "${srcdir}/010-libfpx-gcc10-fix.patch"
+    patch -d "${pkgname}-${pkgver%.*}-${pkgver##*.}" -Np1 -i "${srcdir}/010-libfpx-gcc10-fix.patch"
 }
 
 build() {
-    cd "${pkgname}-${_srcver}"
-    ./configure \
-        --prefix='/usr' \
-        --enable-static='no' \
-        --enable-shared='yes'
+    cd "${pkgname}-${pkgver%.*}-${pkgver##*.}"
+    ./configure --prefix='/usr' --enable-static='no' --enable-shared='yes'
     make
 }
 
 check() {
-    make -C "${pkgname}-${_srcver}" check
+    make -C "${pkgname}-${pkgver%.*}-${pkgver##*.}" check
 }
 
 package() {
-    make -C "${pkgname}-${_srcver}" DESTDIR="$pkgdir" install
-    install -D -m644 "${pkgname}-${_srcver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    make -C "${pkgname}-${pkgver%.*}-${pkgver##*.}" DESTDIR="$pkgdir" install
+    install -D -m644 "${pkgname}-${pkgver%.*}-${pkgver##*.}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }