From 562f84b239bcc69367b43c9ac9c1d7767bc92fa3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Jun 2021 09:20:41 +0200 Subject: update to 3.5.0RC1 drop all patches, all merged upstream add patch to fix some methods reflection from https://github.com/Imagick/imagick/pull/421 --- 346.patch | 45 --------------------------------------------- 1 file changed, 45 deletions(-) delete mode 100644 346.patch (limited to '346.patch') diff --git a/346.patch b/346.patch deleted file mode 100644 index 57f38f4..0000000 --- a/346.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b34d134a63e6f784d90fe5fbc455cf383f0e8c82 Mon Sep 17 00:00:00 2001 -From: Remi Collet -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 -- cgit