fix for PHP 8.5.0alpha3 using patch fromHEADmaster

  https://github.com/Imagick/imagick/pull/741

3 files changed, 38 insertions, 6 deletions

diff --git a/741.patch b/741.patch
new file mode 100644
index 0000000..9b76e05
--- /dev/null
+++ b/741.patch
@@ -0,0 +1,24 @@
+From b6b4f1270b2d5082aeaa1364e077e7e95b8af34f Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 30 Jul 2025 12:13:51 +0200
+Subject: [PATCH] use Zend/zend_smart_string.h
+
+---
+ imagick.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/imagick.c b/imagick.c
+index c5f2c40b..68e63e13 100644
+--- a/imagick.c
++++ b/imagick.c
+@@ -24,7 +24,9 @@
+ #include "php_imagick_helpers.h"
+ #include "php_imagick_shared.h"
+ 
+-#if PHP_VERSION_ID >= 70000
++#if PHP_VERSION_ID >= 70200
++#include "Zend/zend_smart_string.h"
++#elif PHP_VERSION_ID >= 70000
+ #include "ext/standard/php_smart_string.h"
+ #else
+ #include "ext/standard/php_smart_str.h"
diff --git a/PHPINFO-im7 b/PHPINFO-im7
index be3aa4b..ae8bece 100644
--- a/PHPINFO-im7
+++ b/PHPINFO-im7
@@ -4,12 +4,12 @@ imagick
 imagick module => enabled
 imagick module version => 3.8.0
 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel
-Imagick compiled with ImageMagick version => ImageMagick 7.1.2-0 Q16-HDRI x86_64 23234 https://imagemagick.org
-Imagick using ImageMagick library version => ImageMagick 7.1.2-0 Q16-HDRI x86_64 23234 https://imagemagick.org
+Imagick compiled with ImageMagick version => ImageMagick 7.1.2-1 Q16-HDRI x86_64 23308 https://imagemagick.org
+Imagick using ImageMagick library version => ImageMagick 7.1.2-1 Q16-HDRI x86_64 23308 https://imagemagick.org
 ImageMagick copyright => (C) 1999 ImageMagick Studio LLC
-ImageMagick release date => 2025-07-13
-ImageMagick number of supported formats:  => 274
-ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVCI, AVI, AVIF, AVS, BAYER, BAYERA, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUBE, CUR, CUT, DATA, DCM, DCR, DCRAW, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FARBFELD, FAX, FF, FFF, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, FTXT, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, HALD, HDR, HEIC, HEIF, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICN, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, JXL, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MDC, MEF, MIFF, MKV, MNG, MONO, MOS, MOV, MP4, MPC, MPEG, MPG, MPO, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORA, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PHM, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PS, PS2, PS3, PSB, PSD, PTIF, PWP, QOI, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, RWL, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, SRW, STEGANO, STI, STRIMG, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TM2, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YAML, YCBCR, YCBCRA, YUV
+ImageMagick release date => 2025-08-12
+ImageMagick number of supported formats:  => 275
+ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVCI, AVI, AVIF, AVS, BAYER, BAYERA, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUBE, CUR, CUT, DATA, DCM, DCR, DCRAW, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FARBFELD, FAX, FF, FFF, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, FTXT, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, HALD, HDR, HEIC, HEIF, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICN, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, JXL, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MDC, MEF, MIFF, MKV, MNG, MONO, MOS, MOV, MP4, MPC, MPEG, MPG, MPO, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORA, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PHM, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PS, PS2, PS3, PSB, PSD, PTIF, PWP, QOI, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, RWL, SCR, SCT, SF3, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, SRW, STEGANO, STI, STRIMG, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TM2, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YAML, YCBCR, YCBCRA, YUV
 
 Directive => Local Value => Master Value
 imagick.locale_fix => 0 => 0
diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec
index 018c7b9..656dfe1 100644
--- a/php-pecl-imagick.spec
+++ b/php-pecl-imagick.spec
@@ -51,11 +51,13 @@ Summary:       Extension to create and modify images using ImageMagick 7
 Name:          %{?scl_prefix}php-pecl-imagick-im7
 %endif
 Version:       %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
-Release:       1.1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 Source0:       https://pecl.php.net/get/%{pecl_name}-%{upstream_version}%{?upstream_prever}.tgz
 License:       PHP-3.01
 URL:           https://pecl.php.net/package/imagick
 
+Patch0:        741.patch
+
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel
@@ -161,6 +163,8 @@ then : "Font files detected!"
 fi
 
 cd %{sources}
+%patch -P0 -p1 -b .pr741
+
 : Avoid arginfo to be regenerated
 rm *.stub.php
 
@@ -343,6 +347,10 @@ exit $ret
 
 
 %changelog
+* Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 3.8.0-2
+- fix for PHP 8.5.0alpha3 using patch from
+  https://github.com/Imagick/imagick/pull/741
+
 * Tue Jul 15 2025 Remi Collet <remi@remirepo.net> - 3.8.0-1.1
 - ignore 1 test failing with IM 7.1.2 reported as
   https://github.com/Imagick/imagick/issues/737