Accepting request 930647 from server:php:extensions

OBS-URL: https://build.opensuse.org/request/show/930647
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/php-imagick?expand=0&rev=3
This commit is contained in:
Dominique Leuenberger 2021-11-10 20:46:47 +00:00 committed by Git OBS Bridge
commit a8a14cc488
5 changed files with 60 additions and 6 deletions

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:795db7c36fbacd3d33a4f53ff2d38584c846e80a04dcd04c55e9e46c28f5d229
size 300657

3
imagick-3.5.1.tgz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:243ff2094edcacb2ae46ee3a4d9f38a60a4f26a6a71f59023b6198cbed0f7f81
size 301411

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);

View File

@ -1,3 +1,17 @@
-------------------------------------------------------------------
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>
- Upgrade to version 3.5.1
- Better detection of appropriate OpenMP library to use, i.e. GCC
or Clang.
-------------------------------------------------------------------
Sun Jun 20 11:27:28 UTC 2021 - munix9@googlemail.com

View File

@ -1,5 +1,5 @@
#
# spec file for package php-imagick
# spec file
#
# Copyright (c) 2021 SUSE LLC
#
@ -31,7 +31,7 @@ ExclusiveArch: do-not-build
%endif
Name: %{php_name}-%{pkg_name}
Version: 3.5.0
Version: 3.5.1
Release: 0
Summary: Wrapper to the ImageMagick library
License: PHP-3.01
@ -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}