mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-09-23 14:41:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

sys-devel/gettext: Sync with Gentoo

Browse Source 
It's from Gentoo commit 8768add97c0255681c92d52c3b364bf27790b760.
This commit is contained in:
Flatcar Buildbot 2025-03-03 07:11:30 +00:00 committed by Krzesimir Nowak
parent 462485cce9
commit 6f5f3b596c
2 changed files with 1 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
sdk_container/src/third_party/portage-stable/sys-devel/gettext/files/gettext-0.23-libxml2-2.12.0.patch vendored
View File

@ -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

2
sdk_container/src/third_party/portage-stable/sys-devel/gettext/gettext-0.22.4-r1.ebuild vendored
View File

@ -22,7 +22,7 @@ else
mirror://gnu/${PN}/${P}.tar.xz
verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )
"
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
fi
# Only libasprintf is under the LGPL (and libintl is in a sep package),