guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

branch staging updated: gnu: sddm: Fix building with newer qt-5.


From: guix-commits
Subject: branch staging updated: gnu: sddm: Fix building with newer qt-5.
Date: Mon, 29 Aug 2022 07:49:24 -0400

This is an automated email from the git hooks/post-receive script.

efraim pushed a commit to branch staging
in repository guix.

The following commit(s) were added to refs/heads/staging by this push:
     new 36078f15ce gnu: sddm: Fix building with newer qt-5.
36078f15ce is described below

commit 36078f15cef26ffeda486df5659763d09c99cbff
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Mon Aug 29 14:33:10 2022 +0300

    gnu: sddm: Fix building with newer qt-5.
    
    * gnu/packages/display-managers.scm (sddm)[source]: Add snippet to
    adjust to newer qt-5 code.
---
 gnu/packages/display-managers.scm | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/display-managers.scm 
b/gnu/packages/display-managers.scm
index 6c1c5b6c25..cbcceba8f4 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -10,7 +10,7 @@
 ;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
-;;; Copyright © 2021 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2021, 2022 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2021 Petr Hodina <phodina@protonmail.com>
 ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com>
 ;;;
@@ -75,7 +75,16 @@
                     "sddm-" version ".tar.xz"))
               (sha256
                (base32
-                "0hcdysw8ibr66vk8i7v56l0v5ijvhlq67v4460mc2xf2910g2m72"))))
+                "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)])"))))))
     (build-system qt-build-system)
     (native-inputs
      (list extra-cmake-modules pkg-config qttools-5))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]