From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7125D1581C1 for ; Wed, 10 Jul 2024 14:50:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0EF9AE2B69; Wed, 10 Jul 2024 14:50:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C5223E2B69 for ; Wed, 10 Jul 2024 14:50:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A28BC343007 for ; Wed, 10 Jul 2024 14:50:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A655E1DD0 for ; Wed, 10 Jul 2024 14:50:06 +0000 (UTC) From: "Michael Orlitzky" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Orlitzky" Message-ID: <1720620428.0771e0a34345350b76153a1d4826dbec82e0dbea.mjo@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/php/files/, dev-lang/php/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-lang/php/Manifest dev-lang/php/files/php-8.3.9-gd-cachevars.patch dev-lang/php/files/php-8.3.9-optional-png-testfixen.patch dev-lang/php/metadata.xml dev-lang/php/php-8.3.8.ebuild dev-lang/php/php-8.3.9.ebuild X-VCS-Directories: dev-lang/php/files/ dev-lang/php/ X-VCS-Committer: mjo X-VCS-Committer-Name: Michael Orlitzky X-VCS-Revision: 0771e0a34345350b76153a1d4826dbec82e0dbea X-VCS-Branch: master Date: Wed, 10 Jul 2024 14:50:06 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 26e1bf99-fce8-46bf-ab8b-c9efcf55ef5d X-Archives-Hash: 633bf17f98c071ffe29740380d91dd88 commit: 0771e0a34345350b76153a1d4826dbec82e0dbea Author: Michael Orlitzky gentoo org> AuthorDate: Tue Jul 9 19:16:23 2024 +0000 Commit: Michael Orlitzky gentoo org> CommitDate: Wed Jul 10 14:07:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0771e0a3 dev-lang/php: add 8.3.9, drop 8.3.8 Various improvements on top of the version bump: * The system copy of media-libs/gd is now used. * Autoconf cache variables are overridden to allow cross-compiles with external libraries. * New USE=opcache-jit flag to control the use of a JIT within the opcache extension. Closes: https://bugs.gentoo.org/857597 Closes: https://bugs.gentoo.org/906585 Bug: https://bugs.gentoo.org/931884 Signed-off-by: Michael Orlitzky gentoo.org> dev-lang/php/Manifest | 2 +- dev-lang/php/files/php-8.3.9-gd-cachevars.patch | 68 ++ .../files/php-8.3.9-optional-png-testfixen.patch | 1277 ++++++++++++++++++++ dev-lang/php/metadata.xml | 3 + .../php/{php-8.3.8.ebuild => php-8.3.9.ebuild} | 89 +- 5 files changed, 1406 insertions(+), 33 deletions(-) diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index d558144544a8..56ca4d9663cd 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -4,4 +4,4 @@ DIST php-8.1.29.tar.xz 11826292 BLAKE2B 471f85504531c61e534c857a854de2ce9935b263 DIST php-8.2.15.tar.xz 12075384 BLAKE2B cef15868968538e232093bd66d862a88f0960325f2274eaf53a3d114d01787c58844aa3bce8bc09a723acd95801e1935a60e79fc189317e7f1ba19196dbfcdc4 SHA512 56c94bcafe07cf4bf5eb5fc6c67fcf16654c44a262ffb18188fc3ffac5e9bb11d39093bfb26c26bc8d2dec7e530d1a175180909262c9b5c30130cf5a4a293166 DIST php-8.2.18.tar.xz 12089400 BLAKE2B 82a4ef0aee7fa66018cb528e6fc2da40f67be2a75449ed85c54881e6725cfa9fe82d6d5655c12d2e92f3fd685479367b7c038df5af0d7a0a122d627c78c50514 SHA512 8bdd6e5aa19dac80745d258a43f7330a3096d47dc66cbef0054b8f9eb9ace5e87d841a4001185a783241a416975753c922425e977f50b2716ce643b6a7bf351f DIST php-8.2.20.tar.xz 12097568 BLAKE2B 1e38e48ea9c28abfe2c3bd860bc5d959fbe327669c007f2e2a665ae14f5a045f6ad8a0a972f32618f88ea1ff3636c2692504478b5b094b48404d6c4a214f863b SHA512 c659ed4809b6507aa428b483c85c7322815ac9d7d8e4bfe575513a5e69c5a680b8d089fd98a19f83d3a00df3de61468809f21408455913aa24d519776e44abc5 -DIST php-8.3.8.tar.xz 12480896 BLAKE2B 477129fcd766f2235e3d776c923ba51b76539f074245e8041a861db09ebbc648658b2756e6a23051a75a512fdc6e5c129633d1471213dec6f7e24d4da0d317e8 SHA512 1a2840f0b5dcbea6dfcc3894cb9e38d103bf4110c1b956438199deee0b60e5ae63cce34be25ca6f03ac8d26581a852657f8800f92fefe38345e20443b646bb3e +DIST php-8.3.9.tar.xz 12470616 BLAKE2B 44cc360c91b121f6fe1c768134d2e5e355fe1ab23ebefb98e60e878755e79b0bd31fa46a435eb5c3dabf034fb7b4bd785db014dc63f40331a6b168a14d849571 SHA512 f6291b71cf2c66f9effc2a8a7b0365364481cd5532551161194376893074f1f20dc7e9dbd628727e3b07460ac63b6d38bf4871bf4976e2b3b290f230b0111360 diff --git a/dev-lang/php/files/php-8.3.9-gd-cachevars.patch b/dev-lang/php/files/php-8.3.9-gd-cachevars.patch new file mode 100644 index 000000000000..cb6ae9f3479d --- /dev/null +++ b/dev-lang/php/files/php-8.3.9-gd-cachevars.patch @@ -0,0 +1,68 @@ +From b5e5a42d145be30be3856ff4be9af7978adec5c5 Mon Sep 17 00:00:00 2001 +From: Peter Kokot +Date: Sun, 2 Jun 2024 19:47:39 +0200 +Subject: [PATCH] Wrap gdImageCreateFrom* checks in AC_CACHE_CHECK + +This enables cross-compiling edge cases to manually override the checks +with the php_cv_lib_gd_gdImageCreateFrom* cache variables. +--- + ext/gd/config.m4 | 39 ++++++++++++++++++++------------------- + 1 file changed, 20 insertions(+), 19 deletions(-) + +diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 +index d9c6d4f6ee0c2..5c1c7a867c2f8 100644 +--- a/ext/gd/config.m4 ++++ b/ext/gd/config.m4 +@@ -147,14 +147,15 @@ dnl that gd defines "junk" versions of each gdImageCreateFromFoo function + dnl even when it does not support the Foo format. Those junk functions + dnl display a warning but eventually return normally, making a simple link + dnl or run test insufficient. +-AC_DEFUN([PHP_GD_CHECK_FORMAT],[ +- old_LIBS="${LIBS}" +- LIBS="${LIBS} ${GD_SHARED_LIBADD}" +- old_CFLAGS="${CFLAGS}" +- CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}" +- AC_MSG_CHECKING([for working gdImageCreateFrom$1 in libgd]) +- AC_LANG_PUSH([C]) +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++AC_DEFUN([PHP_GD_CHECK_FORMAT], ++[AS_VAR_PUSHDEF([php_var], [php_cv_lib_gd_gdImageCreateFrom$1]) ++old_LIBS="${LIBS}" ++LIBS="${LIBS} ${GD_SHARED_LIBADD}" ++old_CFLAGS="${CFLAGS}" ++CFLAGS="${CFLAGS} ${GDLIB_CFLAGS}" ++AC_LANG_PUSH([C]) ++AC_CACHE_CHECK([for working gdImageCreateFrom$1 in libgd], [php_var], ++ [AC_RUN_IFELSE([AC_LANG_SOURCE([ + #include + #include + #include +@@ -173,17 +174,17 @@ int main(int argc, char** argv) { + gdSetErrorMethod(exit1); + gdImagePtr p = gdImageCreateFrom$1(f); + return 0; +-}])],[ +- AC_MSG_RESULT([yes]) +- AC_DEFINE($2, 1, [Does gdImageCreateFrom$1 work?]) +- ],[ +- AC_MSG_RESULT([no]) +- ],[ +- AC_MSG_RESULT([no]) +- ]) +- AC_LANG_POP([C]) +- CFLAGS="${old_CFLAGS}" +- LIBS="${old_LIBS}" ++}])], ++ [AS_VAR_SET([php_var], [yes])], ++ [AS_VAR_SET([php_var], [no])], ++ [AS_VAR_SET([php_var], [no])])]) ++AS_VAR_IF([php_var], [yes], ++ [AC_DEFINE_UNQUOTED([$2], [1], ++ [Define to 1 if GD library has 'gdImageCreateFrom$1'.])]) ++AC_LANG_POP([C]) ++CFLAGS="${old_CFLAGS}" ++LIBS="${old_LIBS}" ++AS_VAR_POPDEF([php_var]) + ]) + + AC_DEFUN([PHP_GD_CHECK_VERSION],[ diff --git a/dev-lang/php/files/php-8.3.9-optional-png-testfixen.patch b/dev-lang/php/files/php-8.3.9-optional-png-testfixen.patch new file mode 100644 index 000000000000..04b55b3b6b81 --- /dev/null +++ b/dev-lang/php/files/php-8.3.9-optional-png-testfixen.patch @@ -0,0 +1,1277 @@ +From e25636b087c507bf12922c8faf9f526aa87153a6 Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Wed, 23 Aug 2023 18:42:17 -0400 +Subject: [PATCH 1/3] ext/gd/tests: fix three misleading die() messages + +Three of our gd tests could be skipped with a message about requiring +bundled GD, but those tests don't actually require bundled GD. We +update the messages to mention the specific functions that are +required. +--- + ext/gd/tests/bug24155.phpt | 2 +- + ext/gd/tests/bug39366.phpt | 2 +- + ext/gd/tests/imagefilter.phpt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ext/gd/tests/bug24155.phpt b/ext/gd/tests/bug24155.phpt +index 42c5e3d7926f5..7c12c38a1a6d7 100644 +--- a/ext/gd/tests/bug24155.phpt ++++ b/ext/gd/tests/bug24155.phpt +@@ -4,7 +4,7 @@ Bug #24155 (gdImageRotate270 rotation problem). + gd + --SKIPIF-- + + --FILE-- + 45) + gd + --SKIPIF-- + + --FILE-- + + --FILE-- + +Date: Wed, 23 Aug 2023 19:56:10 -0400 +Subject: [PATCH 2/3] ext/gd/tests: add SKIPIF stanzas for missing PNG support + +The bundled libgd always has PNG support, but an external one may not. +--- + ext/gd/tests/bug22544-mb.phpt | 6 ++++++ + ext/gd/tests/bug22544.phpt | 6 ++++++ + ext/gd/tests/bug24155.phpt | 3 +++ + ext/gd/tests/bug27582_1.phpt | 6 ++++++ + ext/gd/tests/bug39780_extern.phpt | 3 +++ + ext/gd/tests/bug43073.phpt | 3 +++ + ext/gd/tests/bug43475.phpt | 3 +++ + ext/gd/tests/bug43828.phpt | 3 +++ + ext/gd/tests/bug45799.phpt | 6 ++++++ + ext/gd/tests/bug47946.phpt | 3 +++ + ext/gd/tests/bug48732-mb.phpt | 3 +++ + ext/gd/tests/bug48732.phpt | 4 ++++ + ext/gd/tests/bug50194.phpt | 4 +++- + ext/gd/tests/bug51498.phpt | 3 +++ + ext/gd/tests/bug52070.phpt | 6 ++++++ + ext/gd/tests/bug53504.phpt | 3 +++ + ext/gd/tests/bug64641.phpt | 3 +++ + ext/gd/tests/bug66005.phpt | 6 ++++++ + ext/gd/tests/bug72482_2.phpt | 6 ++++++ + ext/gd/tests/bug72604.phpt | 6 ++++++ + ext/gd/tests/bug72913.phpt | 6 ++++++ + ext/gd/tests/bug73213.phpt | 6 ++++++ + ext/gd/tests/bug73272.phpt | 6 ++++++ + ext/gd/tests/bug73549.phpt | 6 ++++++ + ext/gd/tests/bug73614.phpt | 3 +++ + ext/gd/tests/bug74031.phpt | 6 ++++++ + ext/gd/tests/bug75124.phpt | 3 +++ + ext/gd/tests/bug77943.phpt | 6 ++++++ + ext/gd/tests/bug79945.phpt | 3 +++ + ext/gd/tests/imagearc_basic.phpt | 6 ++++++ + ext/gd/tests/imagearc_variation1.phpt | 6 ++++++ + ext/gd/tests/imagearc_variation2.phpt | 6 ++++++ + ext/gd/tests/imagechar_basic.phpt | 6 ++++++ + ext/gd/tests/imagecharup_basic.phpt | 6 ++++++ + ext/gd/tests/imagecolorallocatealpha_basic.phpt | 3 +++ + ext/gd/tests/imagecolorset_basic.phpt | 6 ++++++ + ext/gd/tests/imageconvolution_basic.phpt | 6 ++++++ + ext/gd/tests/imagecopyresampled_basic.phpt | 6 ++++++ + ext/gd/tests/imagecreatefrombmp_basic.phpt | 3 +++ + ext/gd/tests/imagecreatefromstring_bmp.phpt | 3 +++ + ext/gd/tests/imagecreatefromtga_basic.phpt | 3 +++ + ext/gd/tests/imagecreatefromtga_variation.phpt | 3 +++ + ext/gd/tests/imagecreatetruecolor_basic.phpt | 3 +++ + ext/gd/tests/imagecrop_auto.phpt | 3 +++ + ext/gd/tests/imagedashedline_basic.phpt | 3 +++ + ext/gd/tests/imageellipse_basic.phpt | 6 ++++++ + ext/gd/tests/imagefilledarc_basic.phpt | 3 +++ + ext/gd/tests/imagefilledarc_variation1.phpt | 3 +++ + ext/gd/tests/imagefilledarc_variation2.phpt | 3 +++ + ext/gd/tests/imagefilledellipse_basic.phpt | 6 ++++++ + ext/gd/tests/imagefilledpolygon_basic.phpt | 3 +++ + ext/gd/tests/imagefilltoborder_basic.phpt | 6 ++++++ + ext/gd/tests/imagefilter.phpt | 3 +++ + ext/gd/tests/imagegammacorrect_basic.phpt | 3 +++ + ext/gd/tests/imagegammacorrect_variation1.phpt | 3 +++ + ext/gd/tests/imagegammacorrect_variation2.phpt | 6 ++++++ + ext/gd/tests/imageopenpolygon_basic.phpt | 6 ++++++ + ext/gd/tests/imagepolygon_aa.phpt | 6 ++++++ + ext/gd/tests/imagepolygon_basic.phpt | 3 +++ + ext/gd/tests/imagerectangle_basic.phpt | 6 ++++++ + ext/gd/tests/imageresolution_png.phpt | 6 ++++++ + ext/gd/tests/imagesetbrush_basic.phpt | 6 ++++++ + ext/gd/tests/imagesetthickness_basic.phpt | 3 +++ + ext/gd/tests/imagestring_basic.phpt | 6 ++++++ + ext/gd/tests/imagestringup_basic.phpt | 6 ++++++ + ext/gd/tests/imagetruecolortopalette_basic.phpt | 3 +++ + ext/gd/tests/libgd00086_extern.phpt | 3 +++ + ext/gd/tests/test_image_equals_file_palette.phpt | 6 ++++++ + 68 files changed, 307 insertions(+), 1 deletion(-) + +diff --git a/ext/gd/tests/bug22544-mb.phpt b/ext/gd/tests/bug22544-mb.phpt +index b67478e558c47..f99307df1212b 100644 +--- a/ext/gd/tests/bug22544-mb.phpt ++++ b/ext/gd/tests/bug22544-mb.phpt +@@ -2,6 +2,12 @@ + Bug #22544 (TrueColor transparency in PNG images). + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + = 2.2.5'); + } ++if (!(imagetypes() & IMG_PNG)) { ++ die("skip No PNG support"); ++} + ?> + --FILE-- + + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + #testfest PHPSP on 2009-06-30 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + + #testfest PHPSP on 2009-06-30 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + #testfest PHPSP on 2009-06-20 + --EXTENSIONS-- + gd ++--SKIPIF-- ++ + --FILE-- + + --FILE-- + + --FILE-- + + --FILE-- + +Date: Sat, 30 Dec 2023 16:13:40 -0500 +Subject: [PATCH 3/3] ext/gd/tests: imagerotate() is always available + +Following 59ec80c5, the imagerotate() function is always available. We +may therefore remove its function_exists() checks without harm. +--- + ext/gd/tests/bug24155.phpt | 1 - + ext/gd/tests/bug39366.phpt | 4 ---- + ext/gd/tests/imagerotate_overflow.phpt | 6 ------ + 3 files changed, 11 deletions(-) + +diff --git a/ext/gd/tests/bug24155.phpt b/ext/gd/tests/bug24155.phpt +index d78ee9b77816f..c93c3bbbcb586 100644 +--- a/ext/gd/tests/bug24155.phpt ++++ b/ext/gd/tests/bug24155.phpt +@@ -4,7 +4,6 @@ Bug #24155 (gdImageRotate270 rotation problem). + gd + --SKIPIF-- + 45) + --EXTENSIONS-- + gd +---SKIPIF-- +- + --FILE-- + + --FILE-- + +Date: Wed, 10 Jul 2024 08:20:31 -0400 +Subject: [PATCH 1/1] ext/gd/tests/gh10614.phpt: skip if no PNG support + +This test uses imagecreatefrompng(), which won't be there if libgd was +built without PNG support. +--- + ext/gd/tests/gh10614.phpt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/ext/gd/tests/gh10614.phpt b/ext/gd/tests/gh10614.phpt +index c068914183..1b91115d74 100644 +--- a/ext/gd/tests/gh10614.phpt ++++ b/ext/gd/tests/gh10614.phpt +@@ -5,6 +5,9 @@ + --SKIPIF-- + =')) die("skip test requires GD 2.3.4 or older"); ++if (!(imagetypes() & IMG_PNG)) { ++ die("skip No PNG support"); ++} + ?> + --FILE-- + Enables built-in opcode cache, replacing pecl-apc et al. + + Enable Just In Time (JIT) compilation within the opcache extension + Enable the Process Control extension diff --git a/dev-lang/php/php-8.3.8.ebuild b/dev-lang/php/php-8.3.9.ebuild similarity index 92% rename from dev-lang/php/php-8.3.8.ebuild rename to dev-lang/php/php-8.3.9.ebuild index 8ea0dd1af24f..f0b4e07fb29d 100644 --- a/dev-lang/php/php-8.3.8.ebuild +++ b/dev-lang/php/php-8.3.9.ebuild @@ -5,7 +5,7 @@ EAPI=8 WANT_AUTOMAKE="none" -inherit flag-o-matic multilib systemd +inherit autotools flag-o-matic multilib systemd DESCRIPTION="The PHP language runtime engine" HOMEPAGE="https://www.php.net/" @@ -16,7 +16,6 @@ LICENSE="PHP-3.01 Zend-2.0 bcmath? ( LGPL-2.1+ ) fpm? ( BSD-2 ) - gd? ( gd ) unicode? ( BSD-2 LGPL-2.1 )" SLOT="$(ver_cut 1-2)" @@ -31,13 +30,13 @@ IUSE="${IUSE} threads" IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar - capstone cdb cjk +ctype curl debug + capstone cdb +ctype curl debug enchant exif ffi +fileinfo +filter firebird +flatfile ftp gd gdbm gmp +iconv imap inifile - intl iodbc ipv6 +jit kerberos ldap ldap-sasl libedit lmdb + intl iodbc ipv6 +jit jpeg kerberos ldap ldap-sasl libedit lmdb mhash mssql mysql mysqli nls - odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline selinux +session session-mm sharedmem + odbc +opcache +opcache-jit pcntl pdo +phar +posix postgres png + qdbm readline selinux +session session-mm sharedmem +simplexml snmp soap sockets sodium spell sqlite ssl sysvipc systemd test tidy +tokenizer tokyocabinet truetype unicode valgrind webp +xml xmlreader xmlwriter xpm xslt zip zlib" @@ -45,14 +44,8 @@ IUSE="${IUSE} acl apparmor argon2 avif bcmath berkdb bzip2 calendar # Without USE=readline or libedit, the interactive "php -a" CLI will hang. REQUIRED_USE=" || ( cli cgi fpm apache2 embed phpdbg ) - avif? ( gd zlib ) cli? ( ^^ ( readline libedit ) ) !cli? ( ?? ( readline libedit ) ) - truetype? ( gd zlib ) - webp? ( gd zlib ) - cjk? ( gd zlib ) - exif? ( gd zlib ) - xpm? ( gd zlib ) gd? ( zlib ) simplexml? ( xml ) soap? ( xml ) @@ -80,7 +73,6 @@ COMMON_DEPEND=" fpm? ( acl? ( sys-apps/acl ) apparmor? ( sys-libs/libapparmor ) selinux? ( sys-libs/libselinux ) ) apache2? ( www-servers/apache[apache2_modules_unixd(+),threads=] ) argon2? ( app-crypt/argon2:= ) - avif? ( media-libs/libavif:= ) berkdb? ( || ( sys-libs/db:5.3 sys-libs/db:4.8 ) ) bzip2? ( app-arch/bzip2:0= ) capstone? ( dev-libs/capstone ) @@ -89,7 +81,9 @@ COMMON_DEPEND=" enchant? ( app-text/enchant:2 ) ffi? ( dev-libs/libffi:= ) firebird? ( dev-db/firebird ) - gd? ( media-libs/libjpeg-turbo:0= media-libs/libpng:0= ) + gd? ( + >=media-libs/gd-2.3.3-r4[avif?,jpeg?,png?,truetype?,webp?,xpm?] + ) gdbm? ( sys-libs/gdbm:0= ) gmp? ( dev-libs/gmp:0= ) iconv? ( virtual/libiconv ) @@ -117,9 +111,7 @@ COMMON_DEPEND=" truetype? ( media-libs/freetype ) unicode? ( dev-libs/oniguruma:= ) valgrind? ( dev-debug/valgrind ) - webp? ( media-libs/libwebp:0= ) xml? ( >=dev-libs/libxml2-2.12.5 ) - xpm? ( x11-libs/libXpm ) xslt? ( dev-libs/libxslt ) zip? ( dev-libs/libzip:= ) zlib? ( sys-libs/zlib:0= ) @@ -142,6 +134,11 @@ DEPEND="${COMMON_DEPEND} BDEPEND="virtual/pkgconfig" +PATCHES=( + "${FILESDIR}/php-8.3.9-optional-png-testfixen.patch" + "${FILESDIR}/php-8.3.9-gd-cachevars.patch" +) + PHP_MV="$(ver_cut 1)" # ARM/Windows functions (bug 923335) @@ -254,13 +251,6 @@ src_prepare() { # be running pre-install, in my opinion. Bug 927461. rm ext/fileinfo/tests/bug78987.phpt || die - # The expected warnings aren't triggered in this test because we - # define session.save_path on the CLI: - # - # https://github.com/php/php-src/issues/14368 - # - rm ext/session/tests/gh13856.phpt || die - # Bug 935382, fixed eventually by # # - https://github.com/php/php-src/pull/14788 @@ -275,6 +265,26 @@ src_prepare() { # - https://github.com/php/php-src/issues/14786 # rm ext/dba/tests/dba_gdbm.phpt || die + + # Most tests failing with an external libgd have been fixed, + # but there are a few stragglers: + # + # * https://github.com/php/php-src/issues/11252 + # + rm ext/gd/tests/bug43073.phpt \ + ext/gd/tests/bug48732.phpt \ + ext/gd/tests/bug48732-mb.phpt \ + ext/gd/tests/bug48801.phpt \ + ext/gd/tests/bug48801-mb.phpt \ + ext/gd/tests/bug53504.phpt \ + ext/gd/tests/bug65148.phpt \ + ext/gd/tests/bug73272.phpt \ + || die + + # One-off, somebody forgot to update a version constant + rm ext/reflection/tests/ReflectionZendExtension.phpt || die + + eautoconf --force } src_configure() { @@ -313,7 +323,6 @@ src_configure() { our_conf+=( $(use_with apparmor fpm-apparmor) $(use_with argon2 password-argon2 "${EPREFIX}/usr") - $(use_with avif) $(use_enable bcmath) $(use_with bzip2 bz2 "${EPREFIX}/usr") $(use_enable calendar) @@ -342,6 +351,7 @@ src_configure() { $(use_enable phar) $(use_enable pdo) $(use_enable opcache) + $(use_enable opcache-jit) $(use_with postgres pgsql "${EPREFIX}/usr") $(use_enable posix) $(use_with selinux fpm-selinux) @@ -368,6 +378,17 @@ src_configure() { $(use_with valgrind) ) + # Override autoconf cache variables for libcrypt algorithms.These + # otherwise cannot be detected when cross-compiling. Bug 931884. + our_conf+=( + ac_cv_crypt_blowfish=yes + ac_cv_crypt_des=yes + ac_cv_crypt_ext_des=yes + ac_cv_crypt_md5=yes + ac_cv_crypt_sha512=yes + ac_cv_crypt_sha256=yes + ) + # DBA support if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ || use qdbm || use lmdb || use tokyocabinet ; then @@ -386,16 +407,20 @@ src_configure() { $(use_with lmdb lmdb "${EPREFIX}/usr") ) - # Support for the GD graphics library + # Use the system copy of GD. The autoconf cache variable overrides + # allow cross-compilation to proceed since the corresponding + # features cannot be detected by running a program. our_conf+=( - $(use_with truetype freetype) - $(use_enable cjk gd-jis-conv) - $(use_with gd jpeg) - $(use_with xpm) - $(use_with webp) + $(use_enable gd gd) + $(use_with gd external-gd) + php_cv_lib_gd_gdImageCreateFromAvif=$(usex avif) + php_cv_lib_gd_gdImageCreateFromBmp=yes + php_cv_lib_gd_gdImageCreateFromJpeg=$(usex jpeg) + php_cv_lib_gd_gdImageCreateFromPng=$(usex png) + php_cv_lib_gd_gdImageCreateFromTga=yes + php_cv_lib_gd_gdImageCreateFromWebp=$(usex webp) + php_cv_lib_gd_gdImageCreateFromXpm=$(usex xpm) ) - # enable gd last, so configure can pick up the previous settings - our_conf+=( $(use_enable gd) ) # IMAP support if use imap ; then