From patchwork Sun Jul 23 08:46:39 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: 52116 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 B32A927BBE2; Sun, 23 Jul 2023 12:38:57 +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 551F527BBEA for ; Sun, 23 Jul 2023 12:38:55 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qNXPd-00015N-99; Sun, 23 Jul 2023 07:38:09 -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 1qNXPa-00013w-75 for guix-patches@gnu.org; Sun, 23 Jul 2023 07:38:06 -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 1qNXPZ-00084z-OL for guix-patches@gnu.org; Sun, 23 Jul 2023 07:38:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qNXPZ-0005wb-JW for guix-patches@gnu.org; Sun, 23 Jul 2023 07:38:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64798] [PATCH 179/209] gnu: kscreenlocker: Format with 'guix style'. Resent-From: Zheng Junjie <873216071@qq.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 23 Jul 2023 11:38:05 +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.169011227322762 (code B ref 64798); Sun, 23 Jul 2023 11:38:05 +0000 Received: (at 64798) by debbugs.gnu.org; 23 Jul 2023 11:37:53 +0000 Received: from localhost ([127.0.0.1]:38823 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qNXPM-0005uz-JQ for submit@debbugs.gnu.org; Sun, 23 Jul 2023 07:37:53 -0400 Received: from out162-62-57-87.mail.qq.com ([162.62.57.87]:44009) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <873216071@qq.com>) id 1qNXPB-0005se-8m for 64798@debbugs.gnu.org; Sun, 23 Jul 2023 07:37:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qq.com; s=s201512; t=1690112253; bh=rexbZ6DfZW1r0tbb1tN9aCYp++aNmzL068uerbTk58o=; h=From:To:Subject:Date:In-Reply-To:References; b=de/gPglP1Ag0kr3wR+X7cW8tHC0biQjkrccqvtgpVQt2CJCep/8k/OCyAEyHKfREm YDX2sqM1xmRFrpRTEJhsRgCaiRHyQMfLgEAl9rnKdihMDRwpwbGNQO86CIOCFvWxBM zuxuU2GPfSQtgEZ+UOjypJ+M+q8V5GMOkTaLqL3s= Received: from localhost.localdomain ([111.0.51.236]) by newxmesmtplogicsvrszc5-0.qq.com (NewEsmtp) with SMTP id 9599CE50; Sun, 23 Jul 2023 19:37:25 +0800 X-QQ-mid: xmsmtpt1690112251tjucg7j4y Message-ID: X-QQ-XMAILINFO: M8sWDjnNE7FPOaiECFC+e4SZbo487TPtwG3CaTJdKbo0VBMLuBZziC4TW6pA+3 udDeZJEMd3orAauGtKL+iJe7hBD7HfC0Kk7bQ0qBkoFkwtgxzL6YwJRKwBQq5NWCEfghM9seOaLM wFa5pG17txqBqQXEY/ldGYzQQbt1vUsuPs8VW4yZVgJA7iPUAX9nsz/yWvWQ9/EB/ZHwoxAwus/i s1tQOtNEofUYf2AOcDX7+QxOyzL7zrh85Y52nq5STznHp0YRhCuCIOTkqgdaXI9noc5cIAIoYBIC VUDSVzZ1YBmi50V5KIq2M83WekM0Jb+o7Yk695vU+NBRsoa7ddWogIYPJGlXbEUsa/Hj5DM5X7pS 1SA5PN7i8UiFK0GYZ01K/+Q3Ta19Vs9sSK8N5j1miv2PjZ0daDI1pcdUm1oNvcjzFdOOm4kh9WOo P+rpuxlWDuN2Ll+dOzSWv0tAq6wuw2IA824Cj9Y3C7xXr40DB7kNdF56OH6TfKoLIhS3Hv37d7jA 6Ovqy0xRFoRkw3e3FqVFN85BUNih6vrtV4x8wb+X/DfeY5EtHmt3bc7DAK33JdbRga/zD9HAj+Qc +zfzL9VtKsOCVIaDoZgljaSJdU+8SCRt3Ra5d5FeNhPcMWcoQTPTVLJvi9lxuS8f4KNK89oySoXO 369+dZkq3oeAm1f2cOzTpJqH8vDcu+JPEvvWSYis5q8zQX7lapk/2d+Jqs3/bSeo60/LG4VG5FOr 8SbiYs8YN+yEPSY7HdZI2R4SNlj4z74X+qf/Cym6psNssJqK5tNdhBW7z+DhONq9uIwCtz1Arfud cN6cBmGx7GjtOCXr1BpdLVR+pcV7o4QRwA2DV/dEO7Hg+lVOjW19NjsfEXyRi3tMeh1hbEFVvt7V SmIVyED+XzvUxq60EdOZyXI0OI/U/6xdbYiUlXbFaKX9w/uDwvI2j0dICmOKY7KZgMsW1tTnhxKU apBBTN5tw6fNU+NDWUCpvuTNp7QM4Zjii1Hr+dOwsNR2ZsNVHHTdpWsZRVHB+N X-QQ-XMRINFO: MPJ6Tf5t3I/ycC2BItcBVIA= Date: Sun, 23 Jul 2023 16:46:39 +0800 X-OQ-MSGID: <5dc8c7a10a08d269a96018653a33836879f9ac2f.1690099027.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-plasma.scm (kscreenlocker): Adjust package formatting with 'guix style'. [arguments]: use G-expressions, remove tail #t --- gnu/packages/kde-plasma.scm | 91 ++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 48 deletions(-) diff --git a/gnu/packages/kde-plasma.scm b/gnu/packages/kde-plasma.scm index 9062fc7911..4e57202912 100644 --- a/gnu/packages/kde-plasma.scm +++ b/gnu/packages/kde-plasma.scm @@ -835,54 +835,49 @@ (define-public kscreenlocker "0pgmy4dw41kim7syk4xb2n4g4iz3jjikhwnh3bjianl9h87rc12x")))) (build-system qt-build-system) (arguments - `(#:tests? #f ;; TODO: make tests pass - #:phases - (modify-phases %standard-phases - (add-before 'check 'check-setup - (lambda* (#:key inputs outputs #:allow-other-keys) - (system "Xvfb :1 -screen 0 640x480x24 &") - (setenv "DISPLAY" ":1") - #t)) - (delete 'check) - ;; Tests use the installed library and require a DBus session. - (add-after 'install 'check - (lambda* (#:key tests? #:allow-other-keys) - (if tests? - (begin - (setenv "CTEST_OUTPUT_ON_FAILURE" "1") - (invoke "dbus-launch" "ctest"))) - #t))))) - (native-inputs - (list extra-cmake-modules pkg-config - ;; For tests. - dbus xorg-server-for-tests)) - (inputs - (list kcmutils - kconfig - kcrash - kdeclarative - kglobalaccel - ki18n - kio - kidletime - knotifications - ktextwidgets - kwayland - kwindowsystem - kxmlgui - layer-shell-qt - libkscreen - libseccomp ;for sandboxing the look'n'feel package - libxcursor ;missing in CMakeList.txt - libxi ;XInput, required for grabbing XInput2 devices - linux-pam - elogind ;optional loginctl support - qtbase-5 - qtdeclarative-5 - qtx11extras - solid - wayland - xcb-util-keysyms)) + (list #:tests? #f ;TODO: make tests pass + #:phases #~(modify-phases %standard-phases + (add-before 'check 'check-setup + (lambda* (#:key inputs outputs #:allow-other-keys) + (system "Xvfb :1 -screen 0 640x480x24 &") + (setenv "DISPLAY" ":1"))) + (delete 'check) + ;; Tests use the installed library and require a DBus session. + (add-after 'install 'check + (lambda* (#:key tests? #:allow-other-keys) + (if tests? + (begin + (setenv "CTEST_OUTPUT_ON_FAILURE" "1") + (invoke "dbus-launch" "ctest")))))))) + (native-inputs (list extra-cmake-modules pkg-config + ;; For tests. + dbus xorg-server-for-tests)) + (inputs (list kcmutils + kconfig + kcrash + kdeclarative + kglobalaccel + ki18n + kio + kidletime + knotifications + ktextwidgets + kwayland + kwindowsystem + kxmlgui + layer-shell-qt + libkscreen + libseccomp ;for sandboxing the look'n'feel package + libxcursor ;missing in CMakeList.txt + libxi ;XInput, required for grabbing XInput2 devices + linux-pam + elogind ;optional loginctl support + qtbase-5 + qtdeclarative-5 + qtx11extras + solid + wayland + xcb-util-keysyms)) (home-page "https://invent.kde.org/plasma/kscreenlocker") (synopsis "Screen locking library") (description