commit: de522d159c5258b2e98c51f5b6a25027e959cf26
Author: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Wed May 29 14:59:46 2024 +0000
Commit: Michael Orlitzky <mjo <AT> gentoo <DOT> org>
CommitDate: Thu May 30 15:06:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de522d15
dev-lang/php: add 8.3.7, drop 8.3.6
Signed-off-by: Michael Orlitzky <mjo <AT> gentoo.org>
dev-lang/php/Manifest | 2 +-
.../php/{php-8.3.6.ebuild => php-8.3.7.ebuild} | 26 +++++++---------------
2 files changed, 9 insertions(+), 19 deletions(-)
diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest
index 29a8ddbafa8c..7283964d8535 100644
--- a/dev-lang/php/Manifest
+++ b/dev-lang/php/Manifest
@@ -2,4 +2,4 @@ DIST php-8.1.26.tar.xz 11809448 BLAKE2B
e1d50f1de572580a207586b3c3b57081f7b9f1b6
DIST php-8.1.28.tar.xz 11848504 BLAKE2B
a5deb596176bcd69c33f239e752ac75e2da1538efe6d2b321802c50ea250214c6d9b59e8a5cb74f97f37c917159ef4fde4ccda4403d6e0a6fe751a19b7687472
SHA512
d56ecac164e00e9514cd3c6c8c453598b323118dc7d7ae7cc14ba0847d50a2e455b2391f52e0d81af325b02d8f73a7d2ed66bf66d068dac4a496d777c83a398f
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.3.6.tar.xz 12468116 BLAKE2B
33d318058123544cbfd95ca65bd75b1eda64757f07af1d0c49eeb98c1ea5f803f1a27f5fe32c983ecdf6f789cef8afc564b384b8537b0a11525cf3ec38373e04
SHA512
fa0b6734e34af90b67bdb991726faa02f7ddd7f31adf73d0b96762452a652690ef5fbae2f6cb941fbd41533b1d6870a78192433e78d5a16a8b5f55b3a5fdf44a
+DIST php-8.3.7.tar.xz 12456020 BLAKE2B
065b49fbfcf543a14dfbf1bef1b710f241f8a36df9c45518d5ba786ef9c0c0fa0a495974cc69b2d8369e5398844e299d5b6ca2a3d246be9b5ff7edc9fdb2dc85
SHA512
ff2c16a5cc08b1a59a61eee9df75c4c9a6dda7054d48198b75d104c194e934109fed3665005ba798eeca3d7294d7dc81df3a14e63a527baf9f196e229068d9a3
diff --git a/dev-lang/php/php-8.3.6.ebuild b/dev-lang/php/php-8.3.7.ebuild
similarity index 97%
rename from dev-lang/php/php-8.3.6.ebuild
rename to dev-lang/php/php-8.3.7.ebuild
index 7242d6432c71..1ccb66ce8a52 100644
--- a/dev-lang/php/php-8.3.6.ebuild
+++ b/dev-lang/php/php-8.3.7.ebuild
@@ -118,7 +118,7 @@ COMMON_DEPEND="
unicode? ( dev-libs/oniguruma:= )
valgrind? ( dev-debug/valgrind )
webp? ( media-libs/libwebp:0= )
- xml? ( dev-libs/libxml2 )
+ xml? ( >=dev-libs/libxml2-2.12.5 )
xpm? ( x11-libs/libXpm )
xslt? ( dev-libs/libxslt )
zip? ( dev-libs/libzip:= )
@@ -146,7 +146,6 @@ PHP_MV="$(ver_cut 1)"
PATCHES=(
"${FILESDIR}/php-iodbc-header-location.patch"
- "${FILESDIR}/fix-musl-llvm.patch"
)
# ARM/Windows functions (bug 923335)
@@ -259,21 +258,18 @@ src_prepare() {
sapi/cli/tests/bug78323.phpt \
|| die
- # https://github.com/php/php-src/issues/12801
- rm ext/pcre/tests/gh11374.phpt || die
-
- # A new test failure appearing in 8.3.2, mentioned on the PR
- # where it was likely introduced:
- #
- # https://github.com/php/php-src/pull/13017
- #
- rm ext/dom/tests/DOMNode_isEqualNode.phpt || die
-
# This is a memory usage test with hard-coded limits. Whenever the
# limits are surpassed... they get increased... but in the meantime,
# the tests fail. This is not really a test that end users should
# 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
}
src_configure() {
@@ -691,11 +687,6 @@ src_test() {
export
TEST_PHPDBG_EXECUTABLE="${WORKDIR}/sapis-build/phpdbg/sapi/phpdbg/phpdbg"
fi
- # The sendmail override prevents ext/imap/tests/bug77020.phpt from
- # actually trying to send mail, and will be fixed upstream soon:
- #
- # https://github.com/php/php-src/issues/11629
- #
# The IO capture tests need to be disabled because they fail when
# std{in,out,err} are redirected (as they are within portage).
#
@@ -705,7 +696,6 @@ src_test() {
"${TEST_PHP_EXECUTABLE}" -n \
"${WORKDIR}/sapis-build/cli/run-tests.php" --offline -n -q \
-d "session.save_path=${T}" \
- -d "sendmail_path=echo >/dev/null" \
|| die "tests failed"
}
