From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4ZyDNT34Gpz33cj for ; Wed, 14 May 2025 13:15:21 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4ZyDNP6mXMz33gK for ; Wed, 14 May 2025 13:15:17 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4ZyDNP0w3Fz6SQ; Wed, 14 May 2025 13:15:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1747228517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uBraiFRO9xxL9B21NToaKwtW8KJ6t2FgvvrnWqnrSQM=; b=dJXY5eOM8vtvPG2UBkO/Zc8oWCg1XXmdlfTgilhr5Eqx+o46B/KDO0byFeAi+lQ7ss0nKV IFr1j6omVF0I6g223WP1KLRn0SKrtI6k9AABDA1Ogt0GD78NSrQ/XPRF7M7eu2e/9HS+Os l7G7APqac2Wm7Clse+uJoxyUjsZ9pEMXrLT5k8ueA+dOOEWbMF8GErXZWURUFZmMQHqXOT BjYiqIZkv7onmOW0/hdZr2TRPLxtokXJdMmJMpYmJKKCwrzwdBLJv0/SSF4GsoWULCGfFd KNb2JFjCmJ6ELZ39IgzifrwJoZGBjIdT2//NNoxyDRN85Uc8B7QC3u2pRYPwhQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1747228517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uBraiFRO9xxL9B21NToaKwtW8KJ6t2FgvvrnWqnrSQM=; b=bOmm6kFrdxilY0DMyNNH6URUNaUfNnrs9TnOjMIPKSaPwsBRoRTrZPNvLeNLBbj6cmAt2q uTDEArKAr19HfdAg== From: Adolf Belka To: development@lists.ipfire.org Cc: Adolf Belka , Michael Tremer 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 Message-ID: <20250514131513.6864-4-adolf.belka@ipfire.org> In-Reply-To: <20250514131513.6864-1-adolf.belka@ipfire.org> References: <20250514131513.6864-1-adolf.belka@ipfire.org> Precedence: list List-Id: List-Subscribe: , List-Unsubscribe: , List-Post: List-Help: Sender: Mail-Followup-To: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Suggested-by: Michael Tremer Signed-off-by: Adolf Belka --- 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