mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-06 02:17:34 -08:00
dev-lang/php: remove unused patches
Signed-off-by: Michael Mair-Keimberger <mmk@levelnine.at> Signed-off-by: Michael Orlitzky <mjo@gentoo.org>
This commit is contained in:
Michael Mair-Keimberger
Michael Orlitzky
parent
b278938808
commit
59e7cbac8e
@ -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)
|
||||
{
|
||||
@ -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);
|
||||
@ -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
|
||||
|
||||
@ -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"
|
||||
Loading…
x
Reference in New Issue
Block a user