jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

gettext: update to 0.23

Browse Source 
includes upstream fix:
- https://git.savannah.gnu.org/gitweb/?p=gettext.git;a=commit;h=adfbe2ee7cd9b47a0465aa9a07d773fa290f46c1
This commit is contained in:
Rudi Heitbaum 2024-12-01 20:23:44 +00:00
parent 01d6cfc52d
commit dc105642f4
4 changed files with 54 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/devel/gettext/package.mk
View File

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

2
packages/devel/gettext/patches/gettext-0.18.2-non_interactive.patch → packages/devel/gettext/patches/gettext-0001-0.18.2-non_interactive.patch
View File

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

14
packages/devel/gettext/patches/gettext-dont_build_docs_and_examples.patch → packages/devel/gettext/patches/gettext-0002-dont_build_docs_and_examples.patch
View File

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

44
packages/devel/gettext/patches/gettext-0003-Fix-compilation-error-with-libxml2-2-12-0-and-gcc-14.patch Normal file
View File

@ -0,0 +1,44 @@
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: [PATCH 1/1] 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);
--
2.34.1