From dc105642f47a56a3e2f1b4cec257f97a273b9af6 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sun, 1 Dec 2024 20:23:44 +0000 Subject: [PATCH] gettext: update to 0.23 includes upstream fix: - https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=adfbe2ee7cd9b47a0465aa9a07d773fa290f46c1 --- packages/devel/gettext/package.mk | 4 +- ...gettext-0001-0.18.2-non_interactive.patch} | 2 +- ...t-0002-dont_build_docs_and_examples.patch} | 14 +++--- ...error-with-libxml2-2-12-0-and-gcc-14.patch | 44 +++++++++++++++++++ 4 files changed, 54 insertions(+), 10 deletions(-) rename packages/devel/gettext/patches/{gettext-0.18.2-non_interactive.patch => gettext-0001-0.18.2-non_interactive.patch} (97%) rename packages/devel/gettext/patches/{gettext-dont_build_docs_and_examples.patch => gettext-0002-dont_build_docs_and_examples.patch} (82%) create mode 100644 packages/devel/gettext/patches/gettext-0003-Fix-compilation-error-with-libxml2-2-12-0-and-gcc-14.patch diff --git a/packages/devel/gettext/package.mk b/packages/devel/gettext/package.mk index aef05453ee..134895b1bc 100644 --- a/packages/devel/gettext/package.mk +++ b/packages/devel/gettext/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) PKG_NAME="gettext" -PKG_VERSION="0.22.5" -PKG_SHA256="fe10c37353213d78a5b83d48af231e005c4da84db5ce88037d88355938259640" +PKG_VERSION="0.23" +PKG_SHA256="bf31a9b6bdf3e364669c7bd9858f97e4a0c408a8d22940c5d4ab638b65460f85" PKG_LICENSE="GPL" PKG_SITE="https://www.gnu.org/s/gettext/" PKG_URL="https://ftp.gnu.org/pub/gnu/gettext/${PKG_NAME}-${PKG_VERSION}.tar.xz" diff --git a/packages/devel/gettext/patches/gettext-0.18.2-non_interactive.patch b/packages/devel/gettext/patches/gettext-0001-0.18.2-non_interactive.patch similarity index 97% rename from packages/devel/gettext/patches/gettext-0.18.2-non_interactive.patch rename to packages/devel/gettext/patches/gettext-0001-0.18.2-non_interactive.patch index 86ca2db57f..94182b8510 100644 --- a/packages/devel/gettext/patches/gettext-0.18.2-non_interactive.patch +++ b/packages/devel/gettext/patches/gettext-0001-0.18.2-non_interactive.patch @@ -1,7 +1,7 @@ diff -Naur gettext-0.18.1.1-old/gettext-tools/misc/gettextize.in gettext-0.18.1.1-new/gettext-tools/misc/gettextize.in --- gettext-0.18.1.1-old/gettext-tools/misc/gettextize.in 2010-06-06 05:49:57.000000000 -0700 +++ gettext-0.18.1.1-new/gettext-tools/misc/gettextize.in 2010-08-18 06:52:51.000000000 -0700 -@@ -1272,10 +1272,10 @@ +@@ -1304,10 +1304,10 @@ 5) count="five paragraphs";; *) count="$count paragraphs";; esac diff --git a/packages/devel/gettext/patches/gettext-dont_build_docs_and_examples.patch b/packages/devel/gettext/patches/gettext-0002-dont_build_docs_and_examples.patch similarity index 82% rename from packages/devel/gettext/patches/gettext-dont_build_docs_and_examples.patch rename to packages/devel/gettext/patches/gettext-0002-dont_build_docs_and_examples.patch index 3743375c56..e428572f1c 100644 --- a/packages/devel/gettext/patches/gettext-dont_build_docs_and_examples.patch +++ b/packages/devel/gettext/patches/gettext-0002-dont_build_docs_and_examples.patch @@ -2,21 +2,21 @@ diff -Naur gettext-0.19.7/gettext-tools/Makefile.am gettext-0.19.7.patch/gettext --- gettext-0.19.7/gettext-tools/Makefile.am 2015-12-08 13:50:04.000000000 +0100 +++ gettext-0.19.7.patch/gettext-tools/Makefile.am 2016-01-01 20:49:07.476011819 +0100 @@ -19,7 +19,7 @@ - AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies - ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 - + AUTOMAKE_OPTIONS = 1.5 gnu + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 -I tests/gnulib-m4 + -SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc +SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests - EXTRA_DIST = misc/DISCLAIM + EXTRA_DIST = misc/disclaim-translations.txt MOSTLYCLEANFILES = core *.stackdump diff -Naur gettext-0.19.7/gettext-tools/Makefile.in gettext-0.19.7.patch/gettext-tools/Makefile.in --- gettext-0.19.7/gettext-tools/Makefile.in 2015-12-28 00:09:39.000000000 +0100 +++ gettext-0.19.7.patch/gettext-tools/Makefile.in 2016-01-01 20:49:29.444038357 +0100 -@@ -1865,7 +1865,7 @@ +@@ -3673,7 +3673,7 @@ top_srcdir = @top_srcdir@ - AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies - ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 + AUTOMAKE_OPTIONS = 1.5 gnu + ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4 -I tests/gnulib-m4 -SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc +SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests diff --git a/packages/devel/gettext/patches/gettext-0003-Fix-compilation-error-with-libxml2-2-12-0-and-gcc-14.patch b/packages/devel/gettext/patches/gettext-0003-Fix-compilation-error-with-libxml2-2-12-0-and-gcc-14.patch new file mode 100644 index 0000000000..954a9703fb --- /dev/null +++ b/packages/devel/gettext/patches/gettext-0003-Fix-compilation-error-with-libxml2-2-12-0-and-gcc-14.patch @@ -0,0 +1,44 @@ +From adfbe2ee7cd9b47a0465aa9a07d773fa290f46c1 Mon Sep 17 00:00:00 2001 +From: Bruno Haible +Date: Sun, 1 Dec 2024 19:35:51 +0100 +Subject: [PATCH 1/1] Fix compilation error with libxml2 >= 2.12.0 and gcc >= + 14. + +Reported by Sam James +at . + +* gettext-tools/src/its.c: Include . +(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 + #include + ++#include + #include + #include + #include +@@ -82,7 +83,13 @@ + /* ----------------------------- Error handling ----------------------------- */ + + static void ++/* Adapt to API change in libxml 2.12.0. ++ See . */ ++#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); +-- +2.34.1 +