diff options
| -rw-r--r-- | 458.patch | 37 | ||||
| -rw-r--r-- | PHPINFO-im6 | 6 | ||||
| -rw-r--r-- | PHPINFO-im7 | 6 | ||||
| -rw-r--r-- | REFLECTION-im6 | 2 | ||||
| -rw-r--r-- | REFLECTION-im7 | 2 | ||||
| -rw-r--r-- | php-pecl-imagick.spec | 10 |
6 files changed, 54 insertions, 9 deletions
diff --git a/458.patch b/458.patch new file mode 100644 index 0000000..45a2ae7 --- /dev/null +++ b/458.patch @@ -0,0 +1,37 @@ +From 46fd58be9c1291eb563fd13315de5eeae9107c75 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); diff --git a/PHPINFO-im6 b/PHPINFO-im6 index 150cb0c..2497251 100644 --- a/PHPINFO-im6 +++ b/PHPINFO-im6 @@ -4,10 +4,10 @@ imagick imagick module => enabled imagick module version => 3.5.1 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel -Imagick compiled with ImageMagick version => ImageMagick 6.9.12-19 Q16 x86_64 2021-07-18 https://imagemagick.org -Imagick using ImageMagick library version => ImageMagick 6.9.12-19 Q16 x86_64 2021-07-18 https://imagemagick.org +Imagick compiled with ImageMagick version => ImageMagick 6.9.12-23 Q16 x86_64 2021-09-18 https://imagemagick.org +Imagick using ImageMagick library version => ImageMagick 6.9.12-23 Q16 x86_64 2021-09-18 https://imagemagick.org ImageMagick copyright => (C) 1999-2021 ImageMagick Studio LLC -ImageMagick release date => 2021-07-18 +ImageMagick release date => 2021-09-18 ImageMagick number of supported formats: => 247 ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, AVI, AVIF, AVS, BGR, BGRA, BGRO, BIE, BMP, BMP2, BMP3, BRF, CAL, CALS, CANVAS, CAPTION, CIN, CIP, CLIP, CMYK, CMYKA, CR2, CR3, CRW, CUR, CUT, DATA, DCM, DCR, DCX, DDS, DFONT, DJVU, DNG, DOT, DPX, DXT1, DXT5, EPDF, EPI, EPS, EPS2, EPS3, EPSF, EPSI, EPT, EPT2, EPT3, ERF, EXR, FAX, FILE, FITS, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, H, HALD, HDR, HEIC, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, LABEL, M2V, M4V, MAC, MAGICK, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPG, MRW, MSL, MSVG, MTV, MVG, NEF, NRW, NULL, ORF, OTB, OTF, PAL, PALM, PAM, PANGO, PATTERN, PBM, PCD, PCDS, PCL, PCT, PCX, PDB, PDF, PDFA, PEF, PES, PFA, PFB, PFM, PGM, PGX, PICON, PICT, PIX, PJPEG, PLASMA, PNG, PNG00, PNG24, PNG32, PNG48, PNG64, PNG8, PNM, POCKETMOD, PPM, PREVIEW, PS, PS2, PS3, PSB, PSD, PTIF, PWP, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGBA, RGBO, RGF, RLA, RLE, RMF, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, SUN, SVG, SVGZ, TEXT, TGA, THUMBNAIL, TIFF, TIFF64, TILE, TIM, TTC, TTF, TXT, UBRL, UBRL6, UIL, UYVY, VDA, VICAR, VID, VIDEO, VIFF, VIPS, VST, WBMP, WEBM, WEBP, WMF, WMV, WMZ, WPG, X, X3F, XBM, XC, XCF, XPM, XPS, XV, XWD, YCbCr, YCbCrA, YUV diff --git a/PHPINFO-im7 b/PHPINFO-im7 index 09c6700..98dfb2d 100644 --- a/PHPINFO-im7 +++ b/PHPINFO-im7 @@ -4,10 +4,10 @@ imagick imagick module => enabled imagick module version => 3.5.1 imagick classes => Imagick, ImagickDraw, ImagickPixel, ImagickPixelIterator, ImagickKernel -Imagick compiled with ImageMagick version => ImageMagick 7.1.0-4 Q16 x86_64 2021-07-18 https://imagemagick.org -Imagick using ImageMagick library version => ImageMagick 7.1.0-4 Q16 x86_64 2021-07-18 https://imagemagick.org +Imagick compiled with ImageMagick version => ImageMagick 7.1.0-8 Q16-HDRI x86_64 2021-09-18 https://imagemagick.org +Imagick using ImageMagick library version => ImageMagick 7.1.0-8 Q16-HDRI x86_64 2021-09-18 https://imagemagick.org ImageMagick copyright => (C) 1999-2021 ImageMagick Studio LLC -ImageMagick release date => 2021-07-18 +ImageMagick release date => 2021-09-18 ImageMagick number of supported formats: => 259 ImageMagick supported formats => 3FR, 3G2, 3GP, AAI, AI, APNG, ART, ARW, ASHLAR, AVI, AVIF, AVS, 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, FILE, FITS, FL32, FLV, FRACTAL, FTP, FTS, G3, G4, GIF, GIF87, GRADIENT, GRAY, GRAYA, GROUP4, GV, HALD, HDR, HEIC, HEIF, HISTOGRAM, HRZ, HTM, HTML, HTTP, HTTPS, ICB, ICO, ICON, IIQ, INFO, INLINE, IPL, ISOBRL, ISOBRL6, J2C, J2K, JBG, JBIG, JNG, JNX, JP2, JPC, JPE, JPEG, JPG, JPM, JPS, JPT, JSON, K25, KDC, KERNEL, LABEL, M2V, M4V, MAC, MAP, MASK, MAT, MATTE, MEF, MIFF, MKV, MNG, MONO, MOV, MP4, MPC, MPEG, MPG, 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, RADIAL-GRADIENT, RAF, RAS, RAW, RGB, RGB565, RGBA, RGBO, RGF, RLA, RLE, RMF, RSVG, RW2, SCR, SCT, SFW, SGI, SHTML, SIX, SIXEL, SPARSE-COLOR, SR2, SRF, STEGANO, 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 diff --git a/REFLECTION-im6 b/REFLECTION-im6 index 07971e0..5960878 100644 --- a/REFLECTION-im6 +++ b/REFLECTION-im6 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #96 imagick version 3.5.1 ] { +Extension [ <persistent> extension #97 imagick version 3.5.1 ] { - Dependencies { Dependency [ gmagick (Conflicts) ] diff --git a/REFLECTION-im7 b/REFLECTION-im7 index 7e1da79..f8b0252 100644 --- a/REFLECTION-im7 +++ b/REFLECTION-im7 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #76 imagick version 3.5.1 ] { +Extension [ <persistent> extension #78 imagick version 3.5.1 ] { - Dependencies { Dependency [ gmagick (Conflicts) ] diff --git a/php-pecl-imagick.spec b/php-pecl-imagick.spec index 722780e..0b1d523 100644 --- a/php-pecl-imagick.spec +++ b/php-pecl-imagick.spec @@ -49,12 +49,14 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 0.10.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{pecl_name}-%{version}-%{gh_short}.tar.gz %else -Release: 2%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 3%{?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 %endif License: PHP URL: https://pecl.php.net/package/imagick +Patch0: https://patch-diff.githubusercontent.com/raw/Imagick/imagick/pull/458.patch + BuildRequires: make BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel @@ -194,6 +196,8 @@ then : "Font files detected!" fi cd NTS +%patch0 -p1 -b .pr458 + : Fix permission for archive generated on Windows find . -type f -exec chmod -x {} \; @@ -361,6 +365,10 @@ cd ../ZTS %changelog +* Mon Sep 20 2021 Remi Collet <remi@remirepo.net> - 3.5.1-3 +- fix #457 failed test with ImageMagick 6.9.12-23 and 7.1.0-8 + using patch from https://github.com/Imagick/imagick/pull/458 + * Wed Sep 01 2021 Remi Collet <remi@remirepo.net> - 3.5.1-2 - rebuild for 8.1.0RC1 |