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

Accepting request 1225802 from server:php:extensions

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1225802
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/php-imagick?expand=0&rev=8
This commit is contained in:
Ana Guerrero 2024-11-22 22:53:03 +00:00 committed by Git OBS Bridge
commit c176b26860
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
imagick-php_strtolower-php84.patch Normal file
View File

@ -0,0 +1,42 @@
diff -upr imagick-3.7.0.orig/imagick.c imagick-3.7.0/imagick.c
--- imagick-3.7.0.orig/imagick.c 2022-01-11 16:23:47.000000000 +0100
+++ imagick-3.7.0/imagick.c 2024-11-22 11:14:01.187974046 +0100
@@ -603,7 +603,11 @@ static zval *php_imagick_read_property(z
if (format) {
retval = rv;
ZVAL_STRING(retval, format);
- php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #if PHP_VERSION_ID < 80400
+ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #else
+ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #endif
IMAGICK_FREE_MAGICK_MEMORY(format);
} else {
retval = rv;
@@ -676,7 +680,11 @@ static zval *php_imagick_read_property(z
if (format) {
retval = rv;
ZVAL_STRING(retval, format);
- php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #if PHP_VERSION_ID < 80400
+ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #else
+ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #endif
IMAGICK_FREE_MAGICK_MEMORY(format);
} else {
retval = rv;
@@ -759,7 +767,11 @@ static zval *php_imagick_read_property(z
if (format) {
ZVAL_STRING(retval, format, 1);
- php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #if PHP_VERSION_ID < 80400
+ php_strtolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #else
+ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval));
+ #endif
IMAGICK_FREE_MAGICK_MEMORY(format);
} else {
ZVAL_STRING(retval, "", 1);

6
php-imagick.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Nov 22 10:28:40 UTC 2024 - Manu Maier <mmanu84@outlook.de>
- Fix removed "php_strtolower" for PHP 8.4
+ imagick-php_strtolower-php84.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 21 20:38:00 UTC 2024 - Arjen de Korte <suse+build@de-korte.org> Sun Jan 21 20:38:00 UTC 2024 - Arjen de Korte <suse+build@de-korte.org>

1
php-imagick.spec
View File

@ -45,6 +45,7 @@ Patch0: imagick-reproducible.patch
Patch10: imagick-xfail-test014.patch Patch10: imagick-xfail-test014.patch
# PATCH-FIX-OPENSUSE - calculation of kurtosis and skewness was fixed in Imagick-7.1.1.24 # PATCH-FIX-OPENSUSE - calculation of kurtosis and skewness was fixed in Imagick-7.1.1.24
Patch11: imagick-fix-test316.patch Patch11: imagick-fix-test316.patch
Patch12: imagick-php_strtolower-php84.patch
BuildRequires: %{php_name}-devel >= 7.0.1 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