3.7.0

5 files changed, 19 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a87cd26839c4..67b89cc82c59 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = php73-imagick
 	pkgdesc = PHP 7.3 extension to create and modify images using the ImageMagick library
-	pkgver = 3.5.1
+	pkgver = 3.7.0
 	pkgrel = 1
 	url = https://github.com/mkoppanen/imagick
 	arch = x86_64
@@ -10,12 +10,10 @@ pkgbase = php73-imagick
 	depends = imagemagick
 	depends = ttf-font
 	depends = php73
-	backup = etc/php73/conf.d/imagick.ini
-	source = php73-imagick-3.5.1.tar.gz::https://github.com/imagick/imagick/archive/refs/tags/3.5.1.tar.gz
-	source = imagick.ini
-	sha512sums = 8ef4b4a253deb80909c34ae87ba7783a295e93c5033f95ecae56e6ebf7ef7be8deb8e1bfecfa9f3dcb9ba26ee95ef49a0d69418af96fd7cd01d5316f63bdc2cd
-	sha512sums = 1463505bd6b2572e21f6bbc242c2e0bf8b881b839ac38e38c230f09b4bf4c4698cafba1a026da8f615ee2b2980ab74dc68284afd70bb732db6fb70b5efba2bfc
-	b2sums = d2ad6d3e1568d5769d2b3ba8f77af2e7d82b04bb65535b9901846602b8dcee3954a8451ffd5c2c86590f35dc209eb9301e8ea75a28ddf7c989cf41a104f04656
-	b2sums = 291d68f50a2c173b857c0f132e1874f0682da3c7176f67b946a19a68256ab19f56a234bafa16711c3f8ef26c4bc7df04ea8afdecbcb984820b9bf3fd2a135edb
+	backup = etc/php73/conf.d/20-imagick.ini
+	source = php73-imagick-3.7.0.tar.gz::https://github.com/imagick/imagick/archive/refs/tags/3.7.0.tar.gz
+	source = 20-imagick.ini
+	sha256sums = aa2e311efb7348350c7332876252720af6fb71210d13268de765bc41f51128f9
+	sha256sums = c8e56247580549cc1a951166c68b70b61697188949a74b45a83bb65ab81b1e16
 
 pkgname = php73-imagick
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..3d9e4628f806
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+php73*
+pkg/*
+src/*
+xdebug/*
+*.tar.*
+*.t?z
\ No newline at end of file
diff --git a/20-imagick.ini b/20-imagick.ini
new file mode 100644
index 000000000000..ba3af9eb3f88
--- /dev/null
+++ b/20-imagick.ini
@@ -0,0 +1 @@
+extension = imagick.so
diff --git a/PKGBUILD b/PKGBUILD
index b8ec04bf1dcc..582ad183333a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,6 @@
-# Maintainer: Matt Harrison <matt@harrison.us.com>
-# Contributor: David Runge <dvzrv@archlinux.org>
-
 pkgname=php73-imagick
 _name=imagick
-pkgver=3.5.1
+pkgver=3.7.0
 pkgrel=1
 pkgdesc="PHP 7.3 extension to create and modify images using the ImageMagick library"
 arch=('x86_64')
@@ -12,13 +9,9 @@ license=('PHP')
 depends=('imagemagick' 'ttf-font' 'php73')
 makedepends=('librsvg')
 checkdepends=('ttf-dejavu')
-backup=("etc/php73/conf.d/${_name}.ini")
+backup=("etc/php73/conf.d/20-${_name}.ini")
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/${_name}/${_name}/archive/refs/tags/${pkgver}.tar.gz"
-        "${_name}.ini")
-sha512sums=('8ef4b4a253deb80909c34ae87ba7783a295e93c5033f95ecae56e6ebf7ef7be8deb8e1bfecfa9f3dcb9ba26ee95ef49a0d69418af96fd7cd01d5316f63bdc2cd'
-            '1463505bd6b2572e21f6bbc242c2e0bf8b881b839ac38e38c230f09b4bf4c4698cafba1a026da8f615ee2b2980ab74dc68284afd70bb732db6fb70b5efba2bfc')
-b2sums=('d2ad6d3e1568d5769d2b3ba8f77af2e7d82b04bb65535b9901846602b8dcee3954a8451ffd5c2c86590f35dc209eb9301e8ea75a28ddf7c989cf41a104f04656'
-        '291d68f50a2c173b857c0f132e1874f0682da3c7176f67b946a19a68256ab19f56a234bafa16711c3f8ef26c4bc7df04ea8afdecbcb984820b9bf3fd2a135edb')
+        "20-${_name}.ini")
 
 prepare() {
   cd "${srcdir}/${_name}-${pkgver}"
@@ -44,9 +37,11 @@ check() {
 package() {
   cd "${srcdir}/${_name}-${pkgver}"
   make INSTALL_ROOT="$pkgdir/" install
-  install -vDm 644 "../${_name}.ini" -t "${pkgdir}/etc/php73/conf.d/"
+  install -vDm 644 "../20-${_name}.ini" -t "${pkgdir}/etc/php73/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"
 }
+sha256sums=('aa2e311efb7348350c7332876252720af6fb71210d13268de765bc41f51128f9'
+            'c8e56247580549cc1a951166c68b70b61697188949a74b45a83bb65ab81b1e16')
diff --git a/imagick.ini b/imagick.ini
deleted file mode 100644
index 57cb3c884e9f..000000000000
--- a/imagick.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-; 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