From patchwork Mon Dec 25 04:22:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 58051 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 EEB8C27BBE2; Mon, 25 Dec 2023 04:24:19 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 BA5DA27BBE9 for ; Mon, 25 Dec 2023 04:24:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHcVS-00042Z-Kd; Sun, 24 Dec 2023 23:23:58 -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 1rHcVQ-000423-7L for guix-patches@gnu.org; Sun, 24 Dec 2023 23:23:56 -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 1rHcVP-0005QO-V7 for guix-patches@gnu.org; Sun, 24 Dec 2023 23:23:55 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rHcVV-00054V-WB for guix-patches@gnu.org; Sun, 24 Dec 2023 23:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68020] [PATCH] gnu: sddm: Update to 0.20.0. Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Dec 2023 04:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 68020 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68020@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches" Received: via spool by submit@debbugs.gnu.org id=B.170347820019434 (code B ref -1); Mon, 25 Dec 2023 04:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 25 Dec 2023 04:23:20 +0000 Received: from localhost ([127.0.0.1]:53790 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHcUq-00053N-84 for submit@debbugs.gnu.org; Sun, 24 Dec 2023 23:23:20 -0500 Received: from lists.gnu.org ([2001:470:142::17]:54228) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rHcUl-000536-DA for submit@debbugs.gnu.org; Sun, 24 Dec 2023 23:23:18 -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 1rHcUZ-0003yW-Jq for guix-patches@gnu.org; Sun, 24 Dec 2023 23:23:03 -0500 Received: from m15.mail.163.com ([45.254.50.219]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rHcUT-00056Z-UB for guix-patches@gnu.org; Sun, 24 Dec 2023 23:23:03 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version: Content-Type; bh=eP+ZdaHgdboU/po4XdOCcnK577G/PLQIsk2MS7jL6iw=; b=Pw/P64QCIp8rzx9IgvxRF9Kv0bUHzyBmiuxrom5ZOiUjTaBgzG2OjQbh2zQYEY 4qMDPAV75o+5ipIydARHMebzmFaiKDF28YR9HBzVuvcM3lorMBf45lSimyknOcaD 0YdfgRHcvIBL3o/coRCD57OECfGdFv13F2Aen4VK4GbNY= Received: from Tumashu (unknown [218.92.14.78]) by zwqz-smtp-mta-g0-3 (Coremail) with SMTP id _____wC3P7eRA4llgAGFGg--.52760S2; Mon, 25 Dec 2023 12:22:41 +0800 (CST) From: Feng Shu Date: Mon, 25 Dec 2023 12:22:41 +0800 Message-ID: <875y0moqr2.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-CM-TRANSID: _____wC3P7eRA4llgAGFGg--.52760S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxZr4Dur4UuFW3Ar1DAFW3GFg_yoWruF13pa 9Ykr4Fgw1DArn8JrWvqF4j9rWFkF92yrsrCw4xA3409a1YvFZ2v3yIkFW5uFZxJ3Z2kay2 gFWrZw1UJa48KrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Ud9N-UUUUU= X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiwBRR1FXlxxhRKgAAsF Received-SPF: pass client-ip=45.254.50.219; envelope-from=tumashu@163.com; helo=m15.mail.163.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From 130e5ef2bf10970d49395c2f0042ae7075bb8946 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Mon, 25 Dec 2023 12:10:43 +0800 Subject: [PATCH] gnu: sddm: Update to 0.20.0. * gnu/packages/display-managers.scm (sddm)[version]: Update to 0.20.0. [source]: Remove snippet. [arguments]: Use gexp, remove outdate comment and handle /include/qt5 dir of qtdeclarative. Change-Id: I17e0fb397cd69675983252dd7908f9dad222df57 --- gnu/packages/display-managers.scm | 84 ++++++++++++++----------------- 1 file changed, 38 insertions(+), 46 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 935563c94c..2d6932b71d 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -69,25 +69,14 @@ (define-module (gnu packages display-managers) (define-public sddm (package (name "sddm") - (version "0.19.0") - (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/sddm/sddm" - "/releases/download/v" version "/" - "sddm-" version ".tar.xz")) - (sha256 - (base32 - "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72")) - (snippet - #~(begin - ;; https://github.com/sddm/sddm/issues/1536 - ;; https://github.com/sddm/sddm/commit/e93bf95c54ad8c2a1604f8d7be05339164b19308 - ;; Commit comes shortly after the 0.19.0 release. - (use-modules ((guix build utils))) - (substitute* "src/daemon/XorgDisplayServer.cpp" - (("m_cookie\\[i\\] = digits\\[dis\\(gen\\)\\]") - "m_cookie[i] = QLatin1Char(digits[dis(gen)])")))))) + (version "0.20.0") + (source + (origin + (method url-fetch) + (uri (string-append "https://github.com/sddm/sddm" + "/archive/refs/tags/v" version ".tar.gz")) + (sha256 + (base32 "1yz9mkbv7c4kdm3sjas8g0sa6j0z9wrsnmsfpka7ckqd3vcqnz26")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools-5)) @@ -109,36 +98,39 @@ (define-public sddm shadow wayland)) (arguments - `(#:configure-flags - ,#~(list - ;; This option currently does nothing, but will presumably be enabled - ;; if/when is merged. - "-DENABLE_WAYLAND=ON" - "-DENABLE_PAM=ON" - ;; Both flags are required for elogind support. - "-DNO_SYSTEMD=ON" "-DUSE_ELOGIND=ON" - "-DCONFIG_FILE=/etc/sddm.conf" - ;; Set path to /etc/login.defs. - ;; An alternative would be to use -DUID_MIN and -DUID_MAX. - (string-append "-DLOGIN_DEFS_PATH=" - #$(this-package-input "shadow") - "/etc/login.defs") - (string-append "-DQT_IMPORTS_DIR=" - #$output "/lib/qt5/qml") - (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" - #$output "/etc")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'embed-loginctl-reference - (lambda _ - (substitute* "CMakeLists.txt" - (("/usr/bin/loginctl") (which "loginctl"))) - #t))))) + (list + #:configure-flags + #~(list + "-DENABLE_WAYLAND=ON" + "-DENABLE_PAM=ON" + ;; Both flags are required for elogind support. + "-DNO_SYSTEMD=ON" + "-DUSE_ELOGIND=ON" + "-DCONFIG_FILE=/etc/sddm.conf" + ;; Set path to /etc/login.defs. + ;; An alternative would be to use -DUID_MIN and -DUID_MAX. + (string-append "-DLOGIN_DEFS_PATH=" + #$(this-package-input "shadow") + "/etc/login.defs") + (string-append "-DCMAKE_CXX_FLAGS=-I" + #$(this-package-input + "qtdeclarative") "/include/qt5") + (string-append "-DQT_IMPORTS_DIR=" + #$output "/lib/qt5/qml") + (string-append "-DCMAKE_INSTALL_SYSCONFDIR=" + #$output "/etc")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'embed-loginctl-reference + (lambda _ + (substitute* "CMakeLists.txt" + (("/usr/bin/loginctl") + (which "loginctl")))))))) (synopsis "QML based X11 and Wayland display manager") (description "SDDM is a display manager for X11 and Wayland aiming to be fast, simple and beautiful. SDDM is themeable and puts no restrictions on the -user interface design. It uses QtQuick which gives the designer the ability to -create smooth, animated user interfaces.") +user interface design. It uses QtQuick which gives the designer the ability +to create smooth, animated user interfaces.") (home-page "https://github.com/sddm/sddm") ;; QML files are MIT licensed and images are CC BY 3.0. (license (list license:gpl2+ license:expat license:cc-by3.0))))