summaryrefslogtreecommitdiff
path: root/dev-lang/php/files
diff options
context:
space:
mode:
authorMichael Mair-Keimberger <mmk@levelnine.at>2025-04-29 20:04:58 +0200
committerMichael Orlitzky <mjo@gentoo.org>2025-04-30 21:01:11 -0400
commit59e7cbac8ef77a24e5382fa0dd0234503d2f0503 (patch)
tree0435b02445f011fabbc57cfa98a5962791329891 /dev-lang/php/files
parentb278938808573dd313fd94bd9957553e5c52aaba (diff)
downloadgentoo-59e7cbac8ef77a24e5382fa0dd0234503d2f0503.tar.gz
gentoo-59e7cbac8ef77a24e5382fa0dd0234503d2f0503.tar.bz2
gentoo-59e7cbac8ef77a24e5382fa0dd0234503d2f0503.zip
dev-lang/php: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
Diffstat (limited to 'dev-lang/php/files')
-rw-r--r--dev-lang/php/files/fix-musl-llvm.patch37
-rw-r--r--dev-lang/php/files/php-8.1.27-gcc14-libxml.patch57
-rw-r--r--dev-lang/php/files/php-8.1.27-implicit-decls.patch72
-rw-r--r--dev-lang/php/files/php-8.1.29-gcc14-intl.patch21
4 files changed, 0 insertions, 187 deletions
diff --git a/dev-lang/php/files/fix-musl-llvm.patch b/dev-lang/php/files/fix-musl-llvm.patch
deleted file mode 100644
index bf299837829c..000000000000
--- a/dev-lang/php/files/fix-musl-llvm.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 684f0d9e5946e92008404b3d5a131edc4f34f7da Mon Sep 17 00:00:00 2001
-From: Arnaud Le Blanc <arnaud.lb@gmail.com>
-Date: Thu, 4 Apr 2024 16:10:28 +0200
-Subject: [PATCH] Fix stream_cookie_seeker signature under musl
-
----
- main/streams/cast.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/main/streams/cast.c b/main/streams/cast.c
-index 3bad65fbac1f5..8d9f4a9d2d54b 100644
---- a/main/streams/cast.c
-+++ b/main/streams/cast.c
-@@ -104,6 +104,9 @@ static ssize_t stream_cookie_writer(void *cookie, const char *buffer, size_t siz
-
- # ifdef COOKIE_SEEKER_USES_OFF64_T
- static int stream_cookie_seeker(void *cookie, off64_t *position, int whence)
-+# else
-+static int stream_cookie_seeker(void *cookie, off_t *position, int whence)
-+# endif
- {
-
- *position = php_stream_seek((php_stream *)cookie, (zend_off_t)*position, whence);
-@@ -113,13 +116,6 @@ static int stream_cookie_seeker(void *cookie, off64_t *position, int whence)
- }
- return 0;
- }
--# else
--static int stream_cookie_seeker(void *cookie, zend_off_t position, int whence)
--{
--
-- return php_stream_seek((php_stream *)cookie, position, whence);
--}
--# endif
-
- static int stream_cookie_closer(void *cookie)
- {
diff --git a/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch b/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch
deleted file mode 100644
index f477ba541bfa..000000000000
--- a/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/php/php-src/commit/0a39890c967aa57225bb6bdf4821aff7a3a3c082.patch
-From: Niels Dossche <7771979+nielsdos@users.noreply.github.com>
-Date: Fri, 1 Dec 2023 18:03:35 +0100
-Subject: [PATCH] Fix libxml2 2.12 build due to API breaks
-
-See https://github.com/php/php-src/actions/runs/7062192818/job/19225478601
---- a/ext/libxml/libxml.c
-+++ b/ext/libxml/libxml.c
-@@ -472,7 +472,11 @@ static void _php_libxml_free_error(void *ptr)
- xmlResetError((xmlErrorPtr) ptr);
- }
-
--static void _php_list_set_error_structure(xmlErrorPtr error, const char *msg)
-+#if LIBXML_VERSION >= 21200
-+static void _php_list_set_error_structure(const xmlError *error, const char *msg)
-+#else
-+static void _php_list_set_error_structure(xmlError *error, const char *msg)
-+#endif
- {
- xmlError error_copy;
- int ret;
-@@ -725,7 +729,11 @@ PHP_LIBXML_API void php_libxml_ctx_warning(void *ctx, const char *msg, ...)
- va_end(args);
- }
-
-+#if LIBXML_VERSION >= 21200
-+PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, const xmlError *error)
-+#else
- PHP_LIBXML_API void php_libxml_structured_error_handler(void *userData, xmlErrorPtr error)
-+#endif
- {
- _php_list_set_error_structure(error, NULL);
-
-@@ -957,11 +965,9 @@ PHP_FUNCTION(libxml_use_internal_errors)
- /* {{{ Retrieve last error from libxml */
- PHP_FUNCTION(libxml_get_last_error)
- {
-- xmlErrorPtr error;
--
- ZEND_PARSE_PARAMETERS_NONE();
-
-- error = xmlGetLastError();
-+ const xmlError *error = xmlGetLastError();
-
- if (error) {
- object_init_ex(return_value, libxmlerror_class_entry);
---- a/ext/soap/php_sdl.c
-+++ b/ext/soap/php_sdl.c
-@@ -332,7 +332,7 @@ static void load_wsdl_ex(zval *this_ptr, char *struri, sdlCtx *ctx, int include)
- sdl_restore_uri_credentials(ctx);
-
- if (!wsdl) {
-- xmlErrorPtr xmlErrorPtr = xmlGetLastError();
-+ const xmlError *xmlErrorPtr = xmlGetLastError();
-
- if (xmlErrorPtr) {
- soap_error2(E_ERROR, "Parsing WSDL: Couldn't load from '%s' : %s", struri, xmlErrorPtr->message);
diff --git a/dev-lang/php/files/php-8.1.27-implicit-decls.patch b/dev-lang/php/files/php-8.1.27-implicit-decls.patch
deleted file mode 100644
index 443b02ba17c2..000000000000
--- a/dev-lang/php/files/php-8.1.27-implicit-decls.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 79df2b9dcbe0388667c832b2c702ca3158330ed7 Mon Sep 17 00:00:00 2001
-From: Michael Orlitzky <michael@orlitzky.com>
-Date: Mon, 4 Mar 2024 11:48:01 -0500
-Subject: [PATCH] ext/iconv/config.m4: add missing stdio.h include.
-
-The next generation of C compilers is going to enforce the C standard
-more strictly:
-
- https://wiki.gentoo.org/wiki/Modern_C_porting
-
-One warning that will eventually become an error is
--Wimplicit-function-declaration. This is relatively easy to catch in
-most code (it will fail to compile), but inside of autoconf tests it
-can go unnoticed because many feature-test compilations fail by
-design. For example,
-
- AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <iconv.h>]],
- [[iconv_ccs_init(NULL, NULL);]])]...
-
-is designed to fail if iconv_ccs_init() is not in iconv.h. On the
-other hand,
-
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <iconv.h>
- int main() {
- printf("%d", _libiconv_version);
- return 0;
- }
-
-should pass if _libiconv_version is defined. If the user has
--Werror=implicit-function-declaration in his CFLAGS, however,
-it will not:
-
- $ export CFLAGS="$CFLAGS -Werror=implicit-function-declaration"
- $ ./configure
- ...
- checking if using GNU libiconv... no
-
-This is because the stdio.h header that defines printf() is missing:
-
- conftest.c:240:3: error: implicit declaration of function 'printf'
- [-Werror=implicit-function-declaration]
- 240 | printf("%d", _libiconv_version);
- | ^~~~~~
- conftest.c:239:1: note: include '<stdio.h>' or provide a declaration
- of 'printf'
-
-This commit adds the include, correcting the test with any compiler
-that balks at implicit function definitions.
-
-(Backport to php-8.1.27)
-
-Closes GH-10751
----
- ext/iconv/config.m4 | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
-index ac57c81e..b8044bf2 100644
---- a/ext/iconv/config.m4
-+++ b/ext/iconv/config.m4
-@@ -30,6 +30,7 @@ if test "$PHP_ICONV" != "no"; then
- AC_MSG_CHECKING([if using GNU libiconv])
- AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <iconv.h>
-+#include <stdio.h>
- int main() {
- printf("%d", _libiconv_version);
- return 0;
---
-2.43.0
-
diff --git a/dev-lang/php/files/php-8.1.29-gcc14-intl.patch b/dev-lang/php/files/php-8.1.29-gcc14-intl.patch
deleted file mode 100644
index c951f48e8ba3..000000000000
--- a/dev-lang/php/files/php-8.1.29-gcc14-intl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff '--color=auto' -aurN a/ext/intl/config.m4 b/ext/intl/config.m4
---- a/ext/intl/config.m4 2024-07-17 18:54:08.645892664 -0400
-+++ b/ext/intl/config.m4 2024-07-17 18:54:29.506419432 -0400
-@@ -85,7 +85,16 @@
- breakiterator/codepointiterator_methods.cpp"
-
- PHP_REQUIRE_CXX()
-- PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
-+
-+ AC_MSG_CHECKING([if intl requires -std=gnu++17])
-+ AS_IF([$PKG_CONFIG icu-uc --atleast-version=74],[
-+ AC_MSG_RESULT([yes])
-+ PHP_CXX_COMPILE_STDCXX(17, mandatory, PHP_INTL_STDCXX)
-+ ],[
-+ AC_MSG_RESULT([no])
-+ PHP_CXX_COMPILE_STDCXX(11, mandatory, PHP_INTL_STDCXX)
-+ ])
-+
- PHP_INTL_CXX_FLAGS="$INTL_COMMON_FLAGS $PHP_INTL_STDCXX $ICU_CXXFLAGS"
- case $host_alias in
- *cygwin*) PHP_INTL_CXX_FLAGS="$PHP_INTL_CXX_FLAGS -D_POSIX_C_SOURCE=200809L"