]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
libloc: Addition of patch to deal with gettext update to 0.25
authorAdolf Belka <adolf.belka@ipfire.org>
Wed, 14 May 2025 13:15:13 +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/libloc
src/patches/libloc-0.9.18_gettext-0.25_fix.patch [new file with mode: 0644]

index 8e438b50d08bf8ce2664babe647d8c4cf1030049..f2f0aa8a9c89a067e5b472ff93fcd075986ad8ab 100644 (file)
@@ -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 (file)
index 0000000..ad8d3c9
--- /dev/null
@@ -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"