]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
fireperf: Addition of patch to deal with gettext update to 0.25
authorAdolf Belka <adolf.belka@ipfire.org>
Wed, 14 May 2025 13:15:11 +0000 (15:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Wed, 14 May 2025 14:54:12 +0000 (14:54 +0000)
Suggested-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/fireperf
src/patches/fireperf-0.2.0_gettext-0.25_fix.patch [new file with mode: 0644]

index 1cdd32635f1d1c24177ad74819cee903950c8869..497bba538a8c788a6d006a9729159203b88d95ef 100644 (file)
@@ -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 (file)
index 0000000..8bd152e
--- /dev/null
@@ -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])