diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-02-07 15:59:05 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-02-07 15:59:05 +0000 |
commit | a704e825f55e39189114ffabe2634acee9ec0164 (patch) | |
tree | 0bf3153af10db1801744de1e3702e6201a8a0acf /dev-lang/php/files | |
parent | d21e32f3fcb95019b77ca3f1a6d710ea7f9f1e04 (diff) |
gentoo auto-resync : 07:02:2024 - 15:59:05
Diffstat (limited to 'dev-lang/php/files')
-rw-r--r-- | dev-lang/php/files/php-8.1.27-gcc14-libxml.patch | 57 |
1 files changed, 57 insertions, 0 deletions
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 new file mode 100644 index 000000000000..f477ba541bfa --- /dev/null +++ b/dev-lang/php/files/php-8.1.27-gcc14-libxml.patch @@ -0,0 +1,57 @@ +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); |