* Re: po4a: update to 0.64
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
@ 2021-11-12 22:53 ` ericonr
2021-11-13 7:24 ` newbluemoon
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-11-12 22:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 307 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-967712447
Comment:
We build `opensp` with `--enable-default-catalog=/usr/share/sgml/catalog`, could that affect things? We are also one version above the one advertised in the homepage,
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.64
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
2021-11-12 22:53 ` ericonr
@ 2021-11-13 7:24 ` newbluemoon
2021-11-15 13:20 ` [PR PATCH] [Updated] " newbluemoon
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-13 7:24 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1719 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-967797613
Comment:
`opensp` without `--enable-default-catalog=...` doesn’t find the docbook DTDs in the first place. :(
All distributions I checked use 1.5.2. Maybe they just forgot or didn’t care to update the homepage. ;)
What’s bugging me is why does
`onsgmls -p basic.sgml` work and
`onsgmls -p < basic.sgml` doesn’t.
(`basic.sgml` from `po4a-0.64/f/fmt/sgml/`)
http://openjade.sourceforge.net/doc/nsgmls.htm says
`onsgmls [ option... ] sysid...`
> If no system identifiers are specified, then nsgmls will read the document entity from the standard input. A command line system identifier of - can be used to refer to the standard input. (Normally in a system identifier, <osfd>0 is used to refer to standard input.)
http://openjade.sourceforge.net/doc/sysid.htm says
> There are two kinds of system identifier: formal system identifiers and simple system identifiers. A system identifier that does not start with < will always be interpreted as a simple system identifier. A simple system identifier will always be interpreted either as a filename or as a URL.
...
A system identifier will be interpreted as a formal system identifier if it starts with a < followed by a storage manager name, followed by either > or white-space; otherwise it will be interpreted as a simple system identifier.
But in the above example the `<` is a shell redirection not the start of a formal system identifier so that the file is supposed to be read via stdin. I can only assume that in this case “something” gets lost which is expected to also be fed in via stdin?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.64
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
2021-11-12 22:53 ` ericonr
2021-11-13 7:24 ` newbluemoon
@ 2021-11-15 13:20 ` newbluemoon
2021-11-16 7:18 ` [PR PATCH] [Updated] po4a: update to 0.65 newbluemoon
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-15 13:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.64
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 1328 bytes --]
From 569995c47449dd5fa307330602a2a976ee0d7177 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH] po4a: update to 0.65
---
srcpkgs/po4a/template | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..b53e82e65d1f 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.65
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,10 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=5900bc5ecd6727b74ec4770dddd461fbf14fe23a4c29507a0c2f35a78ad45b4c
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (2 preceding siblings ...)
2021-11-15 13:20 ` [PR PATCH] [Updated] " newbluemoon
@ 2021-11-16 7:18 ` newbluemoon
2021-11-16 8:01 ` newbluemoon
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-16 7:18 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.65
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 2922 bytes --]
From 48b0710d1143b9289cc4e7bc77796db20de4f356 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH] po4a: update to 0.65
---
.../po4a/patches/dont-pipe-into-onsgmls.patch | 23 +++++++++++++++++++
srcpkgs/po4a/template | 5 ++--
2 files changed, 26 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
diff --git a/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
new file mode 100644
index 000000000000..a8a860d32350
--- /dev/null
+++ b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
@@ -0,0 +1,23 @@
+source: https://github.com/mquinson/po4a/commit/61b1c61a6de9aca1f83b3a0d344ec6cba86b753c
+Directly pass the file as a parameter to onsgmls instead of piping the input
+
+--- a/lib/Locale/Po4a/Sgml.pm.orig
++++ b/lib/Locale/Po4a/Sgml.pm
+@@ -405,7 +405,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh
+ or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+- if ( system("onsgmls -p < $tmpfile") ) {
++ if ( system("onsgmls -p $tmpfile") ) {
+ unlink($tmpfile);
+ die wrap_mod(
+ "po4a::sgml",
+@@ -858,7 +858,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+
+- my $cmd = "onsgmls -l -E 0 -wno-valid < $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
++ my $cmd = "onsgmls -l -E 0 -wno-valid $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
+ print STDERR "CMD=$cmd\n" if ( $debug{'generic'} or $debug{'onsgmls'} );
+
+ open( IN, $cmd ) || die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot run onsgmls: %s" ), $! );
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..b53e82e65d1f 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.65
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,10 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=5900bc5ecd6727b74ec4770dddd461fbf14fe23a4c29507a0c2f35a78ad45b4c
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (3 preceding siblings ...)
2021-11-16 7:18 ` [PR PATCH] [Updated] po4a: update to 0.65 newbluemoon
@ 2021-11-16 8:01 ` newbluemoon
2021-11-17 16:20 ` [PR PATCH] [Updated] " newbluemoon
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-16 8:01 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 817 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-969980443
Comment:
Added an upstream patch which removes piping into `onsgmls`, reading the file as a paramater instead. This seems to have been a residual from a long time ago and fixes half of the problem.
The test still fails because `docbook` ships a declaration which has `OMITTAG NO`. When set to `YES` the test passes. Debian for example completely patches out all `docbook` declarations and ships its own.
This seems to happen because the test sgml files are not valid according to the original docbook declaration and the way to go should be to fix the test sgml files. I will give it a shot, but until then, I think this PR is good to go as it is the test that’s broken. :)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (4 preceding siblings ...)
2021-11-16 8:01 ` newbluemoon
@ 2021-11-17 16:20 ` newbluemoon
2021-11-17 16:22 ` newbluemoon
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-17 16:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.65
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 19156 bytes --]
From dc995f55a1b99268dc3f2678f28f6317f59c56d8 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH] po4a: update to 0.65
---
.../po4a/patches/dont-pipe-into-onsgmls.patch | 25 +
srcpkgs/po4a/patches/fix-sgml-tests.patch | 566 ++++++++++++++++++
srcpkgs/po4a/template | 5 +-
3 files changed, 594 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
create mode 100644 srcpkgs/po4a/patches/fix-sgml-tests.patch
diff --git a/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
new file mode 100644
index 000000000000..684d451b2272
--- /dev/null
+++ b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
@@ -0,0 +1,25 @@
+source: https://github.com/mquinson/po4a/commit/61b1c61a6de9aca1f83b3a0d344ec6cba86b753c
+
+Directly pass the input file as a parameter to onsgmls
+instead of piping the input.
+
+--- a/lib/Locale/Po4a/Sgml.pm.orig
++++ b/lib/Locale/Po4a/Sgml.pm
+@@ -405,7 +405,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh
+ or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+- if ( system("onsgmls -p < $tmpfile") ) {
++ if ( system("onsgmls -p $tmpfile") ) {
+ unlink($tmpfile);
+ die wrap_mod(
+ "po4a::sgml",
+@@ -858,7 +858,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+
+- my $cmd = "onsgmls -l -E 0 -wno-valid < $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
++ my $cmd = "onsgmls -l -E 0 -wno-valid $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
+ print STDERR "CMD=$cmd\n" if ( $debug{'generic'} or $debug{'onsgmls'} );
+
+ open( IN, $cmd ) || die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot run onsgmls: %s" ), $! );
diff --git a/srcpkgs/po4a/patches/fix-sgml-tests.patch b/srcpkgs/po4a/patches/fix-sgml-tests.patch
new file mode 100644
index 000000000000..dfd5240ca61c
--- /dev/null
+++ b/srcpkgs/po4a/patches/fix-sgml-tests.patch
@@ -0,0 +1,566 @@
+source: https://github.com/mquinson/po4a/commit/6763f890fcb9d27155786e2352027789ac039354
+
+make the test sgml files valid according to the
+docbook sgml declaration
+
+--- a/t/fmt/sgml/attributes-order.norm 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.norm 2021-11-17 08:55:33.184006403 +0100
+@@ -1,33 +1,39 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>refsect1</title>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ </refsect1>
++ <refsect1 id="next">
++ <title>another refsect1</title>
++ <para>
++ tetrahedron
++ </para>
++ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/attributes-order.po 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.po 2021-11-17 08:57:04.742240950 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2020-05-22 00:09+0200\n"
++"POT-Creation-Date: 2021-11-17 08:55+0100\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"
+@@ -16,41 +16,31 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#~ msgid "<firstname>fname</firstname>"
+-#~ msgstr "<firstname>FNAME</firstname>"
+-
+-#~ msgid "<surname>Surname</surname>"
+-#~ msgstr "<surname>SURNAME</surname>"
+-
+-#~ msgid "<email>email@1.com</email>"
+-#~ msgstr "<email>EMAIL@1.COM</email>"
+-
+-#~ msgid "<email>email@2.com</email>"
+-#~ msgstr "<email>EMAIL@1.COM</email>"
+-
+-#~ msgid ""
+-#~ "<address>\n"
+-#~ " &dhemail; and &dhuemail;\n"
+-#~ " "
+-#~ msgstr ""
+-#~ "<address>\n"
+-#~ " &dhemail; AND &dhuemail;\n"
+-#~ " "
+-
+-#~ msgid "&dhfirstname; &dhsurname;"
+-#~ msgstr "&dhfirstname; &dhsurname;"
+-
+-#~ msgid "<year>2004, 2007</year>"
+-#~ msgstr "<year>2004, 2007</year>"
+-
+-#~ msgid "&dhusername; and &dhuusername;"
+-#~ msgstr "&dhusername; AND &dhuusername;"
+-
+-#~ msgid "Help Options:"
+-#~ msgstr "HELP OPTIONS:"
+-
+-#~ msgid "Show help options."
+-#~ msgstr "SHOW HELP OPTIONS"
+-
+-#~ msgid "Test test1 test2 test3 test4."
+-#~ msgstr "TEST TEST1 TEST2 TEST3 TEST4."
++#. type: <refname></refname>
++#: attributes-order.sgml:5
++#, no-wrap
++msgid "test"
++msgstr "TEST"
++
++#. type: <refpurpose></refpurpose>
++#: attributes-order.sgml:6
++#, no-wrap
++msgid "test refentry"
++msgstr "TEST REFENTRY"
++
++#. type: <title></title>
++#: attributes-order.sgml:9
++#, no-wrap
++msgid "refsect1"
++msgstr "REFSECT1"
++
++#. type: <title></title>
++#: attributes-order.sgml:18
++#, no-wrap
++msgid "another refsect1"
++msgstr "ANOTHER REFSECT1"
++
++#. type: <para></para>
++#: attributes-order.sgml:19
++msgid "tetrahedron"
++msgstr "TETRAHEDRON"
+--- a/t/fmt/sgml/attributes-order.pot 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.pot 2021-11-17 08:55:33.185006395 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2020-05-22 00:09+0200\n"
++"POT-Creation-Date: 2021-11-17 08:55+0100\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"
+@@ -16,3 +16,31 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
++#. type: <refname></refname>
++#: attributes-order.sgml:5
++#, no-wrap
++msgid "test"
++msgstr ""
++
++#. type: <refpurpose></refpurpose>
++#: attributes-order.sgml:6
++#, no-wrap
++msgid "test refentry"
++msgstr ""
++
++#. type: <title></title>
++#: attributes-order.sgml:9
++#, no-wrap
++msgid "refsect1"
++msgstr ""
++
++#. type: <title></title>
++#: attributes-order.sgml:18
++#, no-wrap
++msgid "another refsect1"
++msgstr ""
++
++#. type: <para></para>
++#: attributes-order.sgml:19
++msgid "tetrahedron"
++msgstr ""
+--- a/t/fmt/sgml/attributes-order.sgml 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.sgml 2021-11-17 09:04:24.200573288 +0100
+@@ -1,12 +1,21 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+
+ <refentry>
++ <refnamediv>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
++ </refnamediv>
+ <refsect1>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
++ <title>refsect1</title>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ </refsect1>
++ <refsect1 id="next">
++ <title>another refsect1</title>
++ <para>tetrahedron</para>
+ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/attributes-order.trans 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.trans 2021-11-17 08:58:01.765764454 +0100
+@@ -1,33 +1,39 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>TEST</refname>
++ <refpurpose>TEST REFENTRY</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>REFSECT1</title>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ </refsect1>
++ <refsect1 id="next">
++ <title>ANOTHER REFSECT1</title>
++ <para>
++ TETRAHEDRON
++ </para>
++ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/basic.norm 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.norm 2021-11-16 21:53:56.732261414 +0100
+@@ -1,9 +1,11 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+ <!ENTITY dhfirstname "<firstname>fname</firstname>">
+ <!ENTITY dhsurname "<surname>Surname</surname>">
+ <!ENTITY dhemail "<email>email@1.com</email>">
+ <!ENTITY dhuemail "<email>email@2.com</email>">
++ <!ENTITY dhusername "Jane Doe">
++ <!ENTITY dhuusername "John Doe">
+ ]>
+ <refentry>
+ <refentryinfo>
+@@ -20,11 +22,11 @@
+ </copyright>
+ </refentryinfo>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>refsect1</title>
+ <para>
+ Help Options:
+ </para>
+--- a/t/fmt/sgml/basic.po 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.po 2021-11-17 09:28:47.239474483 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2007-08-05 17:42+0200\n"
++"POT-Creation-Date: 2021-11-16 22:40+0100\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"
+@@ -34,10 +34,20 @@
+ #. type: definition of entity &dhuemail;
+ #, no-wrap
+ msgid "<email>email@2.com</email>"
+-msgstr "<email>EMAIL@1.COM</email>"
++msgstr "<email>EMAIL@2.COM</email>"
++
++#. type: definition of entity &dhusername;
++#, no-wrap
++msgid "Jane Doe"
++msgstr "JANE DOE"
++
++#. type: definition of entity &dhuusername;
++#, no-wrap
++msgid "John Doe"
++msgstr "JOHN DOE"
+
+ #. type: <address></address>
+-#: basic.sgml:11
++#: basic.sgml:13
+ #, no-wrap
+ msgid ""
+ "<address>\n"
+@@ -49,38 +59,56 @@
+ " "
+
+ #. type: <author></author>
+-#: basic.sgml:19
++#: basic.sgml:21
+ msgid "&dhfirstname; &dhsurname;"
+ msgstr "&dhfirstname; &dhsurname;"
+
+ #. type: <copyright><holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ msgid "<year>2004, 2007</year>"
+ msgstr "<year>2004, 2007</year>"
+
+ #. type: <holder></holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ #, no-wrap
+ msgid "&dhusername; and &dhuusername;"
+-msgstr "&dhusername; AND &dhuusername;"
++msgstr "&dhusername; and &dhuusername;"
++
++#. type: <refname></refname>
++#: basic.sgml:30
++#, no-wrap
++msgid "test"
++msgstr "TEST"
++
++#. type: <refpurpose></refpurpose>
++#: basic.sgml:31
++#, no-wrap
++msgid "test refentry"
++msgstr "TEST REFENTRY"
++
++#. type: <title></title>
++#: basic.sgml:34
++#, no-wrap
++msgid "refsect1"
++msgstr "REFSECT1"
+
+ #. type: <para></para>
+-#: basic.sgml:28
++#: basic.sgml:35
+ msgid "Help Options:"
+ msgstr "HELP OPTIONS:"
+
+ #. type: <term></term>
+-#: basic.sgml:31
++#: basic.sgml:38
+ #, no-wrap
+ msgid "<option>-?</option> <option>--help</option>"
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:33
++#: basic.sgml:40
+ msgid "Show help options."
+-msgstr "SHOW HELP OPTIONS"
++msgstr "SHOW HELP OPTIONS."
+
+ #. type: <para></para>
+-#: basic.sgml:39 basic.sgml:41
++#: basic.sgml:46 basic.sgml:48
+ msgid "Test test1 test2 test3 test4."
+ msgstr "TEST TEST1 TEST2 TEST3 TEST4."
+--- a/t/fmt/sgml/basic.pot 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.pot 2021-11-16 22:40:08.561394570 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2007-08-05 17:42+0200\n"
++"POT-Creation-Date: 2021-11-16 22:40+0100\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"
+@@ -36,8 +36,18 @@
+ msgid "<email>email@2.com</email>"
+ msgstr ""
+
++#. type: definition of entity &dhusername;
++#, no-wrap
++msgid "Jane Doe"
++msgstr ""
++
++#. type: definition of entity &dhuusername;
++#, no-wrap
++msgid "John Doe"
++msgstr ""
++
+ #. type: <address></address>
+-#: basic.sgml:11
++#: basic.sgml:13
+ #, no-wrap
+ msgid ""
+ "<address>\n"
+@@ -46,38 +56,56 @@
+ msgstr ""
+
+ #. type: <author></author>
+-#: basic.sgml:19
++#: basic.sgml:21
+ msgid "&dhfirstname; &dhsurname;"
+ msgstr ""
+
+ #. type: <copyright><holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ msgid "<year>2004, 2007</year>"
+ msgstr ""
+
+ #. type: <holder></holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ #, no-wrap
+ msgid "&dhusername; and &dhuusername;"
+ msgstr ""
+
++#. type: <refname></refname>
++#: basic.sgml:30
++#, no-wrap
++msgid "test"
++msgstr ""
++
++#. type: <refpurpose></refpurpose>
++#: basic.sgml:31
++#, no-wrap
++msgid "test refentry"
++msgstr ""
++
++#. type: <title></title>
++#: basic.sgml:34
++#, no-wrap
++msgid "refsect1"
++msgstr ""
++
+ #. type: <para></para>
+-#: basic.sgml:28
++#: basic.sgml:35
+ msgid "Help Options:"
+ msgstr ""
+
+ #. type: <term></term>
+-#: basic.sgml:31
++#: basic.sgml:38
+ #, no-wrap
+ msgid "<option>-?</option> <option>--help</option>"
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:33
++#: basic.sgml:40
+ msgid "Show help options."
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:39 basic.sgml:41
++#: basic.sgml:46 basic.sgml:48
+ msgid "Test test1 test2 test3 test4."
+ msgstr ""
+--- a/t/fmt/sgml/basic.sgml 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.sgml 2021-11-16 15:56:10.113854553 +0100
+@@ -1,8 +1,10 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+ <!ENTITY dhfirstname "<firstname>fname</firstname>">
+ <!ENTITY dhsurname "<surname>Surname</surname>">
+ <!ENTITY dhemail "<email>email@1.com</email>">
+ <!ENTITY dhuemail "<email>email@2.com</email>">
++ <!ENTITY dhusername "Jane Doe">
++ <!ENTITY dhuusername "John Doe">
+ ]>
+
+ <refentry>
+@@ -24,7 +26,12 @@
+ </copyright>
+
+ </refentryinfo>
++ <refnamediv>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
++ </refnamediv>
+ <refsect1>
++ <title>refsect1</title>
+ <para>Help Options:</para>
+ <variablelist>
+ <varlistentry>
+@@ -41,3 +48,4 @@
+ Test test1 test2 test3 test4.
+ </para>
+ </refsect1>
++</refentry>
+--- a/t/fmt/sgml/basic.trans 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.trans 2021-11-17 09:08:31.803514576 +0100
+@@ -1,9 +1,11 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+ <!ENTITY dhfirstname "<firstname>FNAME</firstname>">
+ <!ENTITY dhsurname "<surname>SURNAME</surname>">
+ <!ENTITY dhemail "<email>EMAIL@1.COM</email>">
+- <!ENTITY dhuemail "<email>EMAIL@1.COM</email>">
++ <!ENTITY dhuemail "<email>EMAIL@2.COM</email>">
++ <!ENTITY dhusername "JANE DOE">
++ <!ENTITY dhuusername "JOHN DOE">
+ ]>
+ <refentry>
+ <refentryinfo>
+@@ -16,15 +18,15 @@
+ </author>
+ <copyright>
+ <year>2004, 2007</year>
+- <holder>&dhusername; AND &dhuusername;</holder>
++ <holder>&dhusername; and &dhuusername;</holder>
+ </copyright>
+ </refentryinfo>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>TEST</refname>
++ <refpurpose>TEST REFENTRY</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>REFSECT1</title>
+ <para>
+ HELP OPTIONS:
+ </para>
+@@ -33,7 +35,7 @@
+ <term><option>-?</option> <option>--help</option></term>
+ <listitem>
+ <para>
+- SHOW HELP OPTIONS
++ SHOW HELP OPTIONS.
+ </para>
+ </listitem>
+ </varlistentry>
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..b53e82e65d1f 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.65
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,10 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=5900bc5ecd6727b74ec4770dddd461fbf14fe23a4c29507a0c2f35a78ad45b4c
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (5 preceding siblings ...)
2021-11-17 16:20 ` [PR PATCH] [Updated] " newbluemoon
@ 2021-11-17 16:22 ` newbluemoon
2021-11-18 5:10 ` [PR PATCH] [Updated] " newbluemoon
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-17 16:22 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 227 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-971740295
Comment:
Backported two upstream patches to fix the sgml tests.
All should be fine now. :)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (6 preceding siblings ...)
2021-11-17 16:22 ` newbluemoon
@ 2021-11-18 5:10 ` newbluemoon
2021-11-18 18:59 ` newbluemoon
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-18 5:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.65
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 19156 bytes --]
From f85b62a820fa4a548163cfc0b82cef509a88f5af Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH] po4a: update to 0.65
---
.../po4a/patches/dont-pipe-into-onsgmls.patch | 25 +
srcpkgs/po4a/patches/fix-sgml-tests.patch | 566 ++++++++++++++++++
srcpkgs/po4a/template | 5 +-
3 files changed, 594 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
create mode 100644 srcpkgs/po4a/patches/fix-sgml-tests.patch
diff --git a/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
new file mode 100644
index 000000000000..684d451b2272
--- /dev/null
+++ b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
@@ -0,0 +1,25 @@
+source: https://github.com/mquinson/po4a/commit/61b1c61a6de9aca1f83b3a0d344ec6cba86b753c
+
+Directly pass the input file as a parameter to onsgmls
+instead of piping the input.
+
+--- a/lib/Locale/Po4a/Sgml.pm.orig
++++ b/lib/Locale/Po4a/Sgml.pm
+@@ -405,7 +405,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh
+ or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+- if ( system("onsgmls -p < $tmpfile") ) {
++ if ( system("onsgmls -p $tmpfile") ) {
+ unlink($tmpfile);
+ die wrap_mod(
+ "po4a::sgml",
+@@ -858,7 +858,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+
+- my $cmd = "onsgmls -l -E 0 -wno-valid < $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
++ my $cmd = "onsgmls -l -E 0 -wno-valid $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
+ print STDERR "CMD=$cmd\n" if ( $debug{'generic'} or $debug{'onsgmls'} );
+
+ open( IN, $cmd ) || die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot run onsgmls: %s" ), $! );
diff --git a/srcpkgs/po4a/patches/fix-sgml-tests.patch b/srcpkgs/po4a/patches/fix-sgml-tests.patch
new file mode 100644
index 000000000000..dfd5240ca61c
--- /dev/null
+++ b/srcpkgs/po4a/patches/fix-sgml-tests.patch
@@ -0,0 +1,566 @@
+source: https://github.com/mquinson/po4a/commit/6763f890fcb9d27155786e2352027789ac039354
+
+make the test sgml files valid according to the
+docbook sgml declaration
+
+--- a/t/fmt/sgml/attributes-order.norm 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.norm 2021-11-17 08:55:33.184006403 +0100
+@@ -1,33 +1,39 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>refsect1</title>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ </refsect1>
++ <refsect1 id="next">
++ <title>another refsect1</title>
++ <para>
++ tetrahedron
++ </para>
++ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/attributes-order.po 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.po 2021-11-17 08:57:04.742240950 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2020-05-22 00:09+0200\n"
++"POT-Creation-Date: 2021-11-17 08:55+0100\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"
+@@ -16,41 +16,31 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#~ msgid "<firstname>fname</firstname>"
+-#~ msgstr "<firstname>FNAME</firstname>"
+-
+-#~ msgid "<surname>Surname</surname>"
+-#~ msgstr "<surname>SURNAME</surname>"
+-
+-#~ msgid "<email>email@1.com</email>"
+-#~ msgstr "<email>EMAIL@1.COM</email>"
+-
+-#~ msgid "<email>email@2.com</email>"
+-#~ msgstr "<email>EMAIL@1.COM</email>"
+-
+-#~ msgid ""
+-#~ "<address>\n"
+-#~ " &dhemail; and &dhuemail;\n"
+-#~ " "
+-#~ msgstr ""
+-#~ "<address>\n"
+-#~ " &dhemail; AND &dhuemail;\n"
+-#~ " "
+-
+-#~ msgid "&dhfirstname; &dhsurname;"
+-#~ msgstr "&dhfirstname; &dhsurname;"
+-
+-#~ msgid "<year>2004, 2007</year>"
+-#~ msgstr "<year>2004, 2007</year>"
+-
+-#~ msgid "&dhusername; and &dhuusername;"
+-#~ msgstr "&dhusername; AND &dhuusername;"
+-
+-#~ msgid "Help Options:"
+-#~ msgstr "HELP OPTIONS:"
+-
+-#~ msgid "Show help options."
+-#~ msgstr "SHOW HELP OPTIONS"
+-
+-#~ msgid "Test test1 test2 test3 test4."
+-#~ msgstr "TEST TEST1 TEST2 TEST3 TEST4."
++#. type: <refname></refname>
++#: attributes-order.sgml:5
++#, no-wrap
++msgid "test"
++msgstr "TEST"
++
++#. type: <refpurpose></refpurpose>
++#: attributes-order.sgml:6
++#, no-wrap
++msgid "test refentry"
++msgstr "TEST REFENTRY"
++
++#. type: <title></title>
++#: attributes-order.sgml:9
++#, no-wrap
++msgid "refsect1"
++msgstr "REFSECT1"
++
++#. type: <title></title>
++#: attributes-order.sgml:18
++#, no-wrap
++msgid "another refsect1"
++msgstr "ANOTHER REFSECT1"
++
++#. type: <para></para>
++#: attributes-order.sgml:19
++msgid "tetrahedron"
++msgstr "TETRAHEDRON"
+--- a/t/fmt/sgml/attributes-order.pot 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.pot 2021-11-17 08:55:33.185006395 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2020-05-22 00:09+0200\n"
++"POT-Creation-Date: 2021-11-17 08:55+0100\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"
+@@ -16,3 +16,31 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
++#. type: <refname></refname>
++#: attributes-order.sgml:5
++#, no-wrap
++msgid "test"
++msgstr ""
++
++#. type: <refpurpose></refpurpose>
++#: attributes-order.sgml:6
++#, no-wrap
++msgid "test refentry"
++msgstr ""
++
++#. type: <title></title>
++#: attributes-order.sgml:9
++#, no-wrap
++msgid "refsect1"
++msgstr ""
++
++#. type: <title></title>
++#: attributes-order.sgml:18
++#, no-wrap
++msgid "another refsect1"
++msgstr ""
++
++#. type: <para></para>
++#: attributes-order.sgml:19
++msgid "tetrahedron"
++msgstr ""
+--- a/t/fmt/sgml/attributes-order.sgml 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.sgml 2021-11-17 09:04:24.200573288 +0100
+@@ -1,12 +1,21 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+
+ <refentry>
++ <refnamediv>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
++ </refnamediv>
+ <refsect1>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
++ <title>refsect1</title>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ </refsect1>
++ <refsect1 id="next">
++ <title>another refsect1</title>
++ <para>tetrahedron</para>
+ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/attributes-order.trans 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.trans 2021-11-17 08:58:01.765764454 +0100
+@@ -1,33 +1,39 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>TEST</refname>
++ <refpurpose>TEST REFENTRY</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>REFSECT1</title>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ </refsect1>
++ <refsect1 id="next">
++ <title>ANOTHER REFSECT1</title>
++ <para>
++ TETRAHEDRON
++ </para>
++ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/basic.norm 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.norm 2021-11-16 21:53:56.732261414 +0100
+@@ -1,9 +1,11 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+ <!ENTITY dhfirstname "<firstname>fname</firstname>">
+ <!ENTITY dhsurname "<surname>Surname</surname>">
+ <!ENTITY dhemail "<email>email@1.com</email>">
+ <!ENTITY dhuemail "<email>email@2.com</email>">
++ <!ENTITY dhusername "Jane Doe">
++ <!ENTITY dhuusername "John Doe">
+ ]>
+ <refentry>
+ <refentryinfo>
+@@ -20,11 +22,11 @@
+ </copyright>
+ </refentryinfo>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>refsect1</title>
+ <para>
+ Help Options:
+ </para>
+--- a/t/fmt/sgml/basic.po 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.po 2021-11-17 09:28:47.239474483 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2007-08-05 17:42+0200\n"
++"POT-Creation-Date: 2021-11-16 22:40+0100\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"
+@@ -34,10 +34,20 @@
+ #. type: definition of entity &dhuemail;
+ #, no-wrap
+ msgid "<email>email@2.com</email>"
+-msgstr "<email>EMAIL@1.COM</email>"
++msgstr "<email>EMAIL@2.COM</email>"
++
++#. type: definition of entity &dhusername;
++#, no-wrap
++msgid "Jane Doe"
++msgstr "JANE DOE"
++
++#. type: definition of entity &dhuusername;
++#, no-wrap
++msgid "John Doe"
++msgstr "JOHN DOE"
+
+ #. type: <address></address>
+-#: basic.sgml:11
++#: basic.sgml:13
+ #, no-wrap
+ msgid ""
+ "<address>\n"
+@@ -49,38 +59,56 @@
+ " "
+
+ #. type: <author></author>
+-#: basic.sgml:19
++#: basic.sgml:21
+ msgid "&dhfirstname; &dhsurname;"
+ msgstr "&dhfirstname; &dhsurname;"
+
+ #. type: <copyright><holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ msgid "<year>2004, 2007</year>"
+ msgstr "<year>2004, 2007</year>"
+
+ #. type: <holder></holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ #, no-wrap
+ msgid "&dhusername; and &dhuusername;"
+-msgstr "&dhusername; AND &dhuusername;"
++msgstr "&dhusername; and &dhuusername;"
++
++#. type: <refname></refname>
++#: basic.sgml:30
++#, no-wrap
++msgid "test"
++msgstr "TEST"
++
++#. type: <refpurpose></refpurpose>
++#: basic.sgml:31
++#, no-wrap
++msgid "test refentry"
++msgstr "TEST REFENTRY"
++
++#. type: <title></title>
++#: basic.sgml:34
++#, no-wrap
++msgid "refsect1"
++msgstr "REFSECT1"
+
+ #. type: <para></para>
+-#: basic.sgml:28
++#: basic.sgml:35
+ msgid "Help Options:"
+ msgstr "HELP OPTIONS:"
+
+ #. type: <term></term>
+-#: basic.sgml:31
++#: basic.sgml:38
+ #, no-wrap
+ msgid "<option>-?</option> <option>--help</option>"
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:33
++#: basic.sgml:40
+ msgid "Show help options."
+-msgstr "SHOW HELP OPTIONS"
++msgstr "SHOW HELP OPTIONS."
+
+ #. type: <para></para>
+-#: basic.sgml:39 basic.sgml:41
++#: basic.sgml:46 basic.sgml:48
+ msgid "Test test1 test2 test3 test4."
+ msgstr "TEST TEST1 TEST2 TEST3 TEST4."
+--- a/t/fmt/sgml/basic.pot 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.pot 2021-11-16 22:40:08.561394570 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2007-08-05 17:42+0200\n"
++"POT-Creation-Date: 2021-11-16 22:40+0100\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"
+@@ -36,8 +36,18 @@
+ msgid "<email>email@2.com</email>"
+ msgstr ""
+
++#. type: definition of entity &dhusername;
++#, no-wrap
++msgid "Jane Doe"
++msgstr ""
++
++#. type: definition of entity &dhuusername;
++#, no-wrap
++msgid "John Doe"
++msgstr ""
++
+ #. type: <address></address>
+-#: basic.sgml:11
++#: basic.sgml:13
+ #, no-wrap
+ msgid ""
+ "<address>\n"
+@@ -46,38 +56,56 @@
+ msgstr ""
+
+ #. type: <author></author>
+-#: basic.sgml:19
++#: basic.sgml:21
+ msgid "&dhfirstname; &dhsurname;"
+ msgstr ""
+
+ #. type: <copyright><holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ msgid "<year>2004, 2007</year>"
+ msgstr ""
+
+ #. type: <holder></holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ #, no-wrap
+ msgid "&dhusername; and &dhuusername;"
+ msgstr ""
+
++#. type: <refname></refname>
++#: basic.sgml:30
++#, no-wrap
++msgid "test"
++msgstr ""
++
++#. type: <refpurpose></refpurpose>
++#: basic.sgml:31
++#, no-wrap
++msgid "test refentry"
++msgstr ""
++
++#. type: <title></title>
++#: basic.sgml:34
++#, no-wrap
++msgid "refsect1"
++msgstr ""
++
+ #. type: <para></para>
+-#: basic.sgml:28
++#: basic.sgml:35
+ msgid "Help Options:"
+ msgstr ""
+
+ #. type: <term></term>
+-#: basic.sgml:31
++#: basic.sgml:38
+ #, no-wrap
+ msgid "<option>-?</option> <option>--help</option>"
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:33
++#: basic.sgml:40
+ msgid "Show help options."
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:39 basic.sgml:41
++#: basic.sgml:46 basic.sgml:48
+ msgid "Test test1 test2 test3 test4."
+ msgstr ""
+--- a/t/fmt/sgml/basic.sgml 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.sgml 2021-11-16 15:56:10.113854553 +0100
+@@ -1,8 +1,10 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+ <!ENTITY dhfirstname "<firstname>fname</firstname>">
+ <!ENTITY dhsurname "<surname>Surname</surname>">
+ <!ENTITY dhemail "<email>email@1.com</email>">
+ <!ENTITY dhuemail "<email>email@2.com</email>">
++ <!ENTITY dhusername "Jane Doe">
++ <!ENTITY dhuusername "John Doe">
+ ]>
+
+ <refentry>
+@@ -24,7 +26,12 @@
+ </copyright>
+
+ </refentryinfo>
++ <refnamediv>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
++ </refnamediv>
+ <refsect1>
++ <title>refsect1</title>
+ <para>Help Options:</para>
+ <variablelist>
+ <varlistentry>
+@@ -41,3 +48,4 @@
+ Test test1 test2 test3 test4.
+ </para>
+ </refsect1>
++</refentry>
+--- a/t/fmt/sgml/basic.trans 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.trans 2021-11-17 09:08:31.803514576 +0100
+@@ -1,9 +1,11 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+ <!ENTITY dhfirstname "<firstname>FNAME</firstname>">
+ <!ENTITY dhsurname "<surname>SURNAME</surname>">
+ <!ENTITY dhemail "<email>EMAIL@1.COM</email>">
+- <!ENTITY dhuemail "<email>EMAIL@1.COM</email>">
++ <!ENTITY dhuemail "<email>EMAIL@2.COM</email>">
++ <!ENTITY dhusername "JANE DOE">
++ <!ENTITY dhuusername "JOHN DOE">
+ ]>
+ <refentry>
+ <refentryinfo>
+@@ -16,15 +18,15 @@
+ </author>
+ <copyright>
+ <year>2004, 2007</year>
+- <holder>&dhusername; AND &dhuusername;</holder>
++ <holder>&dhusername; and &dhuusername;</holder>
+ </copyright>
+ </refentryinfo>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>TEST</refname>
++ <refpurpose>TEST REFENTRY</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>REFSECT1</title>
+ <para>
+ HELP OPTIONS:
+ </para>
+@@ -33,7 +35,7 @@
+ <term><option>-?</option> <option>--help</option></term>
+ <listitem>
+ <para>
+- SHOW HELP OPTIONS
++ SHOW HELP OPTIONS.
+ </para>
+ </listitem>
+ </varlistentry>
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..b53e82e65d1f 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.65
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,10 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=5900bc5ecd6727b74ec4770dddd461fbf14fe23a4c29507a0c2f35a78ad45b4c
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (7 preceding siblings ...)
2021-11-18 5:10 ` [PR PATCH] [Updated] " newbluemoon
@ 2021-11-18 18:59 ` newbluemoon
2021-11-18 19:04 ` newbluemoon
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-18 18:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.65
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 19901 bytes --]
From 67b1dc46fa3e0ca190fcafc4583b789bd5cba8fa Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH 1/2] po4a: update to 0.65
---
.../po4a/patches/dont-pipe-into-onsgmls.patch | 25 +
srcpkgs/po4a/patches/fix-sgml-tests.patch | 566 ++++++++++++++++++
srcpkgs/po4a/template | 5 +-
3 files changed, 594 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
create mode 100644 srcpkgs/po4a/patches/fix-sgml-tests.patch
diff --git a/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
new file mode 100644
index 000000000000..684d451b2272
--- /dev/null
+++ b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
@@ -0,0 +1,25 @@
+source: https://github.com/mquinson/po4a/commit/61b1c61a6de9aca1f83b3a0d344ec6cba86b753c
+
+Directly pass the input file as a parameter to onsgmls
+instead of piping the input.
+
+--- a/lib/Locale/Po4a/Sgml.pm.orig
++++ b/lib/Locale/Po4a/Sgml.pm
+@@ -405,7 +405,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh
+ or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+- if ( system("onsgmls -p < $tmpfile") ) {
++ if ( system("onsgmls -p $tmpfile") ) {
+ unlink($tmpfile);
+ die wrap_mod(
+ "po4a::sgml",
+@@ -858,7 +858,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+
+- my $cmd = "onsgmls -l -E 0 -wno-valid < $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
++ my $cmd = "onsgmls -l -E 0 -wno-valid $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
+ print STDERR "CMD=$cmd\n" if ( $debug{'generic'} or $debug{'onsgmls'} );
+
+ open( IN, $cmd ) || die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot run onsgmls: %s" ), $! );
diff --git a/srcpkgs/po4a/patches/fix-sgml-tests.patch b/srcpkgs/po4a/patches/fix-sgml-tests.patch
new file mode 100644
index 000000000000..dfd5240ca61c
--- /dev/null
+++ b/srcpkgs/po4a/patches/fix-sgml-tests.patch
@@ -0,0 +1,566 @@
+source: https://github.com/mquinson/po4a/commit/6763f890fcb9d27155786e2352027789ac039354
+
+make the test sgml files valid according to the
+docbook sgml declaration
+
+--- a/t/fmt/sgml/attributes-order.norm 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.norm 2021-11-17 08:55:33.184006403 +0100
+@@ -1,33 +1,39 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>refsect1</title>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ </refsect1>
++ <refsect1 id="next">
++ <title>another refsect1</title>
++ <para>
++ tetrahedron
++ </para>
++ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/attributes-order.po 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.po 2021-11-17 08:57:04.742240950 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2020-05-22 00:09+0200\n"
++"POT-Creation-Date: 2021-11-17 08:55+0100\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"
+@@ -16,41 +16,31 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#~ msgid "<firstname>fname</firstname>"
+-#~ msgstr "<firstname>FNAME</firstname>"
+-
+-#~ msgid "<surname>Surname</surname>"
+-#~ msgstr "<surname>SURNAME</surname>"
+-
+-#~ msgid "<email>email@1.com</email>"
+-#~ msgstr "<email>EMAIL@1.COM</email>"
+-
+-#~ msgid "<email>email@2.com</email>"
+-#~ msgstr "<email>EMAIL@1.COM</email>"
+-
+-#~ msgid ""
+-#~ "<address>\n"
+-#~ " &dhemail; and &dhuemail;\n"
+-#~ " "
+-#~ msgstr ""
+-#~ "<address>\n"
+-#~ " &dhemail; AND &dhuemail;\n"
+-#~ " "
+-
+-#~ msgid "&dhfirstname; &dhsurname;"
+-#~ msgstr "&dhfirstname; &dhsurname;"
+-
+-#~ msgid "<year>2004, 2007</year>"
+-#~ msgstr "<year>2004, 2007</year>"
+-
+-#~ msgid "&dhusername; and &dhuusername;"
+-#~ msgstr "&dhusername; AND &dhuusername;"
+-
+-#~ msgid "Help Options:"
+-#~ msgstr "HELP OPTIONS:"
+-
+-#~ msgid "Show help options."
+-#~ msgstr "SHOW HELP OPTIONS"
+-
+-#~ msgid "Test test1 test2 test3 test4."
+-#~ msgstr "TEST TEST1 TEST2 TEST3 TEST4."
++#. type: <refname></refname>
++#: attributes-order.sgml:5
++#, no-wrap
++msgid "test"
++msgstr "TEST"
++
++#. type: <refpurpose></refpurpose>
++#: attributes-order.sgml:6
++#, no-wrap
++msgid "test refentry"
++msgstr "TEST REFENTRY"
++
++#. type: <title></title>
++#: attributes-order.sgml:9
++#, no-wrap
++msgid "refsect1"
++msgstr "REFSECT1"
++
++#. type: <title></title>
++#: attributes-order.sgml:18
++#, no-wrap
++msgid "another refsect1"
++msgstr "ANOTHER REFSECT1"
++
++#. type: <para></para>
++#: attributes-order.sgml:19
++msgid "tetrahedron"
++msgstr "TETRAHEDRON"
+--- a/t/fmt/sgml/attributes-order.pot 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.pot 2021-11-17 08:55:33.185006395 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2020-05-22 00:09+0200\n"
++"POT-Creation-Date: 2021-11-17 08:55+0100\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"
+@@ -16,3 +16,31 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
++#. type: <refname></refname>
++#: attributes-order.sgml:5
++#, no-wrap
++msgid "test"
++msgstr ""
++
++#. type: <refpurpose></refpurpose>
++#: attributes-order.sgml:6
++#, no-wrap
++msgid "test refentry"
++msgstr ""
++
++#. type: <title></title>
++#: attributes-order.sgml:9
++#, no-wrap
++msgid "refsect1"
++msgstr ""
++
++#. type: <title></title>
++#: attributes-order.sgml:18
++#, no-wrap
++msgid "another refsect1"
++msgstr ""
++
++#. type: <para></para>
++#: attributes-order.sgml:19
++msgid "tetrahedron"
++msgstr ""
+--- a/t/fmt/sgml/attributes-order.sgml 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.sgml 2021-11-17 09:04:24.200573288 +0100
+@@ -1,12 +1,21 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+
+ <refentry>
++ <refnamediv>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
++ </refnamediv>
+ <refsect1>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
++ <title>refsect1</title>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ </refsect1>
++ <refsect1 id="next">
++ <title>another refsect1</title>
++ <para>tetrahedron</para>
+ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/attributes-order.trans 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.trans 2021-11-17 08:58:01.765764454 +0100
+@@ -1,33 +1,39 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>TEST</refname>
++ <refpurpose>TEST REFENTRY</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>REFSECT1</title>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ </refsect1>
++ <refsect1 id="next">
++ <title>ANOTHER REFSECT1</title>
++ <para>
++ TETRAHEDRON
++ </para>
++ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/basic.norm 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.norm 2021-11-16 21:53:56.732261414 +0100
+@@ -1,9 +1,11 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+ <!ENTITY dhfirstname "<firstname>fname</firstname>">
+ <!ENTITY dhsurname "<surname>Surname</surname>">
+ <!ENTITY dhemail "<email>email@1.com</email>">
+ <!ENTITY dhuemail "<email>email@2.com</email>">
++ <!ENTITY dhusername "Jane Doe">
++ <!ENTITY dhuusername "John Doe">
+ ]>
+ <refentry>
+ <refentryinfo>
+@@ -20,11 +22,11 @@
+ </copyright>
+ </refentryinfo>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>refsect1</title>
+ <para>
+ Help Options:
+ </para>
+--- a/t/fmt/sgml/basic.po 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.po 2021-11-17 09:28:47.239474483 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2007-08-05 17:42+0200\n"
++"POT-Creation-Date: 2021-11-16 22:40+0100\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"
+@@ -34,10 +34,20 @@
+ #. type: definition of entity &dhuemail;
+ #, no-wrap
+ msgid "<email>email@2.com</email>"
+-msgstr "<email>EMAIL@1.COM</email>"
++msgstr "<email>EMAIL@2.COM</email>"
++
++#. type: definition of entity &dhusername;
++#, no-wrap
++msgid "Jane Doe"
++msgstr "JANE DOE"
++
++#. type: definition of entity &dhuusername;
++#, no-wrap
++msgid "John Doe"
++msgstr "JOHN DOE"
+
+ #. type: <address></address>
+-#: basic.sgml:11
++#: basic.sgml:13
+ #, no-wrap
+ msgid ""
+ "<address>\n"
+@@ -49,38 +59,56 @@
+ " "
+
+ #. type: <author></author>
+-#: basic.sgml:19
++#: basic.sgml:21
+ msgid "&dhfirstname; &dhsurname;"
+ msgstr "&dhfirstname; &dhsurname;"
+
+ #. type: <copyright><holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ msgid "<year>2004, 2007</year>"
+ msgstr "<year>2004, 2007</year>"
+
+ #. type: <holder></holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ #, no-wrap
+ msgid "&dhusername; and &dhuusername;"
+-msgstr "&dhusername; AND &dhuusername;"
++msgstr "&dhusername; and &dhuusername;"
++
++#. type: <refname></refname>
++#: basic.sgml:30
++#, no-wrap
++msgid "test"
++msgstr "TEST"
++
++#. type: <refpurpose></refpurpose>
++#: basic.sgml:31
++#, no-wrap
++msgid "test refentry"
++msgstr "TEST REFENTRY"
++
++#. type: <title></title>
++#: basic.sgml:34
++#, no-wrap
++msgid "refsect1"
++msgstr "REFSECT1"
+
+ #. type: <para></para>
+-#: basic.sgml:28
++#: basic.sgml:35
+ msgid "Help Options:"
+ msgstr "HELP OPTIONS:"
+
+ #. type: <term></term>
+-#: basic.sgml:31
++#: basic.sgml:38
+ #, no-wrap
+ msgid "<option>-?</option> <option>--help</option>"
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:33
++#: basic.sgml:40
+ msgid "Show help options."
+-msgstr "SHOW HELP OPTIONS"
++msgstr "SHOW HELP OPTIONS."
+
+ #. type: <para></para>
+-#: basic.sgml:39 basic.sgml:41
++#: basic.sgml:46 basic.sgml:48
+ msgid "Test test1 test2 test3 test4."
+ msgstr "TEST TEST1 TEST2 TEST3 TEST4."
+--- a/t/fmt/sgml/basic.pot 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.pot 2021-11-16 22:40:08.561394570 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2007-08-05 17:42+0200\n"
++"POT-Creation-Date: 2021-11-16 22:40+0100\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"
+@@ -36,8 +36,18 @@
+ msgid "<email>email@2.com</email>"
+ msgstr ""
+
++#. type: definition of entity &dhusername;
++#, no-wrap
++msgid "Jane Doe"
++msgstr ""
++
++#. type: definition of entity &dhuusername;
++#, no-wrap
++msgid "John Doe"
++msgstr ""
++
+ #. type: <address></address>
+-#: basic.sgml:11
++#: basic.sgml:13
+ #, no-wrap
+ msgid ""
+ "<address>\n"
+@@ -46,38 +56,56 @@
+ msgstr ""
+
+ #. type: <author></author>
+-#: basic.sgml:19
++#: basic.sgml:21
+ msgid "&dhfirstname; &dhsurname;"
+ msgstr ""
+
+ #. type: <copyright><holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ msgid "<year>2004, 2007</year>"
+ msgstr ""
+
+ #. type: <holder></holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ #, no-wrap
+ msgid "&dhusername; and &dhuusername;"
+ msgstr ""
+
++#. type: <refname></refname>
++#: basic.sgml:30
++#, no-wrap
++msgid "test"
++msgstr ""
++
++#. type: <refpurpose></refpurpose>
++#: basic.sgml:31
++#, no-wrap
++msgid "test refentry"
++msgstr ""
++
++#. type: <title></title>
++#: basic.sgml:34
++#, no-wrap
++msgid "refsect1"
++msgstr ""
++
+ #. type: <para></para>
+-#: basic.sgml:28
++#: basic.sgml:35
+ msgid "Help Options:"
+ msgstr ""
+
+ #. type: <term></term>
+-#: basic.sgml:31
++#: basic.sgml:38
+ #, no-wrap
+ msgid "<option>-?</option> <option>--help</option>"
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:33
++#: basic.sgml:40
+ msgid "Show help options."
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:39 basic.sgml:41
++#: basic.sgml:46 basic.sgml:48
+ msgid "Test test1 test2 test3 test4."
+ msgstr ""
+--- a/t/fmt/sgml/basic.sgml 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.sgml 2021-11-16 15:56:10.113854553 +0100
+@@ -1,8 +1,10 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+ <!ENTITY dhfirstname "<firstname>fname</firstname>">
+ <!ENTITY dhsurname "<surname>Surname</surname>">
+ <!ENTITY dhemail "<email>email@1.com</email>">
+ <!ENTITY dhuemail "<email>email@2.com</email>">
++ <!ENTITY dhusername "Jane Doe">
++ <!ENTITY dhuusername "John Doe">
+ ]>
+
+ <refentry>
+@@ -24,7 +26,12 @@
+ </copyright>
+
+ </refentryinfo>
++ <refnamediv>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
++ </refnamediv>
+ <refsect1>
++ <title>refsect1</title>
+ <para>Help Options:</para>
+ <variablelist>
+ <varlistentry>
+@@ -41,3 +48,4 @@
+ Test test1 test2 test3 test4.
+ </para>
+ </refsect1>
++</refentry>
+--- a/t/fmt/sgml/basic.trans 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.trans 2021-11-17 09:08:31.803514576 +0100
+@@ -1,9 +1,11 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+ <!ENTITY dhfirstname "<firstname>FNAME</firstname>">
+ <!ENTITY dhsurname "<surname>SURNAME</surname>">
+ <!ENTITY dhemail "<email>EMAIL@1.COM</email>">
+- <!ENTITY dhuemail "<email>EMAIL@1.COM</email>">
++ <!ENTITY dhuemail "<email>EMAIL@2.COM</email>">
++ <!ENTITY dhusername "JANE DOE">
++ <!ENTITY dhuusername "JOHN DOE">
+ ]>
+ <refentry>
+ <refentryinfo>
+@@ -16,15 +18,15 @@
+ </author>
+ <copyright>
+ <year>2004, 2007</year>
+- <holder>&dhusername; AND &dhuusername;</holder>
++ <holder>&dhusername; and &dhuusername;</holder>
+ </copyright>
+ </refentryinfo>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>TEST</refname>
++ <refpurpose>TEST REFENTRY</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>REFSECT1</title>
+ <para>
+ HELP OPTIONS:
+ </para>
+@@ -33,7 +35,7 @@
+ <term><option>-?</option> <option>--help</option></term>
+ <listitem>
+ <para>
+- SHOW HELP OPTIONS
++ SHOW HELP OPTIONS.
+ </para>
+ </listitem>
+ </varlistentry>
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..b53e82e65d1f 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.65
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,10 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=5900bc5ecd6727b74ec4770dddd461fbf14fe23a4c29507a0c2f35a78ad45b4c
From 814ef5051d17dfe861e5166df80b8c0aa125116a Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 18 Nov 2021 19:57:22 +0100
Subject: [PATCH 2/2] common: verbose output in perl-ModuleBuild.sh
when running tests
---
common/build-style/perl-ModuleBuild.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/build-style/perl-ModuleBuild.sh b/common/build-style/perl-ModuleBuild.sh
index a84373b5b0bf..48c511e2883b 100644
--- a/common/build-style/perl-ModuleBuild.sh
+++ b/common/build-style/perl-ModuleBuild.sh
@@ -41,7 +41,7 @@ do_check() {
if [ ! -x ./Build ]; then
msg_error "$pkgver: cannot find ./Build script!\n"
fi
- ./Build test
+ ./Build test verbose=1
}
do_install() {
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (8 preceding siblings ...)
2021-11-18 18:59 ` newbluemoon
@ 2021-11-18 19:04 ` newbluemoon
2021-11-18 21:02 ` newbluemoon
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-18 19:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 403 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-973169165
Comment:
The sgml-test is fixed and passes, but now some other failures show up...
Tests in local builds pass on x86_64 and i686, fail, however, on x86_64-musl.
Temporarily enabling verbose test output for the `perl-ModuleBuild`-build-style to see where CI fails.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (9 preceding siblings ...)
2021-11-18 19:04 ` newbluemoon
@ 2021-11-18 21:02 ` newbluemoon
2021-11-21 19:35 ` ericonr
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-18 21:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1781 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-973267880
Comment:
The errors on x86_64-musl like e.g.
```
# FAILED command: PODIFF -I#: cfg/multiple-nopotpo/_multiple.de.po tmp/cfg/multiple-nopotpo-src/multiple.de.po 2>&1 > tmp/cfg/multiple-nopotpo-src/_cmd_output
# Command output:
# | --- cfg/multiple-nopotpo/_multiple.de.po 2021-11-14 12:08:53.000000000 +0000
# | +++ tmp/cfg/multiple-nopotpo-src/multiple.de.po 2021-11-18 19:04:08.059796074 +0000
# | @@ -1,7 +1,8 @@
# | # German translations for po package
# | -# Copyright (C) 2020 Free Software Foundation, Inc.
# | +# German translation for po
# | +# Copyright (C) 2021 Free Software Foundation, Inc.
# | # This file is distributed under the same license as the po package.
# | -# Automatically generated, 2020.
# | +# Automatically generated, 2021.
# | #
# | msgid ""
# | msgstr ""
# (end of output)
```
are caused because musl’s gettext seems to add a translation for the package description while gettext on glibc does not.
So that there is an additional line `# | +# German translation for po` in the example above which doesn’t exist in the original .po file with which the newly generated one is compared. It comes from `/usr/share/locale/*/LC_MESSAGES/gettext-tools.mo`. The other differences are excluded via `diff -I` and don’t matter.
No idea how to fix this right now, if it is worth fixing? @ericonr maybe you know something about the differences of gettext on musl and glibc? :)
All other CI errors are like
```
Broken test cfg/split-multimaster: cfg/split-multimaster/_second.man.fr should be the expected content of produced file second.man.fr
```
and I cannot reproduce them locally.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (10 preceding siblings ...)
2021-11-18 21:02 ` newbluemoon
@ 2021-11-21 19:35 ` ericonr
2021-11-21 21:49 ` [PR PATCH] [Updated] " newbluemoon
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2021-11-21 19:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 562 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-974880623
Comment:
> are caused because musl’s gettext seems to add a translation for the package description while gettext on glibc does not.
Which is amazing, given that they are both the same package ;-;
> and I cannot reproduce them locally.
Could be something fucky to do with running as root ;-;
If the tests complete successfully locally on glibc, I'd be okay with `make_check=ci-skip # can't reproduce failure locally`
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (11 preceding siblings ...)
2021-11-21 19:35 ` ericonr
@ 2021-11-21 21:49 ` newbluemoon
2021-11-21 22:06 ` newbluemoon
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-21 21:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.65
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 19901 bytes --]
From 67b1dc46fa3e0ca190fcafc4583b789bd5cba8fa Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH 1/2] po4a: update to 0.65
---
.../po4a/patches/dont-pipe-into-onsgmls.patch | 25 +
srcpkgs/po4a/patches/fix-sgml-tests.patch | 566 ++++++++++++++++++
srcpkgs/po4a/template | 5 +-
3 files changed, 594 insertions(+), 2 deletions(-)
create mode 100644 srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
create mode 100644 srcpkgs/po4a/patches/fix-sgml-tests.patch
diff --git a/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
new file mode 100644
index 000000000000..684d451b2272
--- /dev/null
+++ b/srcpkgs/po4a/patches/dont-pipe-into-onsgmls.patch
@@ -0,0 +1,25 @@
+source: https://github.com/mquinson/po4a/commit/61b1c61a6de9aca1f83b3a0d344ec6cba86b753c
+
+Directly pass the input file as a parameter to onsgmls
+instead of piping the input.
+
+--- a/lib/Locale/Po4a/Sgml.pm.orig
++++ b/lib/Locale/Po4a/Sgml.pm
+@@ -405,7 +405,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh
+ or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+- if ( system("onsgmls -p < $tmpfile") ) {
++ if ( system("onsgmls -p $tmpfile") ) {
+ unlink($tmpfile);
+ die wrap_mod(
+ "po4a::sgml",
+@@ -858,7 +858,7 @@
+ print $tmpfh $origfile;
+ close $tmpfh or die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot close tempfile: %s" ), $! );
+
+- my $cmd = "onsgmls -l -E 0 -wno-valid < $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
++ my $cmd = "onsgmls -l -E 0 -wno-valid $tmpfile" . ( $debug{'onsgmls'} ? "" : " 2>/dev/null" ) . " |";
+ print STDERR "CMD=$cmd\n" if ( $debug{'generic'} or $debug{'onsgmls'} );
+
+ open( IN, $cmd ) || die wrap_mod( "po4a::sgml", dgettext( "po4a", "Cannot run onsgmls: %s" ), $! );
diff --git a/srcpkgs/po4a/patches/fix-sgml-tests.patch b/srcpkgs/po4a/patches/fix-sgml-tests.patch
new file mode 100644
index 000000000000..dfd5240ca61c
--- /dev/null
+++ b/srcpkgs/po4a/patches/fix-sgml-tests.patch
@@ -0,0 +1,566 @@
+source: https://github.com/mquinson/po4a/commit/6763f890fcb9d27155786e2352027789ac039354
+
+make the test sgml files valid according to the
+docbook sgml declaration
+
+--- a/t/fmt/sgml/attributes-order.norm 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.norm 2021-11-17 08:55:33.184006403 +0100
+@@ -1,33 +1,39 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>refsect1</title>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ </refsect1>
++ <refsect1 id="next">
++ <title>another refsect1</title>
++ <para>
++ tetrahedron
++ </para>
++ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/attributes-order.po 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.po 2021-11-17 08:57:04.742240950 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2020-05-22 00:09+0200\n"
++"POT-Creation-Date: 2021-11-17 08:55+0100\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"
+@@ -16,41 +16,31 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
+-#~ msgid "<firstname>fname</firstname>"
+-#~ msgstr "<firstname>FNAME</firstname>"
+-
+-#~ msgid "<surname>Surname</surname>"
+-#~ msgstr "<surname>SURNAME</surname>"
+-
+-#~ msgid "<email>email@1.com</email>"
+-#~ msgstr "<email>EMAIL@1.COM</email>"
+-
+-#~ msgid "<email>email@2.com</email>"
+-#~ msgstr "<email>EMAIL@1.COM</email>"
+-
+-#~ msgid ""
+-#~ "<address>\n"
+-#~ " &dhemail; and &dhuemail;\n"
+-#~ " "
+-#~ msgstr ""
+-#~ "<address>\n"
+-#~ " &dhemail; AND &dhuemail;\n"
+-#~ " "
+-
+-#~ msgid "&dhfirstname; &dhsurname;"
+-#~ msgstr "&dhfirstname; &dhsurname;"
+-
+-#~ msgid "<year>2004, 2007</year>"
+-#~ msgstr "<year>2004, 2007</year>"
+-
+-#~ msgid "&dhusername; and &dhuusername;"
+-#~ msgstr "&dhusername; AND &dhuusername;"
+-
+-#~ msgid "Help Options:"
+-#~ msgstr "HELP OPTIONS:"
+-
+-#~ msgid "Show help options."
+-#~ msgstr "SHOW HELP OPTIONS"
+-
+-#~ msgid "Test test1 test2 test3 test4."
+-#~ msgstr "TEST TEST1 TEST2 TEST3 TEST4."
++#. type: <refname></refname>
++#: attributes-order.sgml:5
++#, no-wrap
++msgid "test"
++msgstr "TEST"
++
++#. type: <refpurpose></refpurpose>
++#: attributes-order.sgml:6
++#, no-wrap
++msgid "test refentry"
++msgstr "TEST REFENTRY"
++
++#. type: <title></title>
++#: attributes-order.sgml:9
++#, no-wrap
++msgid "refsect1"
++msgstr "REFSECT1"
++
++#. type: <title></title>
++#: attributes-order.sgml:18
++#, no-wrap
++msgid "another refsect1"
++msgstr "ANOTHER REFSECT1"
++
++#. type: <para></para>
++#: attributes-order.sgml:19
++msgid "tetrahedron"
++msgstr "TETRAHEDRON"
+--- a/t/fmt/sgml/attributes-order.pot 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.pot 2021-11-17 08:55:33.185006395 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2020-05-22 00:09+0200\n"
++"POT-Creation-Date: 2021-11-17 08:55+0100\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"
+@@ -16,3 +16,31 @@
+ "Content-Type: text/plain; charset=UTF-8\n"
+ "Content-Transfer-Encoding: 8bit\n"
+
++#. type: <refname></refname>
++#: attributes-order.sgml:5
++#, no-wrap
++msgid "test"
++msgstr ""
++
++#. type: <refpurpose></refpurpose>
++#: attributes-order.sgml:6
++#, no-wrap
++msgid "test refentry"
++msgstr ""
++
++#. type: <title></title>
++#: attributes-order.sgml:9
++#, no-wrap
++msgid "refsect1"
++msgstr ""
++
++#. type: <title></title>
++#: attributes-order.sgml:18
++#, no-wrap
++msgid "another refsect1"
++msgstr ""
++
++#. type: <para></para>
++#: attributes-order.sgml:19
++msgid "tetrahedron"
++msgstr ""
+--- a/t/fmt/sgml/attributes-order.sgml 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.sgml 2021-11-17 09:04:24.200573288 +0100
+@@ -1,12 +1,21 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN">
+
+ <refentry>
++ <refnamediv>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
++ </refnamediv>
+ <refsect1>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
+- <para><link version="1" audiance="IRC" vendor="billy"></para>
++ <title>refsect1</title>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ <para><link linkend="next" OS="linux" vendor="billy" Lang="en-US"></link></para>
++ </refsect1>
++ <refsect1 id="next">
++ <title>another refsect1</title>
++ <para>tetrahedron</para>
+ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/attributes-order.trans 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/attributes-order.trans 2021-11-17 08:58:01.765764454 +0100
+@@ -1,33 +1,39 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN"><refentry>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>TEST</refname>
++ <refpurpose>TEST REFENTRY</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>REFSECT1</title>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ <para>
+- <link audiance="IRC" vendor="billy" version="1"></link>
++ <link lang="en-US" linkend="next" os="linux" vendor="billy"></link>
+
+ </para>
+ </refsect1>
++ <refsect1 id="next">
++ <title>ANOTHER REFSECT1</title>
++ <para>
++ TETRAHEDRON
++ </para>
++ </refsect1>
+ </refentry>
+--- a/t/fmt/sgml/basic.norm 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.norm 2021-11-16 21:53:56.732261414 +0100
+@@ -1,9 +1,11 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+ <!ENTITY dhfirstname "<firstname>fname</firstname>">
+ <!ENTITY dhsurname "<surname>Surname</surname>">
+ <!ENTITY dhemail "<email>email@1.com</email>">
+ <!ENTITY dhuemail "<email>email@2.com</email>">
++ <!ENTITY dhusername "Jane Doe">
++ <!ENTITY dhuusername "John Doe">
+ ]>
+ <refentry>
+ <refentryinfo>
+@@ -20,11 +22,11 @@
+ </copyright>
+ </refentryinfo>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>refsect1</title>
+ <para>
+ Help Options:
+ </para>
+--- a/t/fmt/sgml/basic.po 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.po 2021-11-17 09:28:47.239474483 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2007-08-05 17:42+0200\n"
++"POT-Creation-Date: 2021-11-16 22:40+0100\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"
+@@ -34,10 +34,20 @@
+ #. type: definition of entity &dhuemail;
+ #, no-wrap
+ msgid "<email>email@2.com</email>"
+-msgstr "<email>EMAIL@1.COM</email>"
++msgstr "<email>EMAIL@2.COM</email>"
++
++#. type: definition of entity &dhusername;
++#, no-wrap
++msgid "Jane Doe"
++msgstr "JANE DOE"
++
++#. type: definition of entity &dhuusername;
++#, no-wrap
++msgid "John Doe"
++msgstr "JOHN DOE"
+
+ #. type: <address></address>
+-#: basic.sgml:11
++#: basic.sgml:13
+ #, no-wrap
+ msgid ""
+ "<address>\n"
+@@ -49,38 +59,56 @@
+ " "
+
+ #. type: <author></author>
+-#: basic.sgml:19
++#: basic.sgml:21
+ msgid "&dhfirstname; &dhsurname;"
+ msgstr "&dhfirstname; &dhsurname;"
+
+ #. type: <copyright><holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ msgid "<year>2004, 2007</year>"
+ msgstr "<year>2004, 2007</year>"
+
+ #. type: <holder></holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ #, no-wrap
+ msgid "&dhusername; and &dhuusername;"
+-msgstr "&dhusername; AND &dhuusername;"
++msgstr "&dhusername; and &dhuusername;"
++
++#. type: <refname></refname>
++#: basic.sgml:30
++#, no-wrap
++msgid "test"
++msgstr "TEST"
++
++#. type: <refpurpose></refpurpose>
++#: basic.sgml:31
++#, no-wrap
++msgid "test refentry"
++msgstr "TEST REFENTRY"
++
++#. type: <title></title>
++#: basic.sgml:34
++#, no-wrap
++msgid "refsect1"
++msgstr "REFSECT1"
+
+ #. type: <para></para>
+-#: basic.sgml:28
++#: basic.sgml:35
+ msgid "Help Options:"
+ msgstr "HELP OPTIONS:"
+
+ #. type: <term></term>
+-#: basic.sgml:31
++#: basic.sgml:38
+ #, no-wrap
+ msgid "<option>-?</option> <option>--help</option>"
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:33
++#: basic.sgml:40
+ msgid "Show help options."
+-msgstr "SHOW HELP OPTIONS"
++msgstr "SHOW HELP OPTIONS."
+
+ #. type: <para></para>
+-#: basic.sgml:39 basic.sgml:41
++#: basic.sgml:46 basic.sgml:48
+ msgid "Test test1 test2 test3 test4."
+ msgstr "TEST TEST1 TEST2 TEST3 TEST4."
+--- a/t/fmt/sgml/basic.pot 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.pot 2021-11-16 22:40:08.561394570 +0100
+@@ -7,7 +7,7 @@
+ msgid ""
+ msgstr ""
+ "Project-Id-Version: PACKAGE VERSION\n"
+-"POT-Creation-Date: 2007-08-05 17:42+0200\n"
++"POT-Creation-Date: 2021-11-16 22:40+0100\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"
+@@ -36,8 +36,18 @@
+ msgid "<email>email@2.com</email>"
+ msgstr ""
+
++#. type: definition of entity &dhusername;
++#, no-wrap
++msgid "Jane Doe"
++msgstr ""
++
++#. type: definition of entity &dhuusername;
++#, no-wrap
++msgid "John Doe"
++msgstr ""
++
+ #. type: <address></address>
+-#: basic.sgml:11
++#: basic.sgml:13
+ #, no-wrap
+ msgid ""
+ "<address>\n"
+@@ -46,38 +56,56 @@
+ msgstr ""
+
+ #. type: <author></author>
+-#: basic.sgml:19
++#: basic.sgml:21
+ msgid "&dhfirstname; &dhsurname;"
+ msgstr ""
+
+ #. type: <copyright><holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ msgid "<year>2004, 2007</year>"
+ msgstr ""
+
+ #. type: <holder></holder>
+-#: basic.sgml:23
++#: basic.sgml:25
+ #, no-wrap
+ msgid "&dhusername; and &dhuusername;"
+ msgstr ""
+
++#. type: <refname></refname>
++#: basic.sgml:30
++#, no-wrap
++msgid "test"
++msgstr ""
++
++#. type: <refpurpose></refpurpose>
++#: basic.sgml:31
++#, no-wrap
++msgid "test refentry"
++msgstr ""
++
++#. type: <title></title>
++#: basic.sgml:34
++#, no-wrap
++msgid "refsect1"
++msgstr ""
++
+ #. type: <para></para>
+-#: basic.sgml:28
++#: basic.sgml:35
+ msgid "Help Options:"
+ msgstr ""
+
+ #. type: <term></term>
+-#: basic.sgml:31
++#: basic.sgml:38
+ #, no-wrap
+ msgid "<option>-?</option> <option>--help</option>"
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:33
++#: basic.sgml:40
+ msgid "Show help options."
+ msgstr ""
+
+ #. type: <para></para>
+-#: basic.sgml:39 basic.sgml:41
++#: basic.sgml:46 basic.sgml:48
+ msgid "Test test1 test2 test3 test4."
+ msgstr ""
+--- a/t/fmt/sgml/basic.sgml 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.sgml 2021-11-16 15:56:10.113854553 +0100
+@@ -1,8 +1,10 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+ <!ENTITY dhfirstname "<firstname>fname</firstname>">
+ <!ENTITY dhsurname "<surname>Surname</surname>">
+ <!ENTITY dhemail "<email>email@1.com</email>">
+ <!ENTITY dhuemail "<email>email@2.com</email>">
++ <!ENTITY dhusername "Jane Doe">
++ <!ENTITY dhuusername "John Doe">
+ ]>
+
+ <refentry>
+@@ -24,7 +26,12 @@
+ </copyright>
+
+ </refentryinfo>
++ <refnamediv>
++ <refname>test</refname>
++ <refpurpose>test refentry</refpurpose>
++ </refnamediv>
+ <refsect1>
++ <title>refsect1</title>
+ <para>Help Options:</para>
+ <variablelist>
+ <varlistentry>
+@@ -41,3 +48,4 @@
+ Test test1 test2 test3 test4.
+ </para>
+ </refsect1>
++</refentry>
+--- a/t/fmt/sgml/basic.trans 2021-02-22 17:53:34.000000000 +0100
++++ b/t/fmt/sgml/basic.trans 2021-11-17 09:08:31.803514576 +0100
+@@ -1,9 +1,11 @@
+-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
++<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+ <!ENTITY dhfirstname "<firstname>FNAME</firstname>">
+ <!ENTITY dhsurname "<surname>SURNAME</surname>">
+ <!ENTITY dhemail "<email>EMAIL@1.COM</email>">
+- <!ENTITY dhuemail "<email>EMAIL@1.COM</email>">
++ <!ENTITY dhuemail "<email>EMAIL@2.COM</email>">
++ <!ENTITY dhusername "JANE DOE">
++ <!ENTITY dhuusername "JOHN DOE">
+ ]>
+ <refentry>
+ <refentryinfo>
+@@ -16,15 +18,15 @@
+ </author>
+ <copyright>
+ <year>2004, 2007</year>
+- <holder>&dhusername; AND &dhuusername;</holder>
++ <holder>&dhusername; and &dhuusername;</holder>
+ </copyright>
+ </refentryinfo>
+ <refnamediv>
+- <refname></refname>
+- <refpurpose></refpurpose>
++ <refname>TEST</refname>
++ <refpurpose>TEST REFENTRY</refpurpose>
+ </refnamediv>
+ <refsect1>
+- <title></title>
++ <title>REFSECT1</title>
+ <para>
+ HELP OPTIONS:
+ </para>
+@@ -33,7 +35,7 @@
+ <term><option>-?</option> <option>--help</option></term>
+ <listitem>
+ <para>
+- SHOW HELP OPTIONS
++ SHOW HELP OPTIONS.
+ </para>
+ </listitem>
+ </varlistentry>
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..b53e82e65d1f 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.65
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,10 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=5900bc5ecd6727b74ec4770dddd461fbf14fe23a4c29507a0c2f35a78ad45b4c
From 814ef5051d17dfe861e5166df80b8c0aa125116a Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 18 Nov 2021 19:57:22 +0100
Subject: [PATCH 2/2] common: verbose output in perl-ModuleBuild.sh
when running tests
---
common/build-style/perl-ModuleBuild.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/common/build-style/perl-ModuleBuild.sh b/common/build-style/perl-ModuleBuild.sh
index a84373b5b0bf..48c511e2883b 100644
--- a/common/build-style/perl-ModuleBuild.sh
+++ b/common/build-style/perl-ModuleBuild.sh
@@ -41,7 +41,7 @@ do_check() {
if [ ! -x ./Build ]; then
msg_error "$pkgver: cannot find ./Build script!\n"
fi
- ./Build test
+ ./Build test verbose=1
}
do_install() {
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (12 preceding siblings ...)
2021-11-21 21:49 ` [PR PATCH] [Updated] " newbluemoon
@ 2021-11-21 22:06 ` newbluemoon
2022-02-25 18:42 ` [PR PATCH] [Updated] " newbluemoon
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2021-11-21 22:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 459 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-974905097
Comment:
Ran tests locally on x86_64 and i686 without any issue and added `make_check=ci-skip ...` as you suggested.
Also removed the temporary verbose test output for `perl-ModuleBuild`.
So I think now it should be really good to go. But I’ll still try to figure out where those strange test failures come from... :)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.65
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (13 preceding siblings ...)
2021-11-21 22:06 ` newbluemoon
@ 2022-02-25 18:42 ` newbluemoon
2022-03-13 19:29 ` [PR PATCH] [Updated] po4a: update to 0.66 newbluemoon
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2022-02-25 18:42 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.65
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 1457 bytes --]
From 1d2ae45b8ef8c91c14839997c987898c59aebdde Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH] po4a: update to 0.66
---
srcpkgs/po4a/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..8dd6a6ed641b 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.66
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,12 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
+changelog="https://raw.githubusercontent.com/mquinson/po4a/master/NEWS"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=8ae65c69b3a3e3911c449284aa9f07c80b74484fd211f6e2a7e6b57e09f3afd8
+make_check=ci-skip # cannot repoduce failure locally
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.66
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (14 preceding siblings ...)
2022-02-25 18:42 ` [PR PATCH] [Updated] " newbluemoon
@ 2022-03-13 19:29 ` newbluemoon
2022-03-28 18:57 ` newbluemoon
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2022-03-13 19:29 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.66
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 1457 bytes --]
From 7cf2145b2c9ff575501f37e3530ebc8e7510e919 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH] po4a: update to 0.66
---
srcpkgs/po4a/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..8dd6a6ed641b 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.66
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,12 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
+changelog="https://raw.githubusercontent.com/mquinson/po4a/master/NEWS"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=8ae65c69b3a3e3911c449284aa9f07c80b74484fd211f6e2a7e6b57e09f3afd8
+make_check=ci-skip # cannot repoduce failure locally
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.66
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (15 preceding siblings ...)
2022-03-13 19:29 ` [PR PATCH] [Updated] po4a: update to 0.66 newbluemoon
@ 2022-03-28 18:57 ` newbluemoon
2022-05-07 18:32 ` newbluemoon
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2022-03-28 18:57 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.66
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 1457 bytes --]
From b94b06cf4aa5d08f1aa8ec42f05dc2f0c259c872 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH] po4a: update to 0.66
---
srcpkgs/po4a/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..8dd6a6ed641b 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.66
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,12 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
+changelog="https://raw.githubusercontent.com/mquinson/po4a/master/NEWS"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=8ae65c69b3a3e3911c449284aa9f07c80b74484fd211f6e2a7e6b57e09f3afd8
+make_check=ci-skip # cannot repoduce failure locally
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] po4a: update to 0.66
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (16 preceding siblings ...)
2022-03-28 18:57 ` newbluemoon
@ 2022-05-07 18:32 ` newbluemoon
2022-05-13 14:47 ` ericonr
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2022-05-07 18:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1844 bytes --]
There is an updated pull request by newbluemoon against master on the void-packages repository
https://github.com/newbluemoon/void-packages po4a
https://github.com/void-linux/void-packages/pull/34029
po4a: update to 0.66
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/34029.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-po4a-34029.patch --]
[-- Type: text/x-diff, Size: 1457 bytes --]
From e7405903cae5e74243ac061e6b0b27199a5c6db4 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Thu, 11 Nov 2021 10:14:10 +0100
Subject: [PATCH] po4a: update to 0.66
---
srcpkgs/po4a/template | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/po4a/template b/srcpkgs/po4a/template
index c0094f9eaa9c..8dd6a6ed641b 100644
--- a/srcpkgs/po4a/template
+++ b/srcpkgs/po4a/template
@@ -1,6 +1,6 @@
# Template file for 'po4a'
pkgname=po4a
-version=0.63
+version=0.66
revision=1
build_style=perl-ModuleBuild
_perldeps="perl perl-Text-WrapI18N perl-Term-ReadKey perl-Unicode-LineBreak
@@ -9,9 +9,12 @@ hostmakedepends="${_perldeps} perl-Locale-gettext perl-Module-Build gettext
libxslt docbook-xsl"
makedepends="${_perldeps} perl-Locale-gettext perl-Module-Build"
depends="${_perldeps} opensp gettext"
+checkdepends="docbook opensp perl-Test-Pod texlive"
short_desc="PO for anything (po4a) project to ease translations using gettext tools"
maintainer="newbluemoon <blaumolch@mailbox.org>"
license="GPL-2.0-or-later"
homepage="https://po4a.org/"
+changelog="https://raw.githubusercontent.com/mquinson/po4a/master/NEWS"
distfiles="https://github.com/mquinson/po4a/archive/v${version}.tar.gz"
-checksum=534a050af6e8d8d2acd5dd32b66c9a15f64106f022efef72cd82c175de34e595
+checksum=8ae65c69b3a3e3911c449284aa9f07c80b74484fd211f6e2a7e6b57e09f3afd8
+make_check=ci-skip # cannot repoduce failure locally
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.66
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (17 preceding siblings ...)
2022-05-07 18:32 ` newbluemoon
@ 2022-05-13 14:47 ` ericonr
2022-05-13 14:47 ` [PR PATCH] [Merged]: " ericonr
2022-05-13 15:06 ` newbluemoon
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2022-05-13 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 202 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-1126139956
Comment:
Sorry for the delay merging, and thanks for keeping on it :)
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Merged]: po4a: update to 0.66
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (18 preceding siblings ...)
2022-05-13 14:47 ` ericonr
@ 2022-05-13 14:47 ` ericonr
2022-05-13 15:06 ` newbluemoon
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2022-05-13 14:47 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1683 bytes --]
There's a merged pull request on the void-packages repository
po4a: update to 0.66
https://github.com/void-linux/void-packages/pull/34029
Description:
Two sgml tests fail because they invoke `onsgmls` from OpenSP to verify a test sgml file against a docbook DTD which errors out.
The `opensp` package adds a sgml catalog entry
`CATALOG /usr/share/OpenSP/catalog`
and in `/usr/share/OpenSP/catalog` there is a sgml declaration:
`SGMLDECL unicode.sd`
When this line or the catalog entry above is removed `onsgmls` falls back to its
default definition and succeeds and all tests are passed.
I’m not sure if the problem is related to Void’s `opensp` package or to `po4a`.
Any ideas are welcome! :)
I also asked upstream: https://github.com/mquinson/po4a/issues/327
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **NO**
<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: po4a: update to 0.66
2021-11-11 13:44 [PR PATCH] po4a: update to 0.64 newbluemoon
` (19 preceding siblings ...)
2022-05-13 14:47 ` [PR PATCH] [Merged]: " ericonr
@ 2022-05-13 15:06 ` newbluemoon
20 siblings, 0 replies; 22+ messages in thread
From: newbluemoon @ 2022-05-13 15:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 196 bytes --]
New comment by newbluemoon on void-packages repository
https://github.com/void-linux/void-packages/pull/34029#issuecomment-1126157576
Comment:
@ericonr No worries, good to see you’re back! :)
^ permalink raw reply [flat|nested] 22+ messages in thread