unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72.
@ 2024-05-26 12:21 gemmaro
  2024-06-14 23:08 ` gemmaro
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: gemmaro @ 2024-05-26 12:21 UTC (permalink / raw)
  To: 71208; +Cc: gemmaro

* 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

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 <atai@atai.org>
 # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
 # Copyright © 2023 Bruno Victal <mirai@makinata.eu>
-# Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+# Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
 # Copyright © 2023 Herman Rimm <herman@rimm.ee>
 # Copyright © 2023 Troy Figiel <troy@troyfigiel.com>
 # Copyright © 2024 David Elsing <david.elsing@posteo.net>
@@ -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 <rosen644835@gmail.com>
 ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 EuAndreh <eu@euandre.org>
-;;; Copyright © 2022 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2022, 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;; 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 <maxim.cournoyer@gmail.com>
-Date: Thu, 27 Jul 2023 17:44:49 -0400
-Subject: [PATCH] lib: Texinfo: Translate partial menu node names.
-
-Fixes <https://issues.guix.gnu.org/64881>.
-
-* 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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL@li.org>\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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL@li.org>\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
-

base-commit: d859ab93753179bd112669b90d6aef3d99333eb9
-- 
2.41.0





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72.
  2024-05-26 12:21 [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72 gemmaro
@ 2024-06-14 23:08 ` gemmaro
  2024-06-18 13:22 ` [bug#71208] [PATCH core-updates v2] gnu: po4a: Update to 0.73 gemmaro
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: gemmaro @ 2024-06-14 23:08 UTC (permalink / raw)
  To: 71208

It might be better to wait for the next po4a release.

I haven't found any problems for use in Guix itself.  This means that
"make" and "make as-derivation" complete successfully.  However, some
problems have been reported with Debian packages [1].  So there may also
be problems with the Guix packages as well.

Therefore, I'm going to send revision 2 of the patch when the next
release of po4a is available.

Best,

[1] https://lists.po4a.org/archives/list/devel@lists.po4a.org/thread/VQUJAYNZ2UUVHFZWCQHLITCXQNTMKOLW/




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#71208] [PATCH core-updates v2] gnu: po4a: Update to 0.73.
  2024-05-26 12:21 [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72 gemmaro
  2024-06-14 23:08 ` gemmaro
