summaryrefslogtreecommitdiffstats
path: root/346.patch
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-09-04 11:25:42 +0200
committerRemi Collet <remi@remirepo.net>2020-09-04 11:25:42 +0200
commit94abfd85fee63633104a6b4410a050ff7637b53a (patch)
tree2dff96d917d381baf78bcd1763b15d1fd862967b /346.patch
parent9ad7f9cc2df761bd2976880f81aad344849e5aa5 (diff)
add patches for PHP 8 from upstream and
https://github.com/Imagick/imagick/pull/346 SPL always there https://github.com/Imagick/imagick/pull/347 thread limit per request https://github.com/Imagick/imagick/pull/348 single thread
Diffstat (limited to '346.patch')
-rw-r--r--346.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/346.patch b/346.patch
new file mode 100644
index 0000000..57f38f4
--- /dev/null
+++ b/346.patch
@@ -0,0 +1,45 @@
+From b34d134a63e6f784d90fe5fbc455cf383f0e8c82 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Fri, 4 Sep 2020 08:36:10 +0200
+Subject: [PATCH] SPL is always there
+
+---
+ imagick.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/imagick.c b/imagick.c
+index 1e6d174..cd7f98e 100644
+--- a/imagick.c
++++ b/imagick.c
+@@ -33,9 +33,7 @@
+
+
+ /* For the countable interface */
+-#if defined(HAVE_SPL)
+ #include "ext/spl/spl_iterators.h"
+-#endif
+
+ ZEND_DECLARE_MODULE_GLOBALS(imagick)
+
+@@ -3799,11 +3797,7 @@ PHP_MINIT_FUNCTION(imagick)
+ #endif
+
+ php_imagick_sc_entry = zend_register_internal_class(&ce TSRMLS_CC);
+-#if defined(HAVE_SPL)
+ zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 2, zend_ce_iterator, spl_ce_Countable);
+-#else
+- zend_class_implements(php_imagick_sc_entry TSRMLS_CC, 1, zend_ce_iterator);
+-#endif
+
+ /*
+ Initialize the class (ImagickDraw)
+@@ -4011,9 +4005,7 @@ PHP_RSHUTDOWN_FUNCTION(imagick)
+ static const zend_module_dep imagick_deps[] = {
+ ZEND_MOD_CONFLICTS("gmagick")
+ ZEND_MOD_REQUIRED("standard")
+-#ifdef HAVE_SPL
+ ZEND_MOD_REQUIRED("spl")
+-#endif
+ ZEND_MOD_END
+ };
+ #endif