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

[David Runge]

    Date: Sunday, March 8, 2020 @ 12:27:53
  Author: dvzrv
Revision: 591935

upgpkg: php-imagick 3.4.4-6: Rebuilding against imagemagick 7.0.10.0 (so php won't show warnings).
Removing local patch in favor of patch from upstream pull request so tracing becomes more easy.

Modified:
  php-imagick/trunk/PKGBUILD
Deleted:
  php-imagick/trunk/php-7.4.patch

---------------+
 PKGBUILD      |    7 ++++---
 php-7.4.patch |   22 ----------------------
 2 files changed, 4 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-08 12:26:51 UTC (rev 591934)
+++ PKGBUILD	2020-03-08 12:27:53 UTC (rev 591935)
@@ -3,7 +3,7 @@
 pkgname=php-imagick
 _name=imagick
 pkgver=3.4.4
-pkgrel=5
+pkgrel=6
 pkgdesc="PHP extension to create and modify images using the ImageMagick library"
 arch=('x86_64')
 url="https://github.com/mkoppanen/imagick"
@@ -12,7 +12,7 @@
 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')
+        "${pkgname}-3.4.4-imagemagick_threading.patch::https://github.com/Imagick/imagick/pull/296.patch")
 sha512sums=('f3d3c74b4d0bb5c2dd986a8b960096ff200daa82e60fdd1467a54944be06810923b4e68a4f70194e25c8176afd9a609b9f2545054520ec759202e5fc3f1e827b'
             'd11a08b6a6a4a5e6d9b9cf9e87a6c0bb29ba632d6318ac237fe59910d70b07ef8df5af775451c89c5a81d45e609b9aa69611ecb562bfcbda832d5f0ae1207d55')
 
@@ -19,7 +19,8 @@
 prepare() {
   mv -v "${_name}-$pkgver" "$pkgname-$pkgver"
   cd "$pkgname-$pkgver"
-  patch -p1 -i "$srcdir/php-7.4.patch"
+  # 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

Deleted: php-7.4.patch
===================================================================
--- php-7.4.patch	2020-03-08 12:26:51 UTC (rev 591934)
+++ php-7.4.patch	2020-03-08 12:27:53 UTC (rev 591935)
@@ -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;
- }
-