From patchwork Thu Dec 19 15:10:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: gemmaro X-Patchwork-Id: 35045 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 0DB7727BBE2; Thu, 19 Dec 2024 15:22:14 +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=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 280D427BBEB for ; Thu, 19 Dec 2024 15:22:12 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tOILf-0000I6-S8; Thu, 19 Dec 2024 10:21:59 -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 1tOIEx-0007bD-9Z for guix-patches@gnu.org; Thu, 19 Dec 2024 10:15:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tOIEw-0008HX-WE; Thu, 19 Dec 2024 10:15:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=UIcDOhwXZPk4ceehyPSPHez5CkW/Nwbx2py43MBs0CU=; b=XdAza0foog46vAC6sI2UE5EVd1GpAnAulNu0WpdRQU0PAwI8KU/+JuOqyOs9ODN2C1gp+/cid2daeDEN39+etWupugBwN8djLYasExWAIV7a2MBYkGPuVY44FFSK9ybfhiUZK98qYQv9kff8GOGSZ8isgVdn6KHGf3KUl2/E609RMZoiAvYxDjb5gJKIGyJJcxkZ2ieh+7i7HI1kAK5/Ec0Qhn+qerMOleiwRtHgj09O+drtgOoPiJsim7NeN6klwkzq7gh10hs1nsHbt0KE4kkJJtv9hn+kJvZVn5cvV3YolxWFi/EHKsz2SwdLGHXeYaXFUO95GrNG+2Iu6nv1tQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tOIEw-00059p-Hp; Thu, 19 Dec 2024 10:15:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74393] [PATCH v2 2/2] gnu: texinfo-7: Use external modules. Resent-From: gemmaro Original-Sender: "Debbugs-submit" Resent-CC: gemmaro.dev@gmail.com, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Thu, 19 Dec 2024 15:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74393@debbugs.gnu.org Cc: gemmaro , gemmaro , Ludovic =?utf-8?q?Court=C3=A8s?= X-Debbugs-Original-Xcc: gemmaro , Ludovic =?utf-8?q?C?= =?utf-8?q?ourt=C3=A8s?= Received: via spool by 74393-submit@debbugs.gnu.org id=B74393.173462129719785 (code B ref 74393); Thu, 19 Dec 2024 15:15:02 +0000 Received: (at 74393) by debbugs.gnu.org; 19 Dec 2024 15:14:57 +0000 Received: from localhost ([127.0.0.1]:39679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOIEr-000593-64 for submit@debbugs.gnu.org; Thu, 19 Dec 2024 10:14:57 -0500 Received: from mail-pl1-f182.google.com ([209.85.214.182]:47524) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tOIEm-00058q-RY for 74393@debbugs.gnu.org; Thu, 19 Dec 2024 10:14:53 -0500 Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-21683192bf9so9219555ad.3 for <74393@debbugs.gnu.org>; Thu, 19 Dec 2024 07:14:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734621232; x=1735226032; darn=debbugs.gnu.org; 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=UIcDOhwXZPk4ceehyPSPHez5CkW/Nwbx2py43MBs0CU=; b=CCP580brmnzk7ZIGitiMg+socunKJ9KFCX09s7kydYtVU+gN4/BVkAlw0jbKBqugyT P/YLwV2q1kTtuXcSuESroNT6Fp+RKBYozgjGOWgl64wa/c4yEcvIA35zcUlWMm9lpBSN F/p57t0UCV0KMDGfcbS/uAKj3BDAi4Jcr9Q+SpxV5ggaFbsUi5p48TbMJ54Bf/PHdYq5 kwFLz08UAMc06XnHR5/5VB1oCNLRklM6ZVPdMmYuzFF5ImkMmn+P0TyNq2LqtUUf69xv WOBgFJ9Hc997bb/ZVmds1ZlRsZo++s08fNcoQDCXWeDscHQ+5wjJYwRQdL+5tod8y3MZ De3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734621232; x=1735226032; 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=UIcDOhwXZPk4ceehyPSPHez5CkW/Nwbx2py43MBs0CU=; b=C5zgNmCVPOeq9ebtD2ZSSkIgMtVZny3W9f5w6nzgKL6YodiKAFWJDQtW+VSaepDpS6 Zab67Ak3a4evucl2fBRIcmMiT6Ftt3mO4kG1++wRSZjYW3s5AvI81W0DFoBYJ+5NBajH krZsuCRURLwqv2nLjSwFddTX7zlhgNSxZS7YqHvlkT4PXOSCPs3WrUo0mpMb4bYya4sY RdRB4iUANS5IFssWvohHdfLj/E8a1uOtKUqwW0Ei7EburyeDusS2rWUSQGNN2oUTDFZe wjmawE8i+CuMH19A32IWVjhsUnNFCM+pqdsd/Vnr/ApbmRCQ1n5VNv/G4DTzRbdmEPZ3 8Khg== X-Gm-Message-State: AOJu0Yw2AbJfNvuNrNd8FSCF3Kb1q+KkrUPDmSvuHw5Thw26toCzENSL me8GI+wjnWmbURJOQjwJAK81oG+zIRduIrceBQqiNUCj6uL4omOesZwa/g== X-Gm-Gg: ASbGncsQcm8zf9x6m2ABNWPHLhp/o5sMFXpC30pymACud+8fl27ZhFZAFfIInDOYa2F G1tUlkZe8BvqiL/2Ys1IQYsnQ8Y6c5BX/8GJVlBTKQSO4jwMyRgFS+kOjXvmxH3AdMnjHaIQoar KMpxasgM5wSfhQpIY7WNDaGolM2dzqih3uxLzpnvyDZOD3wE1Jl+BJmkS6vURZ5pTULLqNBCRoz p5BcGPwyvopQSvk+yCgowI7trQbS99ycVUxlcPS3gJmunXRO41OMRWD9nvCgB4= X-Google-Smtp-Source: AGHT+IFA9clsCEEtQVwbuMzAeExkTxBYrBspfglQp9v7MvSeBUJmjvoLLdx65sc+fk/tyR+5deDNWw== X-Received: by 2002:a17:902:f651:b0:206:9a3f:15e5 with SMTP id d9443c01a7336-218d7217397mr104938635ad.32.1734621232188; Thu, 19 Dec 2024 07:13:52 -0800 (PST) Received: from mac.gemmaro.name ([240f:74:d1f0:1:1883:f3d1:907f:a2e3]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dca01989sm13403255ad.239.2024.12.19.07.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Dec 2024 07:13:51 -0800 (PST) From: gemmaro Date: Fri, 20 Dec 2024 00:10:34 +0900 Message-ID: <20241219151042.3949-2-gemmaro.dev@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20241219151042.3949-1-gemmaro.dev@gmail.com> References: <20241219151042.3949-1-gemmaro.dev@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/texinfo.scm (texinfo-7): Use external modules rather than bundled ones. [inputs]: Add perl-unicode-eastasianwidth, perl-text-unidecode, and perl-libintl-perl. [arguments]<#:configure-flags>: Add a phase to enable the use of external modules. <#:phases>: Add Perl modules to the PERL5LIB variable of the texi2any program in the wrap-program phase. Change-Id: Ife2cdec50affb5287d5ad850b0ef80c6048b4b32 --- gnu/packages/texinfo.scm | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/gnu/packages/texinfo.scm b/gnu/packages/texinfo.scm index 13c780897e..d389e4d60e 100644 --- a/gnu/packages/texinfo.scm +++ b/gnu/packages/texinfo.scm @@ -120,9 +120,17 @@ (define-public texinfo-7 (base32 "10kcdb3pf7yakniccvv0krchs2fh3vh1rvhvnqr98ll3cbj3gbii")))) (inputs (modify-inputs (package-inputs texinfo) - (append perl-archive-zip))) ;needed for 'tex2any --epub3' + (append perl-archive-zip ;needed for 'tex2any --epub3' + perl-unicode-eastasianwidth perl-text-unidecode + perl-libintl-perl))) (arguments (substitute-keyword-arguments (package-arguments texinfo) + ((#:configure-flags flags + ''()) + #~(cons* "--with-external-Unicode-EastAsianWidth" + "--with-external-Text-Unidecode" + "--with-external-libintl-perl" + #$flags)) ((#:phases phases #~%standard-phases) #~(modify-phases #$phases (add-after 'install 'wrap-program @@ -136,9 +144,15 @@ (define-public texinfo-7 (and (eq? 'directory (stat:type stat)) (string=? (basename file) "Archive"))) - #:directories? #t)))) + #:directories? #t))) + (mods (map (lambda (mod) + (string-append (assoc-ref inputs mod) + "/lib/perl5/site_perl")) + '("perl-unicode-eastasianwidth" + "perl-text-unidecode" "perl-libintl-perl")))) (wrap-program program - `("PERL5LIB" prefix (,(dirname zip))))))))))))) + `("PERL5LIB" prefix + ,(cons* (dirname zip) mods)))))))))))) (define-public texinfo-5 (package (inherit texinfo)