From patchwork Sun Jul 23 08:44:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Z572 <873216071@qq.com> X-Patchwork-Id: 51981 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 EBC8327BBEA; Sun, 23 Jul 2023 10:00:53 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,FREEMAIL_REPLYTO_END_DIGIT, MAILING_LIST_MULTI,SPF_HELO_PASS 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 73C7127BBE9 for ; Sun, 23 Jul 2023 10:00:52 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNUwl-0004cy-3K; Sun, 23 Jul 2023 05:00:11 -0400 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 1qNUwi-0004bb-UW for guix-patches@gnu.org; Sun, 23 Jul 2023 05:00:08 -0400 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 1qNUwi-0001HT-LE for guix-patches@gnu.org; Sun, 23 Jul 2023 05:00:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNUwi-0006sD-Hy for guix-patches@gnu.org; Sun, 23 Jul 2023 05:00:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 048/209] gnu: kdoctools: use G-expressions. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 09:00:08 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64798 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64798@debbugs.gnu.org Received: via spool by 64798-submit@debbugs.gnu.org id=B64798.169010280626390 (code B ref 64798); Sun, 23 Jul 2023 09:00:08 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 09:00:06 +0000 Received: from localhost ([127.0.0.1]:38174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNUwf-0006rM-O4 for submit@debbugs.gnu.org; Sun, 23 Jul 2023 05:00:06 -0400 Received: from out162-62-58-211.mail.qq.com ([162.62.58.211]:33951) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNUwQ-0006oL-A4 for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 04:59:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690102783; bh=e+pRhnzelvN9cT1291dI3FXzefmZQn1qXLf39uNb0Tg=; h=From:To:Subject:Date:In-Reply-To:References; b=IEKBJykD3CaTO+OiLVgl64PZ8kbzsa+yzBK7RNLOv6jFmOCuX2enw5WGhP/led/Y0 TT5YR+Hf15tbxGBr2XCv0wcAyG1dtiWUf9ZYkVtABNv9FkEYKBIOVSZPACL0RiGWUg +NBrMMnq9bUb8BNP30ykFNGD6ST3541lxgMt4NGM= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszb1-0.qq.com (NewEsmtp) with SMTP id EE5874DE; Sun, 23 Jul 2023 16:59:37 +0800 X-QQ-mid: xmsmtpt1690102782tqpfvd47j Message-ID: X-QQ-XMAILINFO: MW//binZVb2s1eENELc/42123DQNvEf6ImUbzewa+SLgZcZ0AVEX79Q7MxZ6Sw mKt04loVCT0SIcD02ScJ2AyEAL8dIMD8ttpUr+fMuc2BcztEXI5wgDwS3abg63sm9+Tb4BDFd1JF oiW9JWqmgxUTCPleFK0Lmy7Gn8DAVnlx2b+jn2H0A79NOPlEaHieHCxxy6U3m+5Dz6/fHSdeC49W 4UEqe1ORwZxRV1N91Sx7dwf7k7lsZ9JuQlfgBjZ6+cYRj+i5rF/UyKLNxw2gp0acQdmEq5X6XKbp 217nfnUhtD0p64lxv1gfI/D9W1nRx+Fsxv6g7YMpiHPW9PRGe5D6BIRr5Xx1DFSp+8G6IX0IdbB2 JZ7aC4IDxm4XifIRkGhEsJVOJnYdoqzRb6Y7DUlBNSmBWNJXMq4G0FJLOuc4NpBizCtmQQ5HK2nr d6+89SqlH4ShXce78iA8BLop+VViCSbBxrNmoOzwXyaIHPYCfIrE4TLbEMKDDf5huTV/1yWKM5Sg KRwx4iZFmmfDo8LHyJuU8NB9sIjsxVPRcCPY/SUBF08KUt3feogXKW+pCCoEgbwbf+do2TMvS5Bi IchtvHYbDj+nvwy2k2mw9zggry2qAgIpcvXEJheYMB7UQjrkyIB0dTQ+NI65786ITXsaalBxwZU2 VsJF67XqI/5t7tGTTTSjMMfSU8D9lrMKuso7yjTlhkYnfFUPBEnXFI1RxjECyC/he+e9+wzjswFe RXJH7YNEZ8YStRygbQUrFKgpuJWv4aolKpfMe1urTxoHT4k7irPtu3usv0c6dKpGJpxBuxxfPHbT vTNOYjd2X/CkXCXOo1sF5vNUTGwInU35LRaEvDDmDdZi2dOw3JGPQkJcXc6EOm6xeqspSzUekOJu 8Mh+Qd0tW/B57WLGmg2fl/Nx9G7o6DO8PQS9smnnDBjpgYW/2+LnHaDEFzATSBUHqNcQa6xX1MEP 3awobvqP492m98NeIMSPPSgV+erw+uRGFtSCDboF6hOUBTL6J2BdoI2GMlHX78lCGAg+764xAAkC ozfANUSjP9aeHX9Tto X-QQ-XMRINFO: NI4Ajvh11aEj8Xl/2s1/T8w= Date: Sun, 23 Jul 2023 16:44:28 +0800 X-OQ-MSGID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Zheng Junjie <873216071@qq.com> X-ACL-Warn: , Zheng Junjie via Guix-patches X-Patchwork-Original-From: Zheng Junjie via Guix-patches via From: Z572 <873216071@qq.com> 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/kde-frameworks.scm (kdoctools)[arguments]: Rewrite as G-expressions. --- gnu/packages/kde-frameworks.scm | 46 +++++++++++++++++---------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 91b6262311..d8429576a3 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1705,28 +1705,30 @@ (define-public kdoctools perl-uri qtbase-5)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'cmake-find-docbook - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "cmake" "\\.cmake$") - (("CMAKE_SYSTEM_PREFIX_PATH") - "CMAKE_PREFIX_PATH")) - (substitute* "cmake/FindDocBookXML4.cmake" - (("^.*xml/docbook/schema/dtd.*$") - "xml/dtd/docbook\n")) - (substitute* "cmake/FindDocBookXSL.cmake" - (("^.*xml/docbook/stylesheet.*$") - (string-append "xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl) "\n"))))) - (add-after 'install 'add-symlinks - ;; Some package(s) (e.g. kdelibs4support) refer to this locale by a - ;; different spelling. - (lambda* (#:key outputs #:allow-other-keys) - (let ((xsl (string-append (assoc-ref outputs "out") - "/share/kf5/kdoctools/customization/xsl/"))) - (symlink (string-append xsl "pt_br.xml") - (string-append xsl "pt-BR.xml")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'cmake-find-docbook + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "cmake" "\\.cmake$") + (("CMAKE_SYSTEM_PREFIX_PATH") + "CMAKE_PREFIX_PATH")) + (substitute* "cmake/FindDocBookXML4.cmake" + (("^.*xml/docbook/schema/dtd.*$") + "xml/dtd/docbook\n")) + (substitute* "cmake/FindDocBookXSL.cmake" + (("^.*xml/docbook/stylesheet.*$") + (string-append "xml/xsl/docbook-xsl-" + #$(package-version docbook-xsl) + "\n"))))) + (add-after 'install 'add-symlinks + ;; Some package(s) (e.g. kdelibs4support) refer to this locale by a + ;; different spelling. + (lambda* (#:key outputs #:allow-other-keys) + (let ((xsl (string-append (assoc-ref outputs "out") + "/share/kf5/kdoctools/customization/xsl/"))) + (symlink (string-append xsl "pt_br.xml") + (string-append xsl "pt-BR.xml")))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Create documentation from DocBook") (description "Provides tools to generate documentation in various format