From patchwork Thu Dec 28 03:05:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Feng Shu X-Patchwork-Id: 58125 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 E0A5027BBE9; Thu, 28 Dec 2023 03:06:24 +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 687D327BBE2 for ; Thu, 28 Dec 2023 03:06:21 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rIgik-0002sf-Qn; Wed, 27 Dec 2023 22:06:06 -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 1rIgii-0002sI-5I for guix-patches@gnu.org; Wed, 27 Dec 2023 22:06:04 -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 1rIgih-00022W-Pq for guix-patches@gnu.org; Wed, 27 Dec 2023 22:06:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rIgig-00037z-Du for guix-patches@gnu.org; Wed, 27 Dec 2023 22:06:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#68020] [PATCH v2] gnu: sddm: Update to 0.20.0. References: <875y0moqr2.fsf@163.com> In-Reply-To: <875y0moqr2.fsf@163.com> Resent-From: Feng Shu Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Dec 2023 03:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68020 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 68020@debbugs.gnu.org Received: via spool by 68020-submit@debbugs.gnu.org id=B68020.170373274812000 (code B ref 68020); Thu, 28 Dec 2023 03:06:02 +0000 Received: (at 68020) by debbugs.gnu.org; 28 Dec 2023 03:05:48 +0000 Received: from localhost ([127.0.0.1]:38210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIgiR-00037S-E3 for submit@debbugs.gnu.org; Wed, 27 Dec 2023 22:05:47 -0500 Received: from m12.mail.163.com ([220.181.12.199]:44604) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rIgiN-00037E-6S for 68020@debbugs.gnu.org; Wed, 27 Dec 2023 22:05:45 -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=ukYi9yuP51Hss9O89O+BPm7X38G3HB5SFkm2QfRc90M=; b=jN22rquRlZJlMwH1n92UToGDJF2EklAfXI9AsuCERc2cqB2wr27eBwN0lhoRJQ 88/bS3PMKOI/EmnikYs7akWFZH/hGtMh74hxGK0nj14ZMgGVCBeiJTYJNDTInykM huA/BBS63+SdY0wPRT5rCrsNuiwUMPinYC/mj+8bLFAmM= Received: from Tumashu (unknown [218.92.14.78]) by zwqz-smtp-mta-g3-4 (Coremail) with SMTP id _____wDXlqD95YxlOxbHAw--.3457S2; Thu, 28 Dec 2023 11:05:33 +0800 (CST) From: Feng Shu Date: Thu, 28 Dec 2023 11:05:32 +0800 Message-ID: <87jzozgh6r.fsf@163.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-CM-TRANSID: _____wDXlqD95YxlOxbHAw--.3457S2 X-Coremail-Antispam: 1Uf129KBjvJXoWxCr4ftw4UuF18GFyUZF15CFg_yoWruw15pa yFkr4Ygw1DArn8JrWqqF4j9r4rKr97Ar4xCw18A340g3WYvFZav34IkFW5uFZxJ3WIkay7 WFWrXw1UXa48GrJanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07Ud9N-UUUUU= X-Originating-IP: [218.92.14.78] X-CM-SenderInfo: 5wxpt2lkx6il2tof0z/1tbiwABU1FXlx2c+swAAsd 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 44ff0461d617fce7b7122edefeaf0f06de7ca946 Mon Sep 17 00:00:00 2001 From: Feng Shu Date: Mon, 25 Dec 2023 12:10:43 +0800 Subject: [PATCH v2] gnu: sddm: Update to 0.20.0. * gnu/packages/display-managers.scm (sddm)[version]: Update to 0.20.0. [source]: Remove snippet and use git-fetch method instead. [arguments]: Use gexp, remove outdate comment and handle /include/qt5 dir of qtdeclarative. Change-Id: I6f6bd80291c36b1b80c9ff7f2154593cea2c9d87 --- gnu/packages/display-managers.scm | 80 ++++++++++++++----------------- 1 file changed, 37 insertions(+), 43 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 7120c2ad75..2df4e6311b 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -69,25 +69,16 @@ (define-module (gnu packages display-managers) (define-public sddm (package (name "sddm") - (version "0.19.0") + (version "0.20.0") (source (origin - (method url-fetch) - (uri (string-append - "https://github.com/sddm/sddm" - "/releases/download/v" version "/" - "sddm-" version ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://github.com/sddm/sddm") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (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)])")))))) + "1450zv03d3mbid27986p4mdshw9qf3ar8crl4idybf7khxgan22y")))) (build-system qt-build-system) (native-inputs (list extra-cmake-modules pkg-config qttools-5)) @@ -109,36 +100,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))))