* [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-imagick/files/, dev-php/pecl-imagick/
@ 2019-01-14 14:47 Thomas Deutschmann
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Deutschmann @ 2019-01-14 14:47 UTC (permalink / raw
To: gentoo-commits
commit: 507e6ed891234a0078758860bfa6da1c1a067e99
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 14 14:47:09 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 14 14:47:36 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=507e6ed8
dev-php/pecl-imagick: bump to snapshot version to add PHP 7.3 support
Package-Manager: Portage-2.3.55, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
dev-php/pecl-imagick/Manifest | 1 +
.../pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch | 18 ++++++++++++
.../pecl-imagick-3.4.3_p20181129.ebuild | 32 ++++++++++++++++++++++
3 files changed, 51 insertions(+)
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 0d16e258963..7c89f1f4088 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1 +1,2 @@
DIST imagick-3.4.3.tgz 245410 BLAKE2B 778c3b8ad3ad5e698044a832d71409eea220a82041544abeb88b59370d4b719388ce13b277d7aad84e67e40fcbbfa06d66a2458d4d9e8d33bb7358ab46368230 SHA512 2cb2b856cf83a78d3542cdf7c69554dcc063a0541e9092b24e5e1fbd8928066a4a3de154049d0202c35addbc5055ccfbb5910ae92f2f13da80ddfc025340ddcd
+DIST pecl-imagick-3.4.3_p20181129.tar.gz 260443 BLAKE2B 43d30514f5faeeaa5894e2eb51d5b2ebbe2940728c7770eec60c41c9f01f86f7423d87a71a9ad2068e388f3994c31e499940c2042994846a6b6ab66542c7ea53 SHA512 7f3719118849857d19b9a35a63de68d4e992780fd41231a041d6d152ab2f0abd3d8215ab2362a998f8fe6a733c087d3c3e5d09fa826480d621739e92f5aeabf2
diff --git a/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch b/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch
new file mode 100644
index 00000000000..ff0a1eb3888
--- /dev/null
+++ b/dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch
@@ -0,0 +1,18 @@
+https://github.com/mkoppanen/imagick/issues/264
+
+--- a/imagick_file.c
++++ b/imagick_file.c
+@@ -160,11 +160,13 @@ static
+ int php_imagick_read_image_using_imagemagick(php_imagick_object *intern, struct php_imagick_file_t *file, ImagickOperationType type TSRMLS_DC)
+ {
+
++#ifdef ZTS
+ #ifndef ZEND_ENGINE_3
+ #if PHP_VERSION_ID >= 50600
+ // This suppresses an 'unused parameter' warning.
+ (void)tsrm_ls;
+ #endif
++#endif
+ #endif
+
+ if (type == ImagickReadImage) {
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild
new file mode 100644
index 00000000000..e1c86fc7343
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PHP_EXT_NAME="imagick"
+
+MY_COMMIT="d57a444766a321fa226266f51f1f42ee2cc29cc7"
+
+USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3"
+
+S="${WORKDIR}/imagick-${MY_COMMIT}"
+
+inherit php-ext-source-r3
+
+KEYWORDS="~amd64 ~x86"
+
+DESCRIPTION="PHP wrapper for the ImageMagick library"
+HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick"
+SRC_URI="https://github.com/mkoppanen/imagick/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="PHP-3.01"
+SLOT="0"
+IUSE="examples test"
+
+# imagemagick[-openmp] is needed wrt bug 547922 and upstream
+# https://github.com/mkoppanen/imagick#openmp
+RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]"
+DEPEND="${RDEPEND}
+ test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.4.3-tsrm_ls-is-undeclared.patch )
+
+PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX%/}/usr"
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-imagick/files/, dev-php/pecl-imagick/
@ 2025-03-17 1:45 Michael Orlitzky
0 siblings, 0 replies; 2+ messages in thread
From: Michael Orlitzky @ 2025-03-17 1:45 UTC (permalink / raw
To: gentoo-commits
commit: 6ca8aa633a5153a232f2885d80e84474bd02befc
Author: Lothar Serra Mari <mail <AT> serra <DOT> me>
AuthorDate: Wed Nov 27 13:29:41 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Mon Mar 17 01:43:08 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ca8aa63
dev-php/pecl-imagick: Add support for PHP 8.4
The applied compatibility patch replacing the removed php_strtolower()
function with zend_str_tolower() is safe to use in all supported PHP
versions since it got introduced in PHP 5.4.
Signed-off-by: Lothar Serra Mari <mail <AT> serra.me>
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
.../files/pecl-imagick-3.7.0-php8.4.patch | 40 ++++++++++++++++++++++
dev-php/pecl-imagick/pecl-imagick-3.7.0-r4.ebuild | 39 +++++++++++++++++++++
2 files changed, 79 insertions(+)
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
new file mode 100644
index 000000000000..189e745e759f
--- /dev/null
+++ b/dev-php/pecl-imagick/files/pecl-imagick-3.7.0-php8.4.patch
@@ -0,0 +1,40 @@
+From 65e27f2bc02e7e8f1bf64e26e359e42a1331fca1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Michael=20Vo=C5=99=C3=AD=C5=A1ek?= <mvorisek@mvorisek.cz>
+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-r4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r4.ebuild
new file mode 100644
index 000000000000..c3424b9887ff
--- /dev/null
+++ b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r4.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_NAME="imagick"
+USE_PHP="php8-1 php8-2 php8-3 php8-4"
+
+# 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
+ ${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"
+}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2025-03-17 1:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-03-17 1:45 [gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-imagick/files/, dev-php/pecl-imagick/ Michael Orlitzky
-- strict thread matches above, loose matches on Subject: below --
2019-01-14 14:47 Thomas Deutschmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox