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 2/4] fireperf: Addition of patch to deal with gettext update to 0.25
Date: Wed, 14 May 2025 15:15:11 +0200 [thread overview]
Message-ID: <20250514131513.6864-2-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/fireperf | 9 ++++---
.../fireperf-0.2.0_gettext-0.25_fix.patch | 26 +++++++++++++++++++
2 files changed, 31 insertions(+), 4 deletions(-)
create mode 100644 src/patches/fireperf-0.2.0_gettext-0.25_fix.patch
diff --git a/lfs/fireperf b/lfs/fireperf
index 1cdd32635..497bba538 100644
--- a/lfs/fireperf
+++ b/lfs/fireperf
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2021 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2025 IPFire Team <info@ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -34,7 +34,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = fireperf
-PAK_VER = 2
+PAK_VER = 3
DEPS =
@@ -81,10 +81,11 @@ $(subst %,%_BLAKE2,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xvf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch
cd $(DIR_APP) && ./autogen.sh
cd $(DIR_APP) && ./configure \
- --prefix=/usr \
- --disable-man-pages
+ --prefix=/usr \
+ --disable-man-pages
cd $(DIR_APP) && make $(MAKETUNING)
cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
diff --git a/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch b/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch
new file mode 100644
index 000000000..8bd152e79
--- /dev/null
+++ b/src/patches/fireperf-0.2.0_gettext-0.25_fix.patch
@@ -0,0 +1,26 @@
+diff -Naur fireperf-0.2.0.orig/autogen.sh fireperf-0.2.0/autogen.sh
+--- fireperf-0.2.0.orig/autogen.sh 2021-02-23 16:06:33.000000000 +0100
++++ fireperf-0.2.0/autogen.sh 2025-05-14 10:03:40.623918720 +0200
+@@ -8,8 +8,9 @@
+ echo "Activated pre-commit hook."
+ fi
+
++autopoint
+ intltoolize --force --automake
+-autoreconf --install --symlink
++autoreconf --install --symlink --force
+
+ libdir() {
+ echo $(cd $1/$(gcc -print-multi-os-directory); pwd)
+diff -Naur fireperf-0.2.0.orig/configure.ac fireperf-0.2.0/configure.ac
+--- fireperf-0.2.0.orig/configure.ac 2021-02-23 16:06:33.000000000 +0100
++++ fireperf-0.2.0/configure.ac 2025-05-13 20:47:20.578717837 +0200
+@@ -28,6 +28,8 @@
+ pic-only
+ ])
+ AC_PREFIX_DEFAULT([/usr])
++AM_GNU_GETTEXT_VERSION(0.25)
++AM_GNU_GETTEXT([external])
+
+ IT_PROG_INTLTOOL([0.40.0])
+
--
2.49.0
next 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 ` Adolf Belka [this message]
2025-05-14 13:15 ` [PATCH 3/4] ddns: Addition of patch to deal with gettext update to 0.25 Adolf Belka
2025-05-14 13:15 ` [PATCH 4/4] libloc: " Adolf Belka
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-2-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