From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Cc: Adolf Belka <adolf.belka@ipfire.org>,
Michael Tremer <michael.tremer@ipfire.org>
Subject: [PATCH 4/4] libloc: Addition of patch to deal with gettext update to 0.25
Date: Wed, 14 May 2025 15:15:13 +0200 [thread overview]
Message-ID: <20250514131513.6864-4-adolf.belka@ipfire.org> (raw)
In-Reply-To: <20250514131513.6864-1-adolf.belka@ipfire.org>
Suggested-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
lfs/libloc | 2 +-
.../libloc-0.9.18_gettext-0.25_fix.patch | 29 +++++++++++++++++++
2 files changed, 30 insertions(+), 1 deletion(-)
create mode 100644 src/patches/libloc-0.9.18_gettext-0.25_fix.patch
diff --git a/lfs/libloc b/lfs/libloc
index 8e438b50d..f2f0aa8a9 100644
--- a/lfs/libloc
+++ b/lfs/libloc
@@ -81,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# https://lists.ipfire.org/pipermail/development/2022-November/014763.html
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18-Revert-Install-Perl-files-to-Perl-vendor-directory.patch
-
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/libloc-0.9.18_gettext-0.25_fix.patch
cd $(DIR_APP) && ./autogen.sh
cd $(DIR_APP) && ./configure \
--prefix=/usr \
diff --git a/src/patches/libloc-0.9.18_gettext-0.25_fix.patch b/src/patches/libloc-0.9.18_gettext-0.25_fix.patch
new file mode 100644
index 000000000..ad8d3c92a
--- /dev/null
+++ b/src/patches/libloc-0.9.18_gettext-0.25_fix.patch
@@ -0,0 +1,29 @@
+diff -Naur libloc-0.9.18.orig/autogen.sh libloc-0.9.18/autogen.sh
+--- libloc-0.9.18.orig/autogen.sh 2025-03-10 12:07:35.000000000 +0100
++++ libloc-0.9.18/autogen.sh 2025-05-14 11:24:52.602116647 +0200
+@@ -8,8 +8,9 @@
+ echo "Activated pre-commit hook."
+ fi
+
++autopoint
+ intltoolize --force --automake
+-autoreconf --install --symlink
++autoreconf --force --install --symlink
+
+ libdir() {
+ echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+diff -Naur libloc-0.9.18.orig/configure.ac libloc-0.9.18/configure.ac
+--- libloc-0.9.18.orig/configure.ac 2025-03-10 12:07:35.000000000 +0100
++++ libloc-0.9.18/configure.ac 2025-05-14 11:25:45.712783931 +0200
+@@ -30,7 +30,10 @@
+ AC_PREFIX_DEFAULT([/usr])
+ gl_LD_VERSION_SCRIPT
+
+-IT_PROG_INTLTOOL([0.40.0])
+++AM_GNU_GETTEXT_VERSION(0.25)
+++AM_GNU_GETTEXT([external])
++
++IT_PROG_INTLTOOL([0.51.0])
+
+ # Interpret embedded Python in HTML files
+ XGETTEXT="${XGETTEXT} -L Python --keyword=_:1,2 --keyword=N_:1,2 --no-location"
--
2.49.0
prev parent reply other threads:[~2025-05-14 13:15 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-14 13:15 [PATCH 1/4] gettext: Update to version 0.25 Adolf Belka
2025-05-14 13:15 ` [PATCH 2/4] fireperf: Addition of patch to deal with gettext update to 0.25 Adolf Belka
2025-05-14 13:15 ` [PATCH 3/4] ddns: " Adolf Belka
2025-05-14 13:15 ` Adolf Belka [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250514131513.6864-4-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
--cc=michael.tremer@ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox