Up to 3.5.1; PHP 8 support

diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 1fe5db0444cf4a53b2922f2631412ef60a255f65..dadcd74e8a3ada7aad9549c3c6a31762160279ab 100644 (file)
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -9,12 +9,12 @@
 Summary:       %{modname} - PHP wrapper to the Image Magick Library
 Summary(pl.UTF-8):     %{modname} - PHP-owy wrapper do biblioteki Image Magick
 Name:          %{php_name}-pecl-%{modname}
-Version:       3.4.4
-Release:       6
+Version:       3.5.1
+Release:       1
 License:       PHP 3.01
 Group:         Development/Languages/PHP
 Source0:       https://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: 6d3a7048ab73b0fab931f28c484dbf76
+# Source0-md5: c1385a8dabdf3aa3245f09580583dbd2
 Patch0:                skip_version_check.patch
 URL:           https://pecl.php.net/package/imagick
 BuildRequires: %{php_name}-cli

diff --git a/skip_version_check.patch b/skip_version_check.patch
index ccfed26464ca5b7c9bd40a1a87e6f1ceda124f2f..7a773b9226590bfe3781b5c95dcd82163a6f33dd 100644 (file)
--- a/skip_version_check.patch
+++ b/skip_version_check.patch
@@ -7,14 +7,14 @@
 -      STD_PHP_INI_ENTRY("imagick.skip_version_check", "0", PHP_INI_ALL, OnUpdateBool, skip_version_check, zend_imagick_globals, imagick_globals)
 +      STD_PHP_INI_ENTRY("imagick.skip_version_check", "1", PHP_INI_ALL, OnUpdateBool, skip_version_check, zend_imagick_globals, imagick_globals)
        STD_PHP_INI_ENTRY("imagick.progress_monitor", "0", PHP_INI_SYSTEM, OnUpdateBool, progress_monitor, zend_imagick_globals, imagick_globals)
- PHP_INI_END()
  
-@@ -3181,7 +3181,7 @@
+       STD_PHP_INI_ENTRY("imagick.set_single_thread", "1", PHP_INI_SYSTEM, OnUpdateBool, set_single_thread, zend_imagick_globals, imagick_globals)
+@@ -3320,7 +3320,7 @@ static void php_imagick_init_globals(zen
  {
        imagick_globals->locale_fix = 0;
        imagick_globals->progress_monitor = 0;
 -      imagick_globals->skip_version_check = 0;
 +      imagick_globals->skip_version_check = 1;
- }
- 
- 
+       imagick_globals->set_single_thread = 1;
+       imagick_globals->allow_zero_dimension_images = 0;
+       // 10 is magick number, that seems to be enough.