[gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/

[gentoo-commits] repo/gentoo:master commit in: sys-devel/gettext/files/

[Conrad Kostecki]

commit:     8768add97c0255681c92d52c3b364bf27790b760
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Feb 28 07:02:23 2025 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Mar  1 23:27:33 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8768add9

sys-devel/gettext: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../files/gettext-0.23-libxml2-2.12.0.patch        | 44 ----------------------
 1 file changed, 44 deletions(-)

diff --git a/sys-devel/gettext/files/gettext-0.23-libxml2-2.12.0.patch b/sys-devel/gettext/files/gettext-0.23-libxml2-2.12.0.patch
deleted file mode 100644
index 7a22f6e7ea90..000000000000
--- a/sys-devel/gettext/files/gettext-0.23-libxml2-2.12.0.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-https://git.savannah.gnu.org/cgit/gettext.git/commit/?id=adfbe2ee7cd9b47a0465aa9a07d773fa290f46c1
-
-From adfbe2ee7cd9b47a0465aa9a07d773fa290f46c1 Mon Sep 17 00:00:00 2001
-From: Bruno Haible <bruno@clisp.org>
-Date: Sun, 1 Dec 2024 19:35:51 +0100
-Subject: Fix compilation error with libxml2 >= 2.12.0 and gcc >= 14.
-
-Reported by Sam James <sam@gentoo.org>
-at <https://savannah.gnu.org/bugs/?66506>.
-
-* gettext-tools/src/its.c: Include <libxml/xmlversion.h>.
-(structured_error): Adapt to API change.
----
- gettext-tools/src/its.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/gettext-tools/src/its.c b/gettext-tools/src/its.c
-index 8ee7ab40f..3f28f8851 100644
---- a/gettext-tools/src/its.c
-+++ b/gettext-tools/src/its.c
-@@ -28,6 +28,7 @@
- #include <stdint.h>
- #include <stdlib.h>
- 
-+#include <libxml/xmlversion.h>
- #include <libxml/xmlerror.h>
- #include <libxml/tree.h>
- #include <libxml/parser.h>
-@@ -82,7 +83,13 @@
- /* ----------------------------- Error handling ----------------------------- */
- 
- static void
-+/* Adapt to API change in libxml 2.12.0.
-+   See <https://gitlab.gnome.org/GNOME/libxml2/-/issues/622>.  */
-+#if LIBXML_VERSION >= 21200
-+structured_error (void *data, const xmlError *err)
-+#else
- structured_error (void *data, xmlError *err)
-+#endif
- {
-   error (0, err->level == XML_ERR_FATAL ? EXIT_FAILURE : 0,
-          _("%s error: %s"), "libxml2", err->message);
--- 
-cgit v1.2.3-70-g09d2