From patchwork Sun Jul 23 08:44:30 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: 51980 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 6A71C27BBE2; Sun, 23 Jul 2023 10:00:52 +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=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 5F62F27BBE9 for ; Sun, 23 Jul 2023 10:00:51 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNUwl-0004dB-DG; 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 1qNUwj-0004bl-A7 for guix-patches@gnu.org; Sun, 23 Jul 2023 05:00:09 -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 1qNUwj-0001Hb-2J for guix-patches@gnu.org; Sun, 23 Jul 2023 05:00:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNUwi-0006sK-Uz for guix-patches@gnu.org; Sun, 23 Jul 2023 05:00:08 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 050/209] gnu: kpackage: 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.169010280726407 (code B ref 64798); Sun, 23 Jul 2023 09:00:08 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 09:00:07 +0000 Received: from localhost ([127.0.0.1]:38177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNUwg-0006rb-J2 for submit@debbugs.gnu.org; Sun, 23 Jul 2023 05:00:07 -0400 Received: from out203-205-221-233.mail.qq.com ([203.205.221.233]:37452) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNUwR-0006oO-ND for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 04:59:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690102785; bh=6NzWIG0J3LxsGZIco7T9zLKm2M5/OupLGNDbF2ydL7c=; h=From:To:Subject:Date:In-Reply-To:References; b=Axom0sc/KLszrRgpbKQZx/bDcXgPUeCucjOWtVoQWkJVltlUc5c7H4visP8iiVHTa JPuEiZcq6X8w+/q81BNgzwSYlcBJXwPBuX2kNjv801cCKuogNHPFsIr+HRwzCKk1YH s+UhIoiDFl3bkui80SiSM5ZrYRXZ7Zjiv4NI2auA= 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: xmsmtpt1690102783tgi124xon Message-ID: X-QQ-XMAILINFO: MIQUMGBCngpGLV9VcbQvg/wF8ZyE1WQN7M3cD4rAZ0T/WFJfz+ky7T0QD76J23 d8r+2SMrniMdyxd276mBtm11/0O6qaoM9Yk2VlEtnicdCDgc23ESVcq4gjekLoZXjVqAx9eLCQrq bkY7/hWUP1PBDAmVIU042reVYNZaHqW+IMxrEHKoU/ibphEVG2cpIjAYBtLIhmRuvU/PHcS72BQ/ FjKVbsPkIr30AnNJPAY013gOT1tMXU/USKCI9udir8ZEJX1smYAXmJ7tRMriIgqrNunR+ZTIjthD JfxdIa6M0wTt9PVQmWM8rsTw9HnMjlRnwmXH4rJopV+gpvh20M1i4ZNkiaDsfOjmO52ISeFb8bZP WDQto6l2H1LtY1vBENoMGMsS4IGh9ORgDz7SlZMDKfIVHghpUzgLTiwTFzU7l0Uv1ceVPN7qMUcA BXj4zsSNlqo+q0UcjDkP1WW1oz+avlW0Y1xcL5LR6mBe6sQsX3X7+/IfZNTgwsxJ3V3+jdMyeUS8 XaTV3+xmBRKmGijkTffkMpoUJKogcTbbsamWSSkKMpOUoTlK4WigXO9ngDIaJ1C/4XlvXVK10nD/ zLtfmNlHcibsEiCeqNpA5tN5jChjNqRYYn7vlbCDoka3B0oExQtxtyYQTpIGt+Ld6YRNAw5pzepe 0Q+TffEjqcSg6KsMiiqyDJEYLGKucMCpsZnGzwTcZshroDIxnAZQuqOq/Z2flpLV91g196W5+IhL Z69kVlD3zpNnUQbfcVOSQ2HwmKf5E4xVNUc6+fJfh375fJxGLH0F2/1vb7cUnQTJUJgpIm6l+dHx 5Qz6TbBfGWstV7f6HR9TDb+vfzS8TxF89B7N0ggWNVuduOjiYFZ+QKZyJErIvTSI/Bgtp6gofQ6f cLM7q7fOQrFfKyIOeeaTDQCY7IiYwjvNZRRh9K+ZDGst/BjARRLTLLSbbjg7r0posnDeh8S9+/y0 Jcvnru0qqf/UFEgpmoWUqzw/2GxumvFCDNV2f/cYM7gF3xGaxFLKpKkY9Yc0kX8fvej/QNgW3vlc amfO5v5L59qYjimSfS X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= Date: Sun, 23 Jul 2023 16:44:30 +0800 X-OQ-MSGID: <1e8067fdf68989b662fb3cfe190028d6221dad06.1690099026.git.873216071@qq.com> 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 (kpackage)[arguments]: Rewrite as G-expressions. --- gnu/packages/kde-frameworks.scm | 55 ++++++++++++++++++--------------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index c18bf4e1d7..98e2a5bb72 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -1928,31 +1928,36 @@ (define-public kpackage ki18n qtbase-5)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* "src/kpackage/package.cpp" - (("externalPaths.false.") "externalPaths(true)")) - ;; Make QDirIterator follow symlinks - (substitute* '("src/kpackage/packageloader.cpp") - (("^\\s*(const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories)(;)" _ a b) - (string-append a " | QDirIterator::FollowSymlinks" b)) - (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) - (string-append a " | QDirIterator::FollowSymlinks" b))))) - (add-after 'unpack 'patch-tests - (lambda _ - ;; /bin/ls doesn't exist in the build-container use /etc/passwd - (substitute* "autotests/packagestructuretest.cpp" - (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\"" - _ a b c) - (string-append a "etc" b "etc" c "etc\"")) - (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))") - "filePath(\"etc\", QStringLiteral(\"passwd\"))") - (("\"/bin/ls\"") "\"/etc/passwd\"")))) - (add-before 'check 'check-setup - (lambda _ - (setenv "HOME" (getcwd))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/kpackage/package.cpp" + (("externalPaths.false.") + "externalPaths(true)")) + ;; Make QDirIterator follow symlinks + (substitute* '("src/kpackage/packageloader.cpp") + (("^\\s*(const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories)(;)" + _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b)) + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" + _ a b) + (string-append a " | QDirIterator::FollowSymlinks" b))))) + (add-after 'unpack 'patch-tests + (lambda _ + ;; /bin/ls doesn't exist in the build-container use /etc/passwd + (substitute* "autotests/packagestructuretest.cpp" + (("(addDirectoryDefinition\\(\")bin(\".*\")bin(\".*\")bin\"" + _ a b c) + (string-append a "etc" b "etc" c "etc\"")) + (("filePath\\(\"bin\", QStringLiteral\\(\"ls\"))") + "filePath(\"etc\", QStringLiteral(\"passwd\"))") + (("\"/bin/ls\"") + "\"/etc/passwd\"")))) + (add-before 'check 'check-setup + (lambda _ + (setenv "HOME" (getcwd))))))) (home-page "https://community.kde.org/Frameworks") (synopsis "Installation and loading of additional content as packages") (description "The Package framework lets the user install and load packages