diff options
Diffstat (limited to 'dev-lang/php')
| -rw-r--r-- | dev-lang/php/files/php-bug75457-pcre2-backport.patch | 22 | ||||
| -rw-r--r-- | dev-lang/php/php-8.2.28.ebuild | 1 | ||||
| -rw-r--r-- | dev-lang/php/php-8.3.19.ebuild | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/dev-lang/php/files/php-bug75457-pcre2-backport.patch b/dev-lang/php/files/php-bug75457-pcre2-backport.patch new file mode 100644 index 000000000000..83c0ab0b3a2e --- /dev/null +++ b/dev-lang/php/files/php-bug75457-pcre2-backport.patch @@ -0,0 +1,22 @@ +From 69480be12afb4040c6dd9275b7836231cdd6f6bb Mon Sep 17 00:00:00 2001 +From: Remi Collet <remi@remirepo.net> +Date: Wed, 12 Mar 2025 07:48:05 +0100 +Subject: [PATCH] Relax test expectation for pcre2lib 10.45 Using + e92848789acd8aa5cf32fedb519ba9378ac64e02 + +Co-authored-by: Niels Dossche <7771979+nielsdos@users.noreply.github.com> +--- + ext/pcre/tests/bug75457.phpt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ext/pcre/tests/bug75457.phpt b/ext/pcre/tests/bug75457.phpt +index ee5ab162f8a6c..1401b25ff6fb7 100644 +--- a/ext/pcre/tests/bug75457.phpt ++++ b/ext/pcre/tests/bug75457.phpt +@@ -6,5 +6,5 @@ $pattern = "/(((?(?C)0?=))(?!()0|.(?0)0)())/"; + var_dump(preg_match($pattern, "hello")); + ?> + --EXPECTF-- +-Warning: preg_match(): Compilation failed: assertion expected after (?( or (?(?C) at offset 8 in %sbug75457.php on line %d ++Warning: preg_match(): Compilation failed:%r( atomic|)%r assertion expected after (?( or (?(?C) at offset 8 in %sbug75457.php on line %d + bool(false) diff --git a/dev-lang/php/php-8.2.28.ebuild b/dev-lang/php/php-8.2.28.ebuild index 48520240c2fd..d7612d5e8ebb 100644 --- a/dev-lang/php/php-8.2.28.ebuild +++ b/dev-lang/php/php-8.2.28.ebuild @@ -150,6 +150,7 @@ PATCHES=( "${FILESDIR}/php-8.2.8-openssl-tests.patch" "${FILESDIR}/php-8.2.20-implicit-printf.patch" "${FILESDIR}/php-8.2.23-fix-ub.patch" + "${FILESDIR}/php-bug75457-pcre2-backport.patch" ) # ARM/Windows functions (bug 923335) diff --git a/dev-lang/php/php-8.3.19.ebuild b/dev-lang/php/php-8.3.19.ebuild index bc53426063d5..a450d59a202e 100644 --- a/dev-lang/php/php-8.3.19.ebuild +++ b/dev-lang/php/php-8.3.19.ebuild @@ -135,6 +135,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/php-8.3.9-gd-cachevars.patch" + "${FILESDIR}/php-bug75457-pcre2-backport.patch" ) PHP_MV="$(ver_cut 1)" |
