Package: guix-patches;
Reported by: Feng Shu <tumashu <at> 163.com>
Date: Mon, 25 Dec 2023 04:24:01 UTC
Severity: normal
Tags: patch
Done: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Bug is archived. No further changes may be made.
To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 68020 in the body.
You can then email your comments to 68020 AT debbugs.gnu.org in the normal way.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#68020; Package guix-patches.
(Mon, 25 Dec 2023 04:24:01 GMT) Full text and rfc822 format available.Feng Shu <tumashu <at> 163.com>:guix-patches <at> gnu.org.
(Mon, 25 Dec 2023 04:24:02 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Feng Shu <tumashu <at> 163.com> To: "guix-patches" <guix-patches <at> gnu.org> Subject: [PATCH] gnu: sddm: Update to 0.20.0. Date: Mon, 25 Dec 2023 12:22:41 +0800
From 130e5ef2bf10970d49395c2f0042ae7075bb8946 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu <at> 163.com>
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 <https://github.com/sddm/sddm/pull/616> 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))))
--
2.39.2
--
guix-patches <at> gnu.org:bug#68020; Package guix-patches.
(Thu, 28 Dec 2023 03:06:02 GMT) Full text and rfc822 format available.Message #8 received at 68020 <at> debbugs.gnu.org (full text, mbox):
From: Feng Shu <tumashu <at> 163.com> To: 68020 <at> debbugs.gnu.org Subject: [PATCH v2] gnu: sddm: Update to 0.20.0. Date: Thu, 28 Dec 2023 11:05:32 +0800
From 44ff0461d617fce7b7122edefeaf0f06de7ca946 Mon Sep 17 00:00:00 2001
From: Feng Shu <tumashu <at> 163.com>
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 <https://github.com/sddm/sddm/pull/616> 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))))
--
2.39.2
--
Maxim Cournoyer <maxim.cournoyer <at> gmail.com>:Feng Shu <tumashu <at> 163.com>:Message #13 received at 68020-done <at> debbugs.gnu.org (full text, mbox):
From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com> To: Feng Shu <tumashu <at> 163.com> Cc: 68020-done <at> debbugs.gnu.org Subject: Re: [bug#68020] [PATCH v2] gnu: sddm: Update to 0.20.0. Date: Wed, 03 Jan 2024 23:00:32 -0500
Hello, Feng Shu <tumashu <at> 163.com> writes: >>From 44ff0461d617fce7b7122edefeaf0f06de7ca946 Mon Sep 17 00:00:00 2001 > From: Feng Shu <tumashu <at> 163.com> > 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. Applied! -- Thanks, Maxim
Debbugs Internal Request <help-debbugs <at> gnu.org>
to internal_control <at> debbugs.gnu.org.
(Thu, 01 Feb 2024 12:24:10 GMT) Full text and rfc822 format available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.