From patchwork Mon Jul 31 16:15:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 7044 Return-Path: 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 ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4RF3JN0s2Dz3wnw for ; Mon, 31 Jul 2023 16:16:04 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4RF3JJ6VgXz1rg; Mon, 31 Jul 2023 16:16:00 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4RF3JJ2kZ0z307Q; Mon, 31 Jul 2023 16:16:00 +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 (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4RF3JH1gKTz2xl7 for ; Mon, 31 Jul 2023 16:15:59 +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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4RF3JG6svTz1Rw; Mon, 31 Jul 2023 16:15:58 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1690820159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DbTpz9zwZLLDhJc+k4CA4QWs7E2aW2fwlcyJ0XfiEyw=; b=nE3v4E2fjVYBxP7lpaPfXmym5ZBN5ARumIGfCMpsOTg7JaEIW5AKAmKmAO0wyj+S3ZjkJO j9qhZcAXvpAnqgCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1690820159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=DbTpz9zwZLLDhJc+k4CA4QWs7E2aW2fwlcyJ0XfiEyw=; b=IzYWV2ufdY84cHn29Qctx3lUtd2l2ykPkSgRe9TYJ5WSJO8bQbv04PysrcnqAsAPmGpmYD PNkXrhuT/Cj5Qz8tG9BnQtMSjcyULNvCrVRoH4r2Qq4tWaKN4w3FpfBWcIEcR7xMBAYqFz r1t6XWSLiyYqMNTuEin4lvHlTbVefu9sfH2v4aHbyVStpMghJPo3j/ky7yCCgljLdAo6d7 IgHYj9YabXBGTab5y1KVoDymq960U91qf/sNamk+uqZlC6JyE417uH0rYzjggIFRHdx+9V IAAhB6blUtWnBY6ptMaa+phrfquUwR9a3/gdYtVkORwySRKxO+hewBtJ0mxDXg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH 2/2] procps: Add patch to fix errors that prevent build with gettext-0.22 Date: Mon, 31 Jul 2023 18:15:43 +0200 Message-ID: <20230731161551.3448505-2-adolf.belka@ipfire.org> In-Reply-To: <20230731161551.3448505-1-adolf.belka@ipfire.org> References: <20230731161551.3448505-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Gettext earlier than 0.21 would still build when it found errors in language files etc. With gettext-0.22 if it finds any errors it now stops. - There were two lines in the french po file in procps that had erros in them. procps have raised a commit to fix those. The patch included here carries out that commit. - Update of rootfile not required. - This patch will not be needed when the next update of procps occurs. Signed-off-by: Adolf Belka --- lfs/procps | 1 + ...ess_build_failures_with_gettext_0.22.patch | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch diff --git a/lfs/procps b/lfs/procps index a8f1c2c82..7aa41909a 100644 --- a/lfs/procps +++ b/lfs/procps @@ -70,6 +70,7 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch cd $(DIR_APP) && ./autogen.sh cd $(DIR_APP) && ./configure \ --prefix=/usr \ diff --git a/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch b/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch new file mode 100644 index 000000000..6552151f2 --- /dev/null +++ b/src/patches/procps-v4.0.3_address_build_failures_with_gettext_0.22.patch @@ -0,0 +1,20 @@ +--- procps-v4.0.3/po/fr.po.orig 2023-02-15 21:26:15.000000000 +0100 ++++ procps-v4.0.3/po/fr.po 2023-07-28 19:45:59.065599580 +0200 +@@ -3800,7 +3800,7 @@ + "Type 'q' or to continue " + msgstr "" + "Aide pour les commandes interactives~2 - %s\n" +-"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1lf " ++"Fenêtre ~1%s~6: ~1Mode cumulatif ~3%s~2. ~1Système~6: ~1Délai ~3%.1f " + "secs~2; ~1Mode sûr ~3%s~2.\n" + "\n" + " Z~5,~1B~5,E,e Global: «~1Z~2» couleurs; «~1B~2» gras; «~1E~2»/«~1e~2» " +@@ -4723,7 +4723,7 @@ + #: src/watch.c:486 + #, c-format + msgid "Every %.1fs: " +-msgstr "Toutes les %.1lfs: " ++msgstr "Toutes les %.1fs: " + + #: src/watch.c:487 + #, c-format