update to V3.7.0

3 files changed, 32 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index adc14374e783..0c69c366e0c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = php80-imagick
 	pkgdesc = PHP 8.0 extension to create and modify images using the ImageMagick library
-	pkgver = 3.4.4
+	pkgver = 3.7.0
 	pkgrel = 1
 	url = https://github.com/mkoppanen/imagick
 	arch = x86_64
 	license = PHP
-	checkdepends = librsvg
 	checkdepends = ttf-dejavu
-	depends = php80
+	makedepends = php80
+	makedepends = librsvg
 	depends = imagemagick
 	depends = ttf-font
 	backup = etc/php80/conf.d/imagick.ini
-	source = php80-imagick-3.4.4.tar.gz::https://github.com/mkoppanen/imagick/archive/c5b8086b5d96c7030e6d4e6ea9a5ef49055d8273.tar.gz
-	source = php80-imagick-3.4.4-imagemagick_threading.patch::https://github.com/Imagick/imagick/pull/296.patch
-	sha512sums = bd62bc51de3e330f63b29fc5f259893356e0aa205f6643266432f465fcca4d893931bc5822aef04643d6d27e9be906e3602126ee3f58fbed7804de691d0cb6d2
-	sha512sums = d11a08b6a6a4a5e6d9b9cf9e87a6c0bb29ba632d6318ac237fe59910d70b07ef8df5af775451c89c5a81d45e609b9aa69611ecb562bfcbda832d5f0ae1207d55
+	source = php80-imagick-3.7.0.tar.gz::https://github.com/imagick/imagick/archive/refs/tags/3.7.0.tar.gz
+	source = imagick.ini
+	sha512sums = 67cf7e76ee59dcf2fbb6230956344033022ea2b93f82fcdb949998638ce9990004948fddf13e7f4649b2115ce6f402a1eb4f95aa36a3b6a26f3f016b0e958bc3
+	sha512sums = 1463505bd6b2572e21f6bbc242c2e0bf8b881b839ac38e38c230f09b4bf4c4698cafba1a026da8f615ee2b2980ab74dc68284afd70bb732db6fb70b5efba2bfc
 
 pkgname = php80-imagick
-
diff --git a/PKGBUILD b/PKGBUILD
index 5dcb63a71377..f4b2fcd98b83 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,52 @@
 # Maintainer: Timo Sarawinski <timo@it-kraut.net>
 
+_phpbase=80
 pkgname=php80-imagick
 _name=imagick
-pkgver=3.4.4
+pkgver=3.7.0
 pkgrel=1
 _commit=c5b8086b5d96c7030e6d4e6ea9a5ef49055d8273
 pkgdesc="PHP 8.0 extension to create and modify images using the ImageMagick library"
 arch=('x86_64')
 url="https://github.com/mkoppanen/imagick"
 license=('PHP')
-depends=('php80' 'imagemagick' 'ttf-font')
-checkdepends=('librsvg' 'ttf-dejavu')
-backup=("etc/php80/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')
+depends=('imagemagick' 'ttf-font')
+makedepends=("php${_phpbase}" 'librsvg')
+checkdepends=('ttf-dejavu')
+backup=("etc/php${_phpbase}/conf.d/${_name}.ini")
+source=(
+  "${pkgname}-${pkgver}.tar.gz::https://github.com/${_name}/${_name}/archive/refs/tags/${pkgver}.tar.gz"
+  "${_name}.ini"
+)
+sha512sums=('67cf7e76ee59dcf2fbb6230956344033022ea2b93f82fcdb949998638ce9990004948fddf13e7f4649b2115ce6f402a1eb4f95aa36a3b6a26f3f016b0e958bc3'
+            '1463505bd6b2572e21f6bbc242c2e0bf8b881b839ac38e38c230f09b4bf4c4698cafba1a026da8f615ee2b2980ab74dc68284afd70bb732db6fb70b5efba2bfc')
 
 prepare() {
-  mv -v "${_name}-$_commit" "$pkgname-$pkgver"
-  cd "$pkgname-$pkgver"
-  # fix imagemagick threading issues when building against php >= 7.4
-  patch -Np1 -i "../${pkgname}-3.4.4-imagemagick_threading.patch"
-  # php8 
+  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
   # 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"
-  phpize80
+      -i "${pkgname}-${pkgver}/php_imagick.h" "${pkgname}-${pkgver}/package.xml"
+  cd "$pkgname-${pkgver}"
+  phpize${_phpbase}
 }
 
 build() {
   cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr --with-php-config=/usr/bin/php-config80
+  ./configure --prefix=/usr --with-php-config=/usr/bin/php-config${_phpbase}
   make
 }
 
 check() {
   cd "$pkgname-$pkgver"
   export NO_INTERACTION="true"
+  export TEST_PHPDBG_EXECUTABLE="phpdbg${_phpbase}"
   make -k test
 }
 
 package() {
   cd "$pkgname-$pkgver"
   make INSTALL_ROOT="$pkgdir/" install
-  install -vDm 644 "${_name}.ini" -t "${pkgdir}/etc/php80/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 "../${_name}.ini" -t "${pkgdir}/etc/php${_phpbase}/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"
 }
diff --git a/imagick.ini b/imagick.ini
new file mode 100644
index 000000000000..57cb3c884e9f
--- /dev/null
+++ b/imagick.ini
@@ -0,0 +1,4 @@
+; extension = imagick
+; ; disable the (broken) version check, because packaging ensures that imagemagick and php-imagick are compatible
+; ; bug reports and out-of-date messages based on the below warning message will not be accepted
+; imagick.skip_version_check = 1