From patchwork Sun Jul 23 08:45:09 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: 52020 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 6D09127BBE2; Sun, 23 Jul 2023 10:49:44 +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 BA54727BBE9 for ; Sun, 23 Jul 2023 10:49:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNVi5-0001uI-IY; Sun, 23 Jul 2023 05:49:05 -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 1qNVi4-0001tV-0u for guix-patches@gnu.org; Sun, 23 Jul 2023 05:49:04 -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 1qNVi3-0007vR-PJ for guix-patches@gnu.org; Sun, 23 Jul 2023 05:49:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNVi3-0008RY-Ku for guix-patches@gnu.org; Sun, 23 Jul 2023 05:49:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 089/209] gnu: kcmutils: 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:49:03 +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.169010571332344 (code B ref 64798); Sun, 23 Jul 2023 09:49:03 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 09:48:33 +0000 Received: from localhost ([127.0.0.1]:38360 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNVhY-0008PX-L6 for submit@debbugs.gnu.org; Sun, 23 Jul 2023 05:48:32 -0400 Received: from out162-62-57-87.mail.qq.com ([162.62.57.87]:34607) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNVhQ-0008NE-Cr for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 05:48:27 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690105697; bh=LUejBxJ9roqj/TnkPktKqB7MKbjCEhU6H1vSsKgWJZA=; h=From:To:Subject:Date:In-Reply-To:References; b=XiFyW9xrJYRBCylqRZ3Execmfpd/EOepnu4KUF7cRz79P/xfJk8qYMKq+vExSu743 2N97XC3p5G1RkqChRLjbQhdJEuGUaO0JqhD16vV1gN4rZyHCmjgzc45yeC0whWLDzY RAOrjOIgIBq0lLyFhNdZcocX8tiGCqpws4ba1L/M= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrsza10-0.qq.com (NewEsmtp) with SMTP id C0AA0230; Sun, 23 Jul 2023 17:48:10 +0800 X-QQ-mid: xmsmtpt1690105696t08eahwdb Message-ID: X-QQ-XMAILINFO: MK9ZM/6TSGijksDpQZ7ix/EKijWICq2VJLLVRtCiX9rwUBBFn0P1JUFUwLuJjw m/GtSAO8RbeRFdrC/1TvTb9OW5aLsaxY6d+736Su0B55f1aBaXo+XNIfzzv+R3Dt7LxKkxORcc0U 1TRyks81BHXgnOtgPgvzVl15VCycFoU0wublAv0UPl8vkKw/bKo2zDhD1hsSHkaQ14CVRaA1mLch 47KDyh54pkhF3ANf5B0HmxT6LIFrDh7H9XVS6qFN51YfErSh/kGdvbOAHBkcaQf1k0uBTRPlmTzQ /6MJs7vJzAkfqMAv6aZy7yG8L9NNm4SNiAbXY8VIwThWnFOVCfQd4aGslviJgbsecJGfDMwILkJl 7hMR1UoIORw1JbmpGxkEiZDRFrksopWMX6HqucBGpMPRCUT+lNNZl72bI7EwP5jdcEN2GBI3OrGL ljlLjdffjYsnN+BgAnZWfutDPJCUPjqV2e1It+uIqYqTYgAHJ/2+ghdZjmj6im2wEdfKBhQ5RFMT B1woh8lpcyxy2c6kugWyi+lPmlLX6DD3VD88125g8cm+A56dk8ewc4QWaaC4P3bW6KLs2+VXxEPq 2dEiTT1HMXvDPsSle9yemFZxF2OzrPMbai4Vm6MKhpQw3Lmw89mKlCF/6xYsP63UGtDE7+9U+Qi4 E/tUEYSLSH+RiBvauBBEMFtv4qPkUQJrqCR7QQLySN3HcDlFwed/q2bWmMn2j3t8QMtoRUNUd4fq p387JRiV27y6RwdHd/UCgXJdV3oyRCdfKIBe5+h2xDmCHNCdaddO3t9+3gpw2ClvooVzVVKuHfKW p2I74X5tXtekxgep0Q5Dh3LiZq8RNT6tIbebA06Oky2k2CYfHqVSEFp+07V5N+AjROvH66TYAtnr bawcgvA8NvKx3cd5ZIDv/Irt6P+yGv6SHDR7V5SZ1yDQFhIJnaRL5fsCoHp4wZeAX7ZYElvWiiE4 Ax6BtNiqE2OBxbcgjsBEZW8CDraZ1DDLjYrCc9RruzuoqpC4Om/eLSsB6Ku39XB5YEa0GrrxU= X-QQ-XMRINFO: NS+P29fieYNw95Bth2bWPxk= Date: Sun, 23 Jul 2023 16:45:09 +0800 X-OQ-MSGID: <47c582e6c442e82d72104da5fa93a25fa3e99f98.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 (kcmutils)[arguments]: Rewrite as G-expressions. --- gnu/packages/kde-frameworks.scm | 36 +++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 2a811a928f..0f7cce2be7 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -2217,21 +2217,27 @@ (define-public kcmutils (native-inputs (list extra-cmake-modules)) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda _ - (substitute* "src/kpluginselector.cpp" - ;; make QDirIterator follow symlinks - (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" _ a b) - (string-append a " | QDirIterator::FollowSymlinks" b))) - (substitute* "src/kcmoduleloader.cpp" - ;; print plugin name when loading fails - (("^\\s*(qWarning\\(\\) << \"Error loading) (plugin:\")( << loader\\.errorString\\(\\);)" _ a b c) - (string-append a " KCM plugin\" << mod.service()->library() << \":\"" c))))) - (add-before 'check 'check-setup - (lambda _ - (setenv "QT_QPA_PLATFORM" "offscreen")))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "src/kpluginselector.cpp" + ;; make QDirIterator follow symlinks + (("^\\s*(QDirIterator it\\(.*, QDirIterator::Subdirectories)(\\);)" + _ a b) + (string-append a + " | QDirIterator::FollowSymlinks" b))) + (substitute* "src/kcmoduleloader.cpp" + ;; print plugin name when loading fails + (("^\\s*(qWarning\\(\\) << \"Error loading) (plugin:\")( << loader\\.errorString\\(\\);)" + _ a b c) + (string-append a + " KCM plugin\" << mod.service()->library() << \":\"" + c))))) + (add-before 'check 'check-setup + (lambda _ + (setenv "QT_QPA_PLATFORM" "offscreen")))))) (inputs (list kauth kcodecs