commit: 75278e64627cd70288313193d0ee430ff9d049c9 Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> AuthorDate: Thu May 8 06:23:08 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Thu May 8 06:23:08 2025 +0000 URL: https://gitweb.gentoo.org/proj/virtualbox-patches.git/commit/?id=75278e64
Remove patch from libxml2-2.12.5, no longer needed Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> patches/021_virtualbox-7.0.16-libxml2-2.12.5.patch | 33 ---------------------- 1 file changed, 33 deletions(-) diff --git a/patches/021_virtualbox-7.0.16-libxml2-2.12.5.patch b/patches/021_virtualbox-7.0.16-libxml2-2.12.5.patch deleted file mode 100644 index 2ef7557..0000000 --- a/patches/021_virtualbox-7.0.16-libxml2-2.12.5.patch +++ /dev/null @@ -1,33 +0,0 @@ -Bug: https://bugs.gentoo.org/922445 - -The change in libxml2 is not backwards compatibe. - -The upstream change is in include/libxml/xmlerror.h: - - typedef xmlError *xmlErrorPtr; - --typedef void (*xmlStructuredErrorFunc) (void *userData, xmlErrorPtr error); -+typedef void (*xmlStructuredErrorFunc) (void *userData, const xmlError *error); - -Upstream fixed it for dev-libs/libxml2-2.12.6, but we need the fix for 2.12.5 as well. - ---- a/src/VBox/Runtime/r3/xml.cpp -+++ b/src/VBox/Runtime/r3/xml.cpp -@@ -1856,7 +1856,7 @@ - va_end(args); - } - --#if LIBXML_VERSION >= 21206 -+#if LIBXML_VERSION >= 21205 - static void xmlStructuredErrorFunc(void *userData, const xmlError *error) RT_NOTHROW_DEF - { - NOREF(userData); -@@ -1878,7 +1878,7 @@ - throw std::bad_alloc(); - /* per-thread so it must be here */ - xmlSetGenericErrorFunc(NULL, xmlParserBaseGenericError); --#if LIBXML_VERSION >= 21206 -+#if LIBXML_VERSION >= 21205 - xmlSetStructuredErrorFunc(NULL, xmlStructuredErrorFunc); - #else - xmlSetStructuredErrorFunc(NULL, xmlParserBaseStructuredError);
