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

[Pierre Schmitz]

    Date: Saturday, November 30, 2019 @ 10:22:02
  Author: pierre
Revision: 534555

archrelease: copy trunk to community-x86_64

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

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

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-11-30 10:21:57 UTC (rev 534554)
+++ PKGBUILD	2019-11-30 10:22:02 UTC (rev 534555)
@@ -1,47 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org>
-
-pkgname=php-imagick
-_name=imagick
-pkgver=3.4.4
-pkgrel=4
-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")
-sha512sums=('f3d3c74b4d0bb5c2dd986a8b960096ff200daa82e60fdd1467a54944be06810923b4e68a4f70194e25c8176afd9a609b9f2545054520ec759202e5fc3f1e827b')
-
-prepare() {
-  mv -v "${_name}-$pkgver" "$pkgname-$pkgver"
-  cd "$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"
-  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 534554, php-imagick/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-11-30 10:22:02 UTC (rev 534555)
@@ -0,0 +1,50 @@
+# 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/php-7.4.patch (from rev 534554, php-imagick/trunk/php-7.4.patch)
===================================================================
--- php-7.4.patch	                        (rev 0)
+++ php-7.4.patch	2019-11-30 10:22:02 UTC (rev 534555)
@@ -0,0 +1,22 @@
+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;
+ }
+