@ 2024-06-18 13:22 ` gemmaro
  2024-08-09 15:21 ` [bug#71208] Sjors Provoost
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 7+ messages in thread
From: gemmaro @ 2024-06-18 13:22 UTC (permalink / raw)
  To: 71208; +Cc: gemmaro

* gnu/packages/gettext.scm (po4a): Update to 0.73.
[native-inputs]: Update docbook-xml to 4.5.
[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 as above.

Change-Id: Iefe13931415409e30d8da982dccc6e1adf1b2984
---
 gnu/local.mk                                  |   3 +-
 gnu/packages/gettext.scm                      |   9 +-
 .../po4a-partial-texinfo-menu-fix.patch       | 242 ------------------
 3 files changed, 5 insertions(+), 249 deletions(-)
 delete mode 100644 gnu/packages/patches/po4a-partial-texinfo-menu-fix.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8798020e7e..28e8b88b2a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -61,7 +61,7 @@
 # Copyright © 2023 Andy Tai <atai@atai.org>
 # Copyright © 2023 B. Wilson <elaexuotee@wilsonb.com>
 # Copyright © 2023 Bruno Victal <mirai@makinata.eu>
-# Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+# Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
 # Copyright © 2023 Herman Rimm <herman@rimm.ee>
 # Copyright © 2023 Troy Figiel <troy@troyfigiel.com>
 # Copyright © 2024 David Elsing <david.elsing@posteo.net>
@@ -1942,7 +1942,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..cabe4f3be9 100644
--- a/gnu/packages/gettext.scm
+++ b/gnu/packages/gettext.scm
@@ -11,7 +11,7 @@
 ;;; Copyright © 2019 Miguel <rosen644835@gmail.com>
 ;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2020 EuAndreh <eu@euandre.org>
-;;; Copyright © 2022 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2022, 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;; 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.73")
     (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"))))
+                "184f0cv0w3xa301gwm74srn5s6g8qdn3ksip84wpg8xjihnzh63g"))))
     (build-system perl-build-system)
     (arguments
      (list
@@ -292,7 +291,7 @@ (define-public po4a
            libxslt
            ;; For tests.
            docbook-sgml-4.1
-           docbook-xml-4.1.2
+           docbook-xml-4.5
            perl-test-pod
            (texlive-updmap.cfg)))
     (inputs
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 <maxim.cournoyer@gmail.com>
-Date: Thu, 27 Jul 2023 17:44:49 -0400
-Subject: [PATCH] lib: Texinfo: Translate partial menu node names.
-
-Fixes <https://issues.guix.gnu.org/64881>.
-
-* 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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL@li.org>\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 <EMAIL@ADDRESS>, 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 <EMAIL@ADDRESS>\n"
-+"Language-Team: LANGUAGE <LL@li.org>\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
-

base-commit: be3b90803f8b41126aa253e4811d0123d453dff2
-- 
2.45.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#71208]
  2024-05-26 12:21 [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72 gemmaro
  2024-06-14 23:08 ` gemmaro
  2024-06-18 13:22 ` [bug#71208] [PATCH core-updates v2] gnu: po4a: Update to 0.73 gemmaro
@ 2024-08-09 15:21 ` Sjors Provoost
  2024-08-13 15:17   ` [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72 gemmaro
  2024-08-13 15:46 ` bug#71208: " gemmaro
  2024-08-14 14:05 ` [bug#71208] [PATCH] gnu: Add ruby-gemtext gemmaro
  4 siblings, 1 reply; 7+ messages in thread
From: Sjors Provoost @ 2024-08-09 15:21 UTC (permalink / raw)
  To: 71208

Is it possible to have ./configure check the minimum version?

Ubuntu 24.04 currently ships with po4a version 0.69, and the make failures for doc/guix-cookbook are not very informative.

- Sjors



^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72.
  2024-08-09 15:21 ` [bug#71208] Sjors Provoost
@ 2024-08-13 15:17   ` gemmaro
  0 siblings, 0 replies; 7+ messages in thread
From: gemmaro @ 2024-08-13 15:17 UTC (permalink / raw)
  To: 71208; +Cc: Sjors Provoost

Sjors Provoost <sjors@sprovoost.nl> writes:

> Is it possible to have ./configure check the minimum version?
>
> Ubuntu 24.04 currently ships with po4a version 0.69, and the make
> failures for doc/guix-cookbook are not very informative.

Guix's po4a package has a configure phase, and its dependencies are
checked.  Note that po4a doesn't have `./configure` step but uses
Module::Build's `perl Build.PL`.

-- 
gemmaro




^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#71208: [PATCH core-updates] gnu: po4a: Update to 0.72.
  2024-05-26 12:21 [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72 gemmaro
                   ` (2 preceding siblings ...)
  2024-08-09 15:21 ` [bug#71208] Sjors Provoost
@ 2024-08-13 15:46 ` gemmaro
  2024-08-14 14:05 ` [bug#71208] [PATCH] gnu: Add ruby-gemtext gemmaro
  4 siblings, 0 replies; 7+ messages in thread
From: gemmaro @ 2024-08-13 15:46 UTC (permalink / raw)
  To: 71208-done

I'm closing this since it has been pushed as
bc17a2454a0ce6445ab26f6878cba859d29252ac.

Thank you,
gemmaro.




^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#71208] [PATCH] gnu: Add ruby-gemtext.
  2024-05-26 12:21 [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72 gemmaro
                   ` (3 preceding siblings ...)
  2024-08-13 15:46 ` bug#71208: " gemmaro
@ 2024-08-14 14:05 ` gemmaro
  4 siblings, 0 replies; 7+ messages in thread
From: gemmaro @ 2024-08-14 14:05 UTC (permalink / raw)
  To: 71208; +Cc: gemmaro, gemmaro, Sjors Provoost, Christopher Baines

* gnu/packages/ruby.scm (ruby-gemtext): New variable.

Change-Id: I21957517a1a3be6b0f5d61a7ba1c8420a884a641
---
 gnu/packages/ruby.scm | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm
index 9547481caf..b47fea0391 100644
--- a/gnu/packages/ruby.scm
+++ b/gnu/packages/ruby.scm
@@ -32,7 +32,7 @@
 ;;; Copyright © 2022-2024 Remco van 't Veer <remco@remworks.net>
 ;;; Copyright © 2022 Taiju HIGASHI <higashi@taiju.info>
 ;;; Copyright © 2023 Yovan Naumovski <yovan@gorski.stream>
-;;; Copyright © 2023 gemmaro <gemmaro.dev@gmail.com>
+;;; Copyright © 2023, 2024 gemmaro <gemmaro.dev@gmail.com>
 ;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen <janneke@gnu.org>
 ;;; Copyright © 2023, 2024 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2023, 2024 Hartmut Goebel <h.goebel@crazy-compilers.com>
@@ -7810,6 +7810,26 @@ (define-public ruby-tins
     (home-page "https://github.com/flori/tins")
     (license license:expat)))
 
+(define-public ruby-gemtext
+  (package
+    (name "ruby-gemtext")
+    (version "1.0.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (rubygems-uri "gemtext" version))
+       (sha256
+        (base32 "1z559f5z0zvwnqgnny0zf4mppiary020ljxwpw3bdxi2hr9aj3gp"))))
+    (build-system ruby-build-system)
+    (synopsis "Gemtext parser for Ruby")
+    (description
+     "This package is a Ruby parser library for Gemtext (hypertext format
+which is intended to serve as the native response format of the Gemini
+file transfer protocol) and produces a document object of various
+nodes.")
+    (home-page "https://github.com/exastencil/gemtext")
+    (license license:expat)))
+
 (define-public ruby-gem-hadar
   (package
     (name "ruby-gem-hadar")

base-commit: ca5ff8aa8b50ac317003d76cc4ea2a621d5a3819
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2024-08-14 14:07 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-05-26 12:21 [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72 gemmaro
2024-06-14 23:08 ` gemmaro
2024-06-18 13:22 ` [bug#71208] [PATCH core-updates v2] gnu: po4a: Update to 0.73 gemmaro
2024-08-09 15:21 ` [bug#71208] Sjors Provoost
2024-08-13 15:17   ` [bug#71208] [PATCH core-updates] gnu: po4a: Update to 0.72 gemmaro
2024-08-13 15:46 ` bug#71208: " gemmaro
2024-08-14 14:05 ` [bug#71208] [PATCH] gnu: Add ruby-gemtext gemmaro

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).