From 3322d6726dd05b802c88f01696939b99c4497582 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 Jan 2021 14:38:18 +0100 Subject: add patch for PHP 8 from https://github.com/vitoc/gmagick/pull/50 add build fixes from https://github.com/rlerdorf/gmagick/pull/1 https://github.com/rlerdorf/gmagick/pull/2 --- gmagick-bug78465.patch | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 gmagick-bug78465.patch (limited to 'gmagick-bug78465.patch') diff --git a/gmagick-bug78465.patch b/gmagick-bug78465.patch deleted file mode 100644 index 41c27a2..0000000 --- a/gmagick-bug78465.patch +++ /dev/null @@ -1,29 +0,0 @@ -Workaround to https://bugs.php.net/78465 - - -diff -up ./gmagick.c.old ./gmagick.c ---- ./gmagick.c.old 2020-02-19 11:10:43.388127352 +0100 -+++ ./gmagick.c 2020-02-19 11:10:48.691101111 +0100 -@@ -1742,6 +1742,13 @@ PHP_MINFO_FUNCTION(gmagick) - php_info_print_table_end(); - } - -+/* {{{ PHP_MINFO_FUNCTION(gmagick) -+*/ -+PHP_RINIT_FUNCTION(gmagick) -+{ -+ MagickSetResourceLimit(ThreadsResource, 1); -+} -+ - /* {{{ zend_module_entry gmagick_module_entry - */ - zend_module_entry gmagick_module_entry = -@@ -1751,7 +1758,7 @@ zend_module_entry gmagick_module_entry = - php_gmagick_functions, /* Functions */ - PHP_MINIT(gmagick), /* MINIT */ - PHP_MSHUTDOWN(gmagick), /* MSHUTDOWN */ -- NULL, /* RINIT */ -+ PHP_RINIT(gmagick), /* RINIT */ - NULL, /* RSHUTDOWN */ - PHP_MINFO(gmagick), /* MINFO */ - PHP_GMAGICK_VERSION, /* Version */ -- cgit