From patchwork Sun May 26 12:21:16 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 64900 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CC78C27BBEA; Sun, 26 May 2024 13:25:14 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A658527BBE9 for ; Sun, 26 May 2024 13:25:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sBCvo-0005lo-80; Sun, 26 May 2024 08:24:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBCvn-0005lM-Bg for guix-patches@gnu.org; Sun, 26 May 2024 08:24:55 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sBCvn-0000ea-3i for guix-patches@gnu.org; Sun, 26 May 2024 08:24:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sBCvu-0000Dp-Ic for guix-patches@gnu.org; Sun, 26 May 2024 08:25:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 26 May 2024 12:25:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 71208 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71208@debbugs.gnu.org Cc: gemmaro X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.1716726264765 (code B ref -1); Sun, 26 May 2024 12:25:02 +0000 Received: (at submit) by debbugs.gnu.org; 26 May 2024 12:24:24 +0000 Received: from localhost ([127.0.0.1]:38543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBCvH-0000CG-Ia for submit@debbugs.gnu.org; Sun, 26 May 2024 08:24:24 -0400 Received: from lists.gnu.org ([209.51.188.17]:50438) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sBCvE-0000C5-OL for submit@debbugs.gnu.org; Sun, 26 May 2024 08:24:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sBCv5-0005bM-Ch for guix-patches@gnu.org; Sun, 26 May 2024 08:24:11 -0400 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sBCv1-0000Oo-1p for guix-patches@gnu.org; Sun, 26 May 2024 08:24:11 -0400 Received: by mail-pf1-x432.google.com with SMTP id d2e1a72fcca58-6f8e9878514so1876603b3a.1 for ; Sun, 26 May 2024 05:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1716726245; x=1717331045; darn=gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=kVUQfXbaMF7xO3vWFcrmKIRjjFfEQmNYE/YtFB74Tt4=; b=JunPUTYYjgIdfP5VHYRZ92dhDQkr7GpzoD2FXG5v7UeabCApt7JGqzFsueEC2UWGyY Gpff2U7nE9tgXMKEY+Kd7nh9a1XgEm9xpeXhpZVWeKLrgqr1YV/PQ4s6WDbEvUti3XZ5 R1nDYR/vQqtLhtJ7qEdrG0QA3DrdtkIhtOVOFC3Zd9zUKEgsR6sOa+gABeaZaV1R6fQZ KMuW+EfaxRcU4Z31ukzQkmtkELpMfKBYsKLzTb4w9uEXn6jI5HJjH5xJcmaNufGIEXuH ClStE3F7eTQy0jerI9zRN8SXWd5kn62UUstMIGQ8jgM3ENzFEESdV/4gv07a7QX4zTd8 jADQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716726245; x=1717331045; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=kVUQfXbaMF7xO3vWFcrmKIRjjFfEQmNYE/YtFB74Tt4=; b=IClxMCJ3foGRV8LNjZNxHp9yEsGaermMPekjGD9MlL46QMZmcKdJhC3Al/678dGFFS VeVx+4UEsXljINQvET/18RR6ZFjiCIgIDtFo+XkKF1h/xXOOMJ2Jin+6o/Gbjs8WRfJF 4MICi6nCRpnQi8UGgkcor18H7syPeYmYI1MkezLNDASplFZ5RKYzccCWyG+U1kX645H3 OStVuuKvCw+MrikPUKAl/kPSkRX7PUARIAwo4iYigZidEpLoaipPqStOAot44b85wTiU vp0oIu3R2i6FK9fVEHH/XNh7N/YIHAEfoLayTG8fIYd9lHjJgC6M0ovQFY0y8eX32P9b 7vHg== X-Gm-Message-State: AOJu0Yz2zUKc9/AARqUBFZbnmyPfXTNlVN2WfimL49VGbO46Vbjcuvcg zN57tsjzptnGLw8OsV+3dwhKZDsuajmQ7NfIm6OG5jAu5k2ktk8I5JLpDanW X-Google-Smtp-Source: AGHT+IFVn2XSUe7ZEBTSGUsTW1n1X5Q83rVhso7mVCqelQl071aIGpw8xjrxHdQ+aAaJXGF01llbjQ== X-Received: by 2002:a05:6a00:28cd:b0:6f8:af92:5ec5 with SMTP id d2e1a72fcca58-6f8f2c6bc04mr6732623b3a.5.1716726244805; Sun, 26 May 2024 05:24:04 -0700 (PDT) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-6f8fcbebbaasm3462076b3a.111.2024.05.26.05.24.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 May 2024 05:24:04 -0700 (PDT) From: gemmaro Date: Sun, 26 May 2024 21:21:16 +0900 Message-ID: <10ca1507c6564c1a2f477eac20847ead84d82708.1716726076.git.gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::432; envelope-from=gemmaro.dev@gmail.com; helo=mail-pf1-x432.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/gettext.scm (po4a): Update to 0.72. [source]: Remove the patch since it is merged in version 0.70. * gnu/local.mk, gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch: Same above. Change-Id: Ia960d5d105eb3ce19ed280946ec34fa82e4188cd --- gnu/local.mk | 3 +- gnu/packages/gettext.scm | 7 +- .../po4a-partial-texinfo-menu-fix.patch | 242 ------------------ 3 files changed, 4 insertions(+), 248 deletions(-) delete mode 100644 gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch base-commit: d859ab93753179bd112669b90d6aef3d99333eb9 diff --git a/gnu/local.mk b/gnu/local.mk index b77fb84d4b..2f85bfbcbf 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -61,7 +61,7 @@ # Copyright © 2023 Andy Tai # Copyright © 2023 B. Wilson # Copyright © 2023 Bruno Victal -# Copyright © 2023 gemmaro +# Copyright © 2023, 2024 gemmaro # Copyright © 2023 Herman Rimm # Copyright © 2023 Troy Figiel # Copyright © 2024 David Elsing @@ -1923,7 +1923,6 @@ dist_patch_DATA = \ %D%/packages/patches/plib-CVE-2011-4620.patch \ %D%/packages/patches/plib-CVE-2012-4552.patch \ %D%/packages/patches/plotutils-spline-test.patch \ - %D%/packages/patches/po4a-partial-texinfo-menu-fix.patch \ %D%/packages/patches/polkit-disable-systemd.patch \ %D%/packages/patches/portaudio-audacity-compat.patch \ %D%/packages/patches/portmidi-modular-build.patch \ diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index b0e99d1a5f..e68030082d 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2019 Miguel ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020 EuAndreh -;;; Copyright © 2022 gemmaro +;;; Copyright © 2022, 2024 gemmaro ;;; Copyright © 2023 Maxim Cournoyer maxim.cournoyer@gmail.com> ;;; ;;; This file is part of GNU Guix. @@ -237,7 +237,7 @@ (define-public mdpo (define-public po4a (package (name "po4a") - (version "0.69") + (version "0.72") (source (origin (method url-fetch) (uri (string-append "https://github.com/mquinson/po4a" @@ -245,8 +245,7 @@ (define-public po4a version "/po4a-" version ".tar.gz")) (sha256 (base32 - "15llrfdp4ilbrxy65hmmxka86xj0mrbqfiyzv715wrk16vqszm3w")) - (patches (search-patches "po4a-partial-texinfo-menu-fix.patch")))) + "0rv9x26mi23qlajxfwkyhzpr7z4i4d9w571ll81brl7z92yjsq4d")))) (build-system perl-build-system) (arguments (list diff --git a/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch b/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch deleted file mode 100644 index 8a075fa74c..0000000000 --- a/gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch +++ /dev/null @@ -1,242 +0,0 @@ -Submitted upstream: https://github.com/mquinson/po4a/pull/437 - -From 43db5c0b14ec2a8ba44d338bce024df87256457b Mon Sep 17 00:00:00 2001 -From: Maxim Cournoyer -Date: Thu, 27 Jul 2023 17:44:49 -0400 -Subject: [PATCH] lib: Texinfo: Translate partial menu node names. - -Fixes . - -* lib/Locale/Po4a/Texinfo.pm (translate_buffer_menuentry): Refine -regexp, so that it matches menu entries lacking a description. -Only call 'translate_buffer' on the description if it was provided. -* t/fmt/texinfo/partialmenus.trans: New file. -* t/fmt/texinfo/partialmenus.texi: Likewise. -* t/fmt/texinfo/partialmenus.pot: Likewise. -* t/fmt/texinfo/partialmenus.po: Likewise. -* t/fmt/texinfo/partialmenus.norm: Likewise. -* t/fmt-texinfo.t: Register the new 'partialmenus' test. ---- - lib/Locale/Po4a/Texinfo.pm | 7 +++--- - t/fmt-texinfo.t | 2 +- - t/fmt/texinfo/partialmenus.norm | 21 +++++++++++++++++ - t/fmt/texinfo/partialmenus.po | 40 ++++++++++++++++++++++++++++++++ - t/fmt/texinfo/partialmenus.pot | 40 ++++++++++++++++++++++++++++++++ - t/fmt/texinfo/partialmenus.texi | 14 +++++++++++ - t/fmt/texinfo/partialmenus.trans | 21 +++++++++++++++++ - 7 files changed, 141 insertions(+), 4 deletions(-) - create mode 100644 t/fmt/texinfo/partialmenus.norm - create mode 100644 t/fmt/texinfo/partialmenus.po - create mode 100644 t/fmt/texinfo/partialmenus.pot - create mode 100644 t/fmt/texinfo/partialmenus.texi - create mode 100644 t/fmt/texinfo/partialmenus.trans - -diff --git a/lib/Locale/Po4a/Texinfo.pm b/lib/Locale/Po4a/Texinfo.pm -index b4750699..1c3a4bae 100644 ---- a/lib/Locale/Po4a/Texinfo.pm -+++ b/lib/Locale/Po4a/Texinfo.pm -@@ -336,7 +336,7 @@ sub translate_buffer_menuentry { - - my $translated_buffer = ""; - -- if ( $buffer =~ m/^(.*?)(::)\s+(.*)$/s -+ if ( $buffer =~ m/^(.*?)(::)(?:\s+(.*))?$/s - or $buffer =~ m/^(.*?: .*?)(\.)\s+(.*)$/s ) - { - my ( $name, $sep, $description ) = ( $1, $2, $3 ); -@@ -347,8 +347,9 @@ sub translate_buffer_menuentry { - $translated_buffer .= ' ' x ( $menu_sep_width - 1 - $l ); - $l = $menu_sep_width - 1; - } -- ( $t, @e ) = $self->translate_buffer( $description, $no_wrap, @env ); -- -+ if ($description) { -+ ( $t, @e ) = $self->translate_buffer( $description, $no_wrap, @env ); -+ } - # Replace newlines with space for proper wrapping - # See https://github.com/mquinson/po4a/issues/122 - $t =~ s/\n/ /sg; -diff --git a/t/fmt-texinfo.t b/t/fmt-texinfo.t -index 4b067e43..d9ed5df3 100644 ---- a/t/fmt-texinfo.t -+++ b/t/fmt-texinfo.t -@@ -10,7 +10,7 @@ use Testhelper; - - my @tests; - --for my $test (qw(longmenu comments tindex)) { -+for my $test (qw(longmenu partialmenus comments tindex)) { - push @tests, - { - 'format' => 'texinfo', -diff --git a/t/fmt/texinfo/partialmenus.norm b/t/fmt/texinfo/partialmenus.norm -new file mode 100644 -index 00000000..99240682 ---- /dev/null -+++ b/t/fmt/texinfo/partialmenus.norm -@@ -0,0 +1,21 @@ -+\input texinfo -+@c =========================================================================== -+@c -+@c This file was generated with po4a. Translate the source file. -+@c -+@c =========================================================================== -+ -+ -+@c These menus do not contain a description, which used to cause a -+@c Texinfo menu entry to not be translated. -+@menu -+* A menu entry without any description:: A menu entry without any -+ description -+* Optional menu name: The menu node:: Optional menu name: The menu node -+@end menu -+ -+@node A menu entry without any description -+@chapter A menu entry without any description -+ -+@node The menu node -+@chapter Optional menu name -diff --git a/t/fmt/texinfo/partialmenus.po b/t/fmt/texinfo/partialmenus.po -new file mode 100644 -index 00000000..31a14443 ---- /dev/null -+++ b/t/fmt/texinfo/partialmenus.po -@@ -0,0 +1,40 @@ -+# SOME DESCRIPTIVE TITLE -+# Copyright (C) YEAR Free Software Foundation, Inc. -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"POT-Creation-Date: 2023-07-27 17:29-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: FULL NAME \n" -+"Language-Team: LANGUAGE \n" -+"Language: \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. type: chapter -+#: partialmenus.texi:8 partialmenus.texi:10 partialmenus.texi:11 -+#, no-wrap -+msgid "A menu entry without any description" -+msgstr "A MENU ENTRY WITHOUT ANY DESCRIPTION" -+ -+#. type: menuentry -+#: partialmenus.texi:8 -+msgid "Optional menu name: The menu node" -+msgstr "OPTIONAL MENU NAME: THE MENU NODE" -+ -+#. type: node -+#: partialmenus.texi:13 -+#, no-wrap -+msgid "The menu node" -+msgstr "THE MENU NODE" -+ -+#. type: chapter -+#: partialmenus.texi:14 -+#, no-wrap -+msgid "Optional menu name" -+msgstr "OPTIONAL MENU NAME" -diff --git a/t/fmt/texinfo/partialmenus.pot b/t/fmt/texinfo/partialmenus.pot -new file mode 100644 -index 00000000..0379f805 ---- /dev/null -+++ b/t/fmt/texinfo/partialmenus.pot -@@ -0,0 +1,40 @@ -+# SOME DESCRIPTIVE TITLE -+# Copyright (C) YEAR Free Software Foundation, Inc. -+# This file is distributed under the same license as the PACKAGE package. -+# FIRST AUTHOR , YEAR. -+# -+#, fuzzy -+msgid "" -+msgstr "" -+"Project-Id-Version: PACKAGE VERSION\n" -+"POT-Creation-Date: 2023-08-16 09:47-0400\n" -+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -+"Last-Translator: FULL NAME \n" -+"Language-Team: LANGUAGE \n" -+"Language: \n" -+"MIME-Version: 1.0\n" -+"Content-Type: text/plain; charset=UTF-8\n" -+"Content-Transfer-Encoding: 8bit\n" -+ -+#. type: chapter -+#: partialmenus.texi:8 partialmenus.texi:10 partialmenus.texi:11 -+#, no-wrap -+msgid "A menu entry without any description" -+msgstr "" -+ -+#. type: menuentry -+#: partialmenus.texi:8 -+msgid "Optional menu name: The menu node" -+msgstr "" -+ -+#. type: node -+#: partialmenus.texi:13 -+#, no-wrap -+msgid "The menu node" -+msgstr "" -+ -+#. type: chapter -+#: partialmenus.texi:14 -+#, no-wrap -+msgid "Optional menu name" -+msgstr "" -diff --git a/t/fmt/texinfo/partialmenus.texi b/t/fmt/texinfo/partialmenus.texi -new file mode 100644 -index 00000000..f8663a2b ---- /dev/null -+++ b/t/fmt/texinfo/partialmenus.texi -@@ -0,0 +1,14 @@ -+\input texinfo -+ -+@c These menus do not contain a description, which used to cause a -+@c Texinfo menu entry to not be translated. -+@menu -+* A menu entry without any description:: -+* Optional menu name: The menu node:: -+@end menu -+ -+@node A menu entry without any description -+@chapter A menu entry without any description -+ -+@node The menu node -+@chapter Optional menu name -diff --git a/t/fmt/texinfo/partialmenus.trans b/t/fmt/texinfo/partialmenus.trans -new file mode 100644 -index 00000000..0ef742a1 ---- /dev/null -+++ b/t/fmt/texinfo/partialmenus.trans -@@ -0,0 +1,21 @@ -+\input texinfo -+@c =========================================================================== -+@c -+@c This file was generated with po4a. Translate the source file. -+@c -+@c =========================================================================== -+ -+ -+@c These menus do not contain a description, which used to cause a -+@c Texinfo menu entry to not be translated. -+@menu -+* A MENU ENTRY WITHOUT ANY DESCRIPTION:: A MENU ENTRY WITHOUT ANY -+ DESCRIPTION -+* OPTIONAL MENU NAME: THE MENU NODE:: OPTIONAL MENU NAME: THE MENU NODE -+@end menu -+ -+@node A MENU ENTRY WITHOUT ANY DESCRIPTION -+@chapter A MENU ENTRY WITHOUT ANY DESCRIPTION -+ -+@node THE MENU NODE -+@chapter OPTIONAL MENU NAME - -base-commit: 5b1cd768afdf4e9445812c5d43428495a0fde3c6 --- -2.41.0 -