From: newbluemoon <newbluemoon@users.noreply.github.com> To: ml@inbox.vuxu.org Subject: Re: [PR PATCH] [Updated] po4a: update to 0.65 Date: Tue, 16 Nov 2021 08:18:03 +0100 [thread overview] Message-ID: <20211116071803.W14mpygeKoONfLx5VjjrCeyssQOEJs1m4RWp6cF4VM8@z> (raw) In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34029@inbox.vuxu.org> [-- 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
next prev parent reply other threads:[~2021-11-16 7:18 UTC|newest] Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top 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 2021-11-16 7:18 ` newbluemoon [this message] 2021-11-16 8:01 ` po4a: update to 0.65 newbluemoon 2021-11-17 16:20 ` [PR PATCH] [Updated] " newbluemoon 2021-11-17 16:22 ` newbluemoon 2021-11-18 5:10 ` [PR PATCH] [Updated] " newbluemoon 2021-11-18 18:59 ` newbluemoon 2021-11-18 19:04 ` newbluemoon 2021-11-18 21:02 ` newbluemoon 2021-11-21 19:35 ` ericonr 2021-11-21 21:49 ` [PR PATCH] [Updated] " newbluemoon 2021-11-21 22:06 ` newbluemoon 2022-02-25 18:42 ` [PR PATCH] [Updated] " newbluemoon 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 2022-05-13 14:47 ` ericonr 2022-05-13 14:47 ` [PR PATCH] [Merged]: " ericonr 2022-05-13 15:06 ` newbluemoon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20211116071803.W14mpygeKoONfLx5VjjrCeyssQOEJs1m4RWp6cF4VM8@z \ --to=newbluemoon@users.noreply.github.com \ --cc=ml@inbox.vuxu.org \ --subject='Re: [PR PATCH] [Updated] po4a: update to 0.65' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).