[arch-commits] Commit in php-imagick/repos/community-x86_64 (3 files)

[David Runge]

    Date: Sunday, March 8, 2020 @ 12:28:03
  Author: dvzrv
Revision: 591936

archrelease: copy trunk to community-x86_64

Added:
  php-imagick/repos/community-x86_64/PKGBUILD
    (from rev 591935, php-imagick/trunk/PKGBUILD)
Deleted:
  php-imagick/repos/community-x86_64/PKGBUILD
  php-imagick/repos/community-x86_64/php-7.4.patch

---------------+
 PKGBUILD      |  101 ++++++++++++++++++++++++++++----------------------------
 php-7.4.patch |   22 ------------
 2 files changed, 51 insertions(+), 72 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-08 12:27:53 UTC (rev 591935)
+++ PKGBUILD	2020-03-08 12:28:03 UTC (rev 591936)
@@ -1,50 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-pkgname=php-imagick
-_name=imagick
-pkgver=3.4.4
-pkgrel=5
-pkgdesc="PHP extension to create and modify images using the ImageMagick library"
-arch=('x86_64')
-url="https://github.com/mkoppanen/imagick"
-license=('PHP')
-depends=('php' 'imagemagick' 'ttf-dejavu')
-checkdepends=('librsvg')
-backup=("etc/php/conf.d/${_name}.ini")
-source=("$pkgname-$pkgver.tar.gz::https://github.com/mkoppanen/${_name}/archive/${pkgver}.tar.gz"
-		'php-7.4.patch')
-sha512sums=('f3d3c74b4d0bb5c2dd986a8b960096ff200daa82e60fdd1467a54944be06810923b4e68a4f70194e25c8176afd9a609b9f2545054520ec759202e5fc3f1e827b'
-            'd11a08b6a6a4a5e6d9b9cf9e87a6c0bb29ba632d6318ac237fe59910d70b07ef8df5af775451c89c5a81d45e609b9aa69611ecb562bfcbda832d5f0ae1207d55')
-
-prepare() {
-  mv -v "${_name}-$pkgver" "$pkgname-$pkgver"
-  cd "$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/php-7.4.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"
-  phpize
-}
-
-build() {
-  cd "$pkgname-$pkgver"
-  ./configure --prefix=/usr
-  make
-}
-
-check() {
-  cd "$pkgname-$pkgver"
-  export NO_INTERACTION="true"
-  make -k test
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make INSTALL_ROOT="$pkgdir/" install
-  install -vDm 644 "${_name}.ini" -t "${pkgdir}/etc/php/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"
-}

Copied: php-imagick/repos/community-x86_64/PKGBUILD (from rev 591935, php-imagick/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-03-08 12:28:03 UTC (rev 591936)
@@ -0,0 +1,51 @@
+# Maintainer: David Runge <dvzrv at archlinux.org>
+
+pkgname=php-imagick
+_name=imagick
+pkgver=3.4.4
+pkgrel=6
+pkgdesc="PHP extension to create and modify images using the ImageMagick library"
+arch=('x86_64')
+url="https://github.com/mkoppanen/imagick"
+license=('PHP')
+depends=('php' 'imagemagick' 'ttf-dejavu')
+checkdepends=('librsvg')
+backup=("etc/php/conf.d/${_name}.ini")
+source=("$pkgname-$pkgver.tar.gz::https://github.com/mkoppanen/${_name}/archive/${pkgver}.tar.gz"
+        "${pkgname}-3.4.4-imagemagick_threading.patch::https://github.com/Imagick/imagick/pull/296.patch")
+sha512sums=('f3d3c74b4d0bb5c2dd986a8b960096ff200daa82e60fdd1467a54944be06810923b4e68a4f70194e25c8176afd9a609b9f2545054520ec759202e5fc3f1e827b'
+            'd11a08b6a6a4a5e6d9b9cf9e87a6c0bb29ba632d6318ac237fe59910d70b07ef8df5af775451c89c5a81d45e609b9aa69611ecb562bfcbda832d5f0ae1207d55')
+
+prepare() {
+  mv -v "${_name}-$pkgver" "$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"
+  # 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"
+  phpize
+}
+
+build() {
+  cd "$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$pkgname-$pkgver"
+  export NO_INTERACTION="true"
+  make -k test
+}
+
+package() {
+  cd "$pkgname-$pkgver"
+  make INSTALL_ROOT="$pkgdir/" install
+  install -vDm 644 "${_name}.ini" -t "${pkgdir}/etc/php/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"
+}

Deleted: php-7.4.patch
===================================================================
--- php-7.4.patch	2020-03-08 12:27:53 UTC (rev 591935)
+++ php-7.4.patch	2020-03-08 12:28:03 UTC (rev 591936)
@@ -1,22 +0,0 @@
-From 421c3705107fab022631b93a2e70fc7c0ffc86ea Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi at remirepo.net>
-Date: Tue, 23 Jul 2019 18:02:31 +0200
-Subject: [PATCH] Fix #295 ensure IM don't use multiple threads
-
----
- imagick.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/imagick.c b/imagick.c
-index 8e58afe..e5a688a 100644
---- a/imagick.c
-+++ b/imagick.c
-@@ -3844,6 +3844,8 @@ PHP_RINIT_FUNCTION(imagick)
- 	(void)module_number;
- 
- 	IMAGICK_G(progress_callback) = NULL;
-+	MagickSetResourceLimit(ThreadResource, 1);
-+
- 	return SUCCESS;
- }
-