[arch-commits] Commit in php-imagick/trunk (PKGBUILD)

[David Runge]

    Date: Thursday, June 17, 2021 @ 22:20:04
  Author: dvzrv
Revision: 964889

upgpkg: php-imagick 3.5.0-1: Upgrade to 3.5.0.

Remove now included patches and switch back to source tarball.

Modified:
  php-imagick/trunk/PKGBUILD

----------+
 PKGBUILD |   57 ++++++++++++++++++++++-----------------------------------
 1 file changed, 22 insertions(+), 35 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-17 22:19:25 UTC (rev 964888)
+++ PKGBUILD	2021-06-17 22:20:04 UTC (rev 964889)
@@ -3,49 +3,35 @@
 _name=imagick
 pkgbase=php-imagick
 pkgname=('php-imagick' 'php7-imagick')
-_commit="448c1cd0d58ba2838b9b6dff71c9b7e70a401b90"
-pkgver=3.4.4.r66.g448c1cd
-pkgrel=3
+pkgver=3.5.0
+pkgrel=1
 pkgdesc="PHP extension to create and modify images using the ImageMagick library"
 arch=('x86_64')
 url="https://github.com/imagick/imagick"
 license=('PHP')
 depends=('imagemagick' 'ttf-font')
-makedepends=('git' 'php' 'php7')
-checkdepends=('librsvg' 'ttf-dejavu')
-source=("${pkgbase}::git+https://github.com/${_name}/${_name}#commit=${_commit}"
-        "${_name}.ini"
-        "${pkgbase}-3.4.4-single-thread.patch::https://github.com/Imagick/imagick/pull/348/commits/f054a66254a71d9840fb9504abeedb4ba25a2b7a.patch"
-)
-sha512sums=('SKIP'
-            '1463505bd6b2572e21f6bbc242c2e0bf8b881b839ac38e38c230f09b4bf4c4698cafba1a026da8f615ee2b2980ab74dc68284afd70bb732db6fb70b5efba2bfc'
-            '75c873d823b7bee1a2eab00c3f409746c8f0978e2c5822d8f2d91db5618666d411bc6d18f45b9fa98b86a8d5f9773d914ba816aaa3cfd6cd3f5879d53c581637')
-b2sums=('SKIP'
-        '291d68f50a2c173b857c0f132e1874f0682da3c7176f67b946a19a68256ab19f56a234bafa16711c3f8ef26c4bc7df04ea8afdecbcb984820b9bf3fd2a135edb'
-        '67d1790bd6bb80338a1d2241852d748dd922e4d27bc982eef1eddb9390f2f32a1118dc1f8a8bce1a907c6eb23bcbeaaa1ec45f8e59cf264a3eef482dec224dd1')
+makedepends=('librsvg' 'php' 'php7')
+checkdepends=('ttf-dejavu')
+source=("${pkgbase}-${pkgver}.tar.gz::https://github.com/${_name}/${_name}/archive/refs/tags/${pkgver}.tar.gz"
+        "${_name}.ini")
+sha512sums=('4c6e3cb3e902b89a0944d384f1b797705f12054bde6c823c565b7dfb5f33136a0106ee695d85297d73af48dbd2acca4d69537151ce31abb05eb737162e12df21'
+            '1463505bd6b2572e21f6bbc242c2e0bf8b881b839ac38e38c230f09b4bf4c4698cafba1a026da8f615ee2b2980ab74dc68284afd70bb732db6fb70b5efba2bfc')
+b2sums=('b4a2caab8b836480a528e9c197aadada19aaa107f3883dde5fdbdf7fff571da1535bef5cb38ae3ccf050a87156957cdfd5515d5abb7833828321c60dda3e7dc9'
+        '291d68f50a2c173b857c0f132e1874f0682da3c7176f67b946a19a68256ab19f56a234bafa16711c3f8ef26c4bc7df04ea8afdecbcb984820b9bf3fd2a135edb')
 
-pkgver() {
-  cd "$pkgbase"
-  git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
 prepare() {
+  mv -v "${_name}-${pkgver}" "${pkgbase}-${pkgver}"
   # setting package version: https://bugs.archlinux.org/task/64185
   sed -e "s/@PACKAGE_VERSION@/${pkgver}/" \
-      -i "${pkgbase}/php_imagick.h" "${pkgbase}/package.xml"
+      -i "${pkgbase}-${pkgver}/php_imagick.h" "${pkgbase}-${pkgver}/package.xml"
 
+  cp -av "${pkgbase}-${pkgver}" "${pkgname[1]}-${pkgver}"
   (
-    cd "${pkgbase}"
-    patch -Np1 -i "../${pkgbase}-3.4.4-single-thread.patch"
-  )
-
-  cp -av "${pkgbase}" "${pkgname[1]}"
-  (
-    cd "$pkgname"
+    cd "$pkgname-${pkgver}"
     phpize
   )
   (
-    cd "${pkgname[1]}"
+    cd "${pkgname[1]}-${pkgver}"
     phpize7
   )
 }
@@ -52,12 +38,12 @@
 
 build() {
   (
-    cd "$pkgname"
+    cd "${pkgbase}-${pkgver}"
     ./configure --prefix=/usr
     make
   )
   (
-    cd "${pkgname[1]}"
+    cd "${pkgname[1]}-${pkgver}"
     ./configure --prefix=/usr
     make
   )
@@ -65,12 +51,12 @@
 
 check() {
   (
-    cd "$pkgname"
+    cd "${pkgbase}-${pkgver}"
     export NO_INTERACTION="true"
     make -k test
   )
   (
-    cd "${pkgname[1]}"
+    cd "${pkgname[1]}-${pkgver}"
     export NO_INTERACTION="true"
     make -k test
   )
@@ -80,8 +66,9 @@
   depends+=('php')
   backup=("etc/php/conf.d/${_name}.ini")
 
-  cd "$pkgname"
+  cd "${pkgname}-${pkgver}"
   make INSTALL_ROOT="$pkgdir/" install
+  ls -lah ..
   install -vDm 644 "../${_name}.ini" -t "${pkgdir}/etc/php/conf.d/"
   install -vDm 644 {ChangeLog,CREDITS,README.md} \
     -t "${pkgdir}/usr/share/doc/${pkgname}/"
@@ -93,7 +80,7 @@
   depends+=('php7')
   backup=("etc/php7/conf.d/${_name}.ini")
 
-  cd "$pkgname"
+  cd "${pkgname}-${pkgver}"
   make INSTALL_ROOT="$pkgdir/" install
   install -vDm 644 "../${_name}.ini" -t "${pkgdir}/etc/php7/conf.d/"
   install -vDm 644 {ChangeLog,CREDITS,README.md} \