diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest index 575d398a4bc20..c5e11ad69f952 100644 --- a/dev-php/pecl-imagick/Manifest +++ b/dev-php/pecl-imagick/Manifest @@ -1,2 +1 @@ -DIST imagick-3.7.0.tgz 360138 BLAKE2B 2c149f2ec771df92789d67e88c6f7180d3da7c9182561432bdd4e0a83f96982cc8fc95bc1a003e05e37a54fabe6ab0fe693a6b9208d2e481d36e6c334aeee023 SHA512 c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe DIST imagick-3.8.1.tgz 364008 BLAKE2B 726dfb52901eb216c9824d2ad9e432c587601982fd24dabc7b569a2563f0a00a6ec16b85cc6296d7e1fc0d40c8cc6a0e2ccd1915345191411d693df0935b54dd SHA512 2ec0d112ac795dfebda59fea573059a3eef6ebdd065db5e06beb45a0980ffbea090ccb9afb6a48bab5452c38d36564ffa5be00ff95cf9a199bad1d886f0c7952 diff --git a/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch b/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch deleted file mode 100644 index d75d23dbf11b5..0000000000000 --- a/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.3.patch +++ /dev/null @@ -1,20 +0,0 @@ -From 7088edc353f53c4bc644573a79cdcd67a726ae16 Mon Sep 17 00:00:00 2001 -From: FedericoHeichou -Date: Fri, 24 Nov 2023 11:24:00 +0100 -Subject: [PATCH] Fix compilation error "Unterminated preprocessor conditions" - in php 8.3 - ---- - Imagick.stub.php | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/Imagick.stub.php b/Imagick.stub.php -index 804c0152..49da9386 100644 ---- a/Imagick.stub.php -+++ b/Imagick.stub.php -@@ -1669,4 +1669,5 @@ public function setInterpolateMethod(int $method): bool{} - public function setOrientation(int $orientation): bool {} - #endif - -+#endif - } diff --git a/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.4.patch b/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.4.patch deleted file mode 100644 index 4c3f247a70f09..0000000000000 --- a/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.4.patch +++ /dev/null @@ -1,42 +0,0 @@ -Patch taken from https://github.com/Imagick/imagick/pull/690 - -From 65e27f2bc02e7e8f1bf64e26e359e42a1331fca1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= -Date: Wed, 25 Sep 2024 10:56:28 +0200 -Subject: [PATCH] Fix removed "php_strtolower" for PHP 8.4 - ---- - imagick.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/imagick.c b/imagick.c -index 1b765389..ebab7ae7 100644 ---- a/imagick.c -+++ b/imagick.c -@@ -610,7 +610,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)); -+ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); - IMAGICK_FREE_MAGICK_MEMORY(format); - } else { - retval = rv; -@@ -683,7 +683,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)); -+ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); - IMAGICK_FREE_MAGICK_MEMORY(format); - } else { - retval = rv; -@@ -766,7 +766,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)); -+ zend_str_tolower(Z_STRVAL_P(retval), Z_STRLEN_P(retval)); - IMAGICK_FREE_MAGICK_MEMORY(format); - } else { - ZVAL_STRING(retval, "", 1); diff --git a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild deleted file mode 100644 index 8a53c46996c4f..0000000000000 --- a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r3.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PHP_EXT_NAME="imagick" -USE_PHP="php8-2 php8-3" - -# https://github.com/Imagick/imagick/issues/626 -PHP_EXT_NEEDED_USE="-debug" - -inherit php-ext-pecl-r3 - -KEYWORDS="amd64 ~arm ~arm64 x86" - -DESCRIPTION="PHP wrapper for the ImageMagick library" -HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="examples test" -RESTRICT="!test? ( test )" - -# imagemagick[-openmp] is needed wrt bug 547922 and upstream -# https://github.com/Imagick/imagick#openmp -RDEPEND="media-gfx/imagemagick:=[-openmp]" -DEPEND=" - ${RDEPEND} - test? ( media-gfx/imagemagick:=[hdri,jpeg,png,svg,truetype,xml] ) -" - -PATCHES=( "${FILESDIR}/${PN}-3.7.0-php8.3.patch" ) - -PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr" - -src_install() { - php-ext-pecl-r3_src_install - php-ext-source-r3_addtoinifiles "imagick.skip_version_check" "1" -} diff --git a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r4.ebuild deleted file mode 100644 index ccc648d92f821..0000000000000 --- a/dev-php/pecl-imagick/pecl-imagick-3.7.0-r4.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PHP_EXT_NAME="imagick" -USE_PHP="php8-2 php8-3 php8-4" - -# https://github.com/Imagick/imagick/issues/626 -PHP_EXT_NEEDED_USE="-debug" - -inherit php-ext-pecl-r3 - -DESCRIPTION="PHP wrapper for the ImageMagick library" -HOMEPAGE="https://pecl.php.net/package/imagick https://github.com/Imagick/imagick" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="examples test" -RESTRICT="!test? ( test )" - -# imagemagick[-openmp] is needed wrt bug 547922 and upstream -# https://github.com/Imagick/imagick#openmp -RDEPEND="media-gfx/imagemagick:=[-openmp]" -DEPEND=" - ${RDEPEND} - test? ( media-gfx/imagemagick:=[hdri,jpeg,png,svg,truetype,xml] ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-3.7.0-php8.3.patch - "${FILESDIR}"/${PN}-3.7.0-php8.4.patch -) - -PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr" - -src_install() { - php-ext-pecl-r3_src_install - php-ext-source-r3_addtoinifiles "imagick.skip_version_check" "1" -}