Updated upstream to 3.7.0

1 files changed, 15 insertions, 23 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 56c99cf8e206..cf4b0c9117b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,53 +2,45 @@
 # Contributor: Timo Sarawinski <timo@it-kraut.net>
 
 pkgname=php74-imagick
-_name=imagick
-pkgver=3.4.4
+app_name=imagick
+ini_name="30-${app_name}.ini"
+pkgver=3.7.0
 pkgrel=1
-_commit=c5b8086b5d96c7030e6d4e6ea9a5ef49055d8273
 pkgdesc="PHP 7.4 extension to create and modify images using the ImageMagick library"
 arch=('x86_64')
 url="https://github.com/mkoppanen/imagick"
 license=('PHP')
 depends=('php74' 'imagemagick' 'ttf-font')
 checkdepends=('librsvg' 'ttf-dejavu')
-backup=("etc/php74/conf.d/${_name}.ini")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/mkoppanen/${_name}/archive/${_commit}.tar.gz"
-        "${pkgname}-3.4.4-imagemagick_threading.patch::https://github.com/Imagick/imagick/pull/296.patch")
-sha512sums=('bd62bc51de3e330f63b29fc5f259893356e0aa205f6643266432f465fcca4d893931bc5822aef04643d6d27e9be906e3602126ee3f58fbed7804de691d0cb6d2'
-            'd11a08b6a6a4a5e6d9b9cf9e87a6c0bb29ba632d6318ac237fe59910d70b07ef8df5af775451c89c5a81d45e609b9aa69611ecb562bfcbda832d5f0ae1207d55')
+backup=("etc/php74/conf.d/30-$app_name.ini")
+source=("https://pecl.php.net/get/imagick-$pkgver.tgz")
+sha512sums=('c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe')
 
 prepare() {
-  mv -v "${_name}-$_commit" "$pkgname-$pkgver"
-  cd "$pkgname-$pkgver"
+  cd "$srcdir/$app_name-$pkgver"
   # fix imagemagick threading issues when building against php >= 7.4
-  patch -Np1 -i "../${pkgname}-3.4.4-imagemagick_threading.patch"
-  # setting package version: https://bugs.archlinux.org/task/64185
-  sed -e "s/@PACKAGE_VERSION@/${pkgver}/" \
-      -i php_imagick.h package.xml
-  echo ";extension=${_name}" > "${_name}.ini"
+ #  patch -Np1 -i "../${pkgname}-3.4.4-imagemagick_threading.patch"
+  echo ";extension=$app_name" > $ini_name
   phpize74
 }
 
 build() {
-  cd "$pkgname-$pkgver"
+  cd "$app_name-$pkgver"
   ./configure --prefix=/usr --with-php-config=/usr/bin/php-config74
   make
 }
 
 check() {
-  cd "$pkgname-$pkgver"
+  cd "$app_name-$pkgver"
   export NO_INTERACTION="true"
   export TEST_PHPDBG_EXECUTABLE="/usr/bin/phpdbg74"
   make -k test
 }
 
 package() {
-  cd "$pkgname-$pkgver"
+  cd "$app_name-$pkgver"
   make INSTALL_ROOT="$pkgdir/" install
-  install -vDm 644 "${_name}.ini" -t "${pkgdir}/etc/php74/conf.d/"
-  install -vDm 644 {ChangeLog,CREDITS,README.md} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}/"
-  install -vDm 644 examples/*.php \
-    -t "${pkgdir}/usr/share/doc/${pkgname}/examples"
+  install -vDm 644 ${ini_name} -t "$pkgdir/etc/php74/conf.d/"
+  install -vDm 644 {ChangeLog,CREDITS,LICENSE} -t "$pkgdir/usr/share/doc/$pkgname/"
+  install -vDm 644 examples/*.php -t "$pkgdir/usr/share/doc/$pkgname/examples"
 }