From patchwork Sat Dec 31 14:05:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 45746 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 57D0C27BBEB; Sat, 31 Dec 2022 16:05:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 10E2527BBE9 for ; Sat, 31 Dec 2022 16:05:01 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBeLE-0004Le-Mz; Sat, 31 Dec 2022 11:04:12 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pBeL7-0004Kz-10 for guix-patches@gnu.org; Sat, 31 Dec 2022 11:04:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pBeL5-0001hW-EB for guix-patches@gnu.org; Sat, 31 Dec 2022 11:04:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBeL5-0006aY-9c for guix-patches@gnu.org; Sat, 31 Dec 2022 11:04:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60448] [PATCH 5/6] gnu: po4a: Update to 0.68 Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 31 Dec 2022 16:04:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60448 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60448@debbugs.gnu.org Cc: gemmaro Received: via spool by 60448-submit@debbugs.gnu.org id=B60448.167250258825224 (code B ref 60448); Sat, 31 Dec 2022 16:04:03 +0000 Received: (at 60448) by debbugs.gnu.org; 31 Dec 2022 16:03:08 +0000 Received: from localhost ([127.0.0.1]:39667 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBeKC-0006Yf-0a for submit@debbugs.gnu.org; Sat, 31 Dec 2022 11:03:08 -0500 Received: from mail-pg1-f172.google.com ([209.85.215.172]:40955) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBcV1-0000IR-50 for 60448@debbugs.gnu.org; Sat, 31 Dec 2022 09:06:11 -0500 Received: by mail-pg1-f172.google.com with SMTP id h192so10931275pgc.7 for <60448@debbugs.gnu.org>; Sat, 31 Dec 2022 06:06:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=odw8UucpjI7I0RCLE+/hupX9OIOGFOoM/+WzsK7DIKU=; b=hDvC1fyjVEL3MiPUsqPpr/ToGobg/q6clA008wVoET7FiCfA39FhzQRqEsk6PNk1VP FnqXi/g+yp8dZETew2sjFX+Gp5QDGM/eeideqFq2xmu99SOIMKqRWb9v7bNJmXLksxVg gFc0MdfRK/eGCRCRNdWUlzJSS1CsNycVbJM9maFdKD+07/7667BBcqaazlPc5RIDfXdF aNOMkrDs7l/KY1Yiy/Du0VQpNIAwubOFxdAd28FQEmZTt1ITtJU8kbx96JYEGQ05vTPA 8mSgOrz78eCsMtQX9fFe6Rl2hpW9lxn6YIKeDgovfnujnDJrmypopn+l002reYIBTZdp Wdvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=odw8UucpjI7I0RCLE+/hupX9OIOGFOoM/+WzsK7DIKU=; b=Q9ovt+mV4Jo3/CUxW0acFw523dOYIM/G5KoczO5I321rRdlzvSGKrLc5ZXfL60m3iw kaIjojig43AmmIQzWThXmiDUSwV+zFOxzWQiy+NddNH/Fg5nYqdiIlgXtcNgeIl5BfJ0 R4T8N4XPa9gGwx34Q5uWGcY2tmigYPrLmk42SFRvjeXwmdHUi0xHrXko7ddLkgZcNkQ/ /IEQHG0ZnTooVSxV9WYKpTlC7q5Lmdo0bPJg6KuQTbDzr41LeMv5uM6MsY9mSIEnPonP KwUHV+D1No2JbdR9CaP9mU4m6mVecX8Sr8Y0gjNUBfWatQkYPxnSdiLc9aTBQkPTClXN wWkw== X-Gm-Message-State: AFqh2koqg5vLDrGIrq5ngMTJ245iSn1IxPVfz+NCdFZmS2i4VNibmzRQ HKTtoOY2wtwHJsNsJBbydxgVt+4VQ5Ug7A== X-Google-Smtp-Source: AMrXdXtpsN0PBdFXq4mfDT3IRNSAx87ufpA0ufuw8ge1qJS8UPbve5P6IxV54N3yqF5CSLbjPIEFfA== X-Received: by 2002:a05:6a00:1d91:b0:575:a4f5:7812 with SMTP id z17-20020a056a001d9100b00575a4f57812mr40793830pfw.4.1672495565382; Sat, 31 Dec 2022 06:06:05 -0800 (PST) Received: from mac.gemmaro.name ([240f:74:d1f0:1:ba1:e787:c9e:b1dc]) by smtp.gmail.com with ESMTPSA id k187-20020a6284c4000000b005769b23260fsm15866140pfd.18.2022.12.31.06.06.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 31 Dec 2022 06:06:04 -0800 (PST) From: gemmaro Date: Sat, 31 Dec 2022 23:05:00 +0900 Message-Id: X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 X-Mailman-Approved-At: Sat, 31 Dec 2022 11:03:05 -0500 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The phase do-not-override-PERL5LIB is removed since it was fixed in po4a v0.63. https://github.com/mquinson/po4a/blob/0ab1670e50f0a72781e3d1de6ab9da0c2d71c646/NEWS#L366 bash-minimal is added to inputs since the wrap-program function is used. See also https://issues.guix.gnu.org/49327#80 The only regrettable thing is that only the SGML test failed, but I could not find the cause... Nevertheless, some previously failed tests are now passing. --- gnu/packages/gettext.scm | 48 +++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gettext.scm b/gnu/packages/gettext.scm index 5df30c4be3..04fc20e7bf 100644 --- a/gnu/packages/gettext.scm +++ b/gnu/packages/gettext.scm @@ -36,6 +36,7 @@ (define-module (gnu packages gettext) #:use-module (guix build-system gnu) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (gnu packages bash) #:use-module (gnu packages check) #:use-module (gnu packages docbook) #:use-module (gnu packages emacs) @@ -239,14 +240,14 @@ (define-public mdpo (define-public po4a (package (name "po4a") - (version "0.63") + (version "0.68") (source (origin (method url-fetch) (uri (string-append "https://github.com/mquinson/po4a/releases/download/v" version "/po4a-" version ".tar.gz")) (sha256 (base32 - "1kmlfpdl1i1wrcdn0k1frh44fq10sfwswi3azvibli2lakpf66z2")))) + "045i8izp2dqmkdzvnxyy5sy27ffrwl85dk8n6cmg1804ikk28qdg")))) (build-system perl-build-system) (arguments `(#:phases @@ -257,9 +258,21 @@ (define-public po4a ;; required by this package at runtime. (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/")) - (Pod::Parser (assoc-ref inputs "perl-pod-parser")) (path (string-append out "/lib/perl5/site_perl:" - Pod::Parser "/lib/perl5/site_perl"))) + (string-join + (map (lambda (name) + (string-append (assoc-ref inputs name) + "/lib/perl5/site_perl")) + (list "perl-gettext" + "perl-pod-parser" + "perl-sgmls" + "perl-syntax-keyword-try" + "perl-xs-parse-keyword" + "perl-term-readkey" + "perl-text-wrapi18n" + "perl-unicode-linebreak" + "perl-yaml-tiny")) + ":")))) (for-each (lambda (file) (wrap-program file `("PERL5LIB" ":" prefix (,path)))) @@ -272,23 +285,10 @@ (define-public po4a (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/"))) #t)) - (add-before 'build 'do-not-override-PERL5LIB - (lambda _ - ;; Don't hard-code PERL5LIB to include just the build directory - ;; so that the build script finds modules from inputs. - (substitute* "Po4aBuilder.pm" - (("PERL5LIB=lib") "")) - (setenv "PERL5LIB" (string-append (getenv "PERL5LIB") ":lib")))) (add-before 'check 'disable-failing-tests (lambda _ - ;; FIXME: these tests require SGMLS.pm. - (delete-file "t/01-classes.t") - - (delete-file "t/add.t") - (delete-file "t/core-porefs.t") - (delete-file "t/fmt-asciidoc.t") + ;; FIXME: fails despite of importing SGMLS (delete-file "t/fmt-sgml.t") - #t))))) (native-inputs `(("gettext" ,gettext-minimal) @@ -300,10 +300,18 @@ (define-public po4a ;; For tests. ("docbook-xml" ,docbook-xml-4.1.2) ("perl-test-pod" ,perl-test-pod) - ("perl-yaml-tiny" ,perl-yaml-tiny) ("texlive" ,texlive-tiny))) (inputs - (list perl-pod-parser)) + (list bash-minimal + perl-gettext + perl-pod-parser + perl-sgmls + perl-syntax-keyword-try + perl-xs-parse-keyword + perl-term-readkey + perl-text-wrapi18n + perl-unicode-linebreak + perl-yaml-tiny)) (home-page "https://po4a.org/") (synopsis "Scripts to ease maintenance of translations") (description