From 1d8c4fd636f780de9df6003d377cd5aac15ea3019a723384756205340eddbb96 Mon Sep 17 00:00:00 2001 From: Johannes Weberhofer Date: Wed, 10 Nov 2021 11:47:57 +0000 Subject: [PATCH] Accepting request 930642 from home:weberho:branches:server:php:extensions added imagick-fix-457-ensure-format-is-always-lowercase.patch to fix test-failures in latest tumbleweed/factory builds #gh/Imagick/imagick#457 OBS-URL: https://build.opensuse.org/request/show/930642 OBS-URL: https://build.opensuse.org/package/show/server:php:extensions/php-imagick?expand=0&rev=9 --- ...57-ensure-format-is-always-lowercase.patch | 37 +++++++++++++++++++ php-imagick.changes | 7 ++++ php-imagick.spec | 7 +++- 3 files changed, 49 insertions(+), 2 deletions(-) create mode 100644 imagick-fix-457-ensure-format-is-always-lowercase.patch diff --git a/imagick-fix-457-ensure-format-is-always-lowercase.patch b/imagick-fix-457-ensure-format-is-always-lowercase.patch new file mode 100644 index 0000000..e0a95d4 --- /dev/null +++ b/imagick-fix-457-ensure-format-is-always-lowercase.patch @@ -0,0 +1,37 @@ +From 5cf94f5e119026325081f4e0253769d010e216e7 Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Mon, 20 Sep 2021 13:44:02 +0200 +Subject: [PATCH] Fix #457 ensure format is always lowercase + +--- + imagick.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/imagick.c b/imagick.c +index ac889118..ee725669 100644 +--- a/imagick.c ++++ b/imagick.c +@@ -3388,6 +3388,7 @@ static zval *php_imagick_read_property(zend_object *object, zend_string *member, + if (format) { + retval = rv; + ZVAL_STRING(retval, format); ++ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); + IMAGICK_FREE_MAGICK_MEMORY(format); + } else { + retval = rv; +@@ -3460,6 +3461,7 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, voi + if (format) { + retval = rv; + ZVAL_STRING(retval, format); ++ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); + IMAGICK_FREE_MAGICK_MEMORY(format); + } else { + retval = rv; +@@ -3542,6 +3544,7 @@ static zval *php_imagick_read_property(zval *object, zval *member, int type, con + + if (format) { + ZVAL_STRING(retval, format, 1); ++ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); + IMAGICK_FREE_MAGICK_MEMORY(format); + } else { + ZVAL_STRING(retval, "", 1); diff --git a/php-imagick.changes b/php-imagick.changes index 5df855e..7f0416d 100644 --- a/php-imagick.changes +++ b/php-imagick.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 10 11:10:20 UTC 2021 - Johannes Weberhofer + +- added imagick-fix-457-ensure-format-is-always-lowercase.patch + to fix test-failures in latest tumbleweed/factory builds + #gh/Imagick/imagick#457 + ------------------------------------------------------------------- Tue Nov 9 22:02:45 UTC 2021 - Arjen de Korte diff --git a/php-imagick.spec b/php-imagick.spec index 106ac83..bf12403 100644 --- a/php-imagick.spec +++ b/php-imagick.spec @@ -1,5 +1,5 @@ # -# spec file for package php-imagick +# spec file # # Copyright (c) 2021 SUSE LLC # @@ -39,10 +39,13 @@ Group: Productivity/Networking/Web/Servers URL: https://pecl.php.net/package/imagick Source0: https://pecl.php.net/get/%{pkg_name}-%{version}.tgz Source1: php-%{pkg_name}-rpmlintrc +# SUSE: Make build reproduceable Patch0: imagick-reproducible.patch +# PATCH-FIX-UPSTREAM imagick-fix-457-ensure-format-is-always-lowercase.patch +Patch10: imagick-fix-457-ensure-format-is-always-lowercase.patch +BuildRequires: %{php_name}-devel >= 7.0.1 BuildRequires: ImageMagick-devel >= 6.5.3.10 BuildRequires: ghostscript-fonts-std -BuildRequires: %{php_name}-devel >= 7.0.1 BuildRequires: re2c Requires: php(api) = %{php_core_api} Requires: php(zend-abi) = %{php_zend_api}