pool/php-imagick
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 930642 from home:weberho:branches:server:php:extensions

Browse Source 
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
This commit is contained in:
Johannes Weberhofer 2021-11-10 11:47:57 +00:00 committed by Git OBS Bridge
parent bce185c666
commit 1d8c4fd636
3 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
imagick-fix-457-ensure-format-is-always-lowercase.patch Normal file
View File

@ -0,0 +1,37 @@
From 5cf94f5e119026325081f4e0253769d010e216e7 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
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);

7
php-imagick.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Nov 10 11:10:20 UTC 2021 - Johannes Weberhofer <jweberhofer@weberhofer.at>
- 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 <suse+build@de-korte.org> Tue Nov 9 22:02:45 UTC 2021 - Arjen de Korte <suse+build@de-korte.org>

7
php-imagick.spec
View File

@ -1,5 +1,5 @@
# #
# spec file for package php-imagick # spec file
# #
# Copyright (c) 2021 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
@ -39,10 +39,13 @@ Group: Productivity/Networking/Web/Servers
URL: https://pecl.php.net/package/imagick URL: https://pecl.php.net/package/imagick
Source0: https://pecl.php.net/get/%{pkg_name}-%{version}.tgz Source0: https://pecl.php.net/get/%{pkg_name}-%{version}.tgz
Source1: php-%{pkg_name}-rpmlintrc Source1: php-%{pkg_name}-rpmlintrc
# SUSE: Make build reproduceable
Patch0: imagick-reproducible.patch 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: ImageMagick-devel >= 6.5.3.10
BuildRequires: ghostscript-fonts-std BuildRequires: ghostscript-fonts-std
BuildRequires: %{php_name}-devel >= 7.0.1
BuildRequires: re2c BuildRequires: re2c
Requires: php(api) = %{php_core_api} Requires: php(api) = %{php_core_api}
Requires: php(zend-abi) = %{php_zend_api} Requires: php(zend-abi) = %{php_zend_api}