[bug#72812] [PATCH 0/2] gnu: guix-simplyblack-sddm-theme: Update to 0.2.

[bug#72812] [PATCH 0/2] gnu: guix-simplyblack-sddm-theme: Update to 0.2.

[Fredrik Salomonsson]

Hi,

Here is an update to guix-simplyblack-sddm-theme, as it broke when
moving to qt-6.  There are still some minor things I still need to
iron out on it, but it should now be usable.  I have only tested this
in a VM as I dropped SDDM on my main machine.  Given that it can only
work for one qt major version at the time I also added a -qt5 variant
as well for those that cannot move to qt-6.

Thanks

Fredrik Salomonsson (2):
  gnu: guix-simplyblack-sddm-theme: Update to 0.2.
  gnu: Add guix-simplyblack-sddm-theme-qt5.

 gnu/packages/display-managers.scm | 58 +++++++++++++++++++++----------
 1 file changed, 39 insertions(+), 19 deletions(-)


base-commit: 9640f4a01ab9d895f8a4d448ccdcbe538aaa4630
-- 
2.45.2

[bug#72812] [PATCH 1/2] gnu: guix-simplyblack-sddm-theme: Update to 0.2.

[Fredrik Salomonsson]

* gnu/packages/display-managers.scm (guix-simplyblack-sddm-theme): Update to 0.2.

Change-Id: I2332f51da9c9a41bdd9a55af2a5d2f3336e6c586
---
 gnu/packages/display-managers.scm | 45 ++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 19 deletions(-)

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index eccf2e199e..55c50d59d0 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -7,7 +7,7 @@
 ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
 ;;; Copyright © 2017, 2020 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2020 L  p R n  d n <guix@lprndn.info>
-;;; Copyright © 2020 Fredrik Salomonsson <plattfot@gmail.com>
+;;; Copyright © 2020, 2024 Fredrik Salomonsson <plattfot@posteo.net>
 ;;; Copyright © 2020 Vincent Legoll <vincent.legoll@gmail.com>
 ;;; Copyright © 2021 Zheng Junjie <873216071@qq.com>
 ;;; Copyright © 2021-2023 Efraim Flashner <efraim@flashner.co.il>
@@ -221,26 +221,33 @@ (define-public dexy-color-sddm-theme
 (define-public guix-simplyblack-sddm-theme
   (package
     (name "guix-simplyblack-sddm-theme")
-    (version "0.1")
-    (source (origin
-              (method git-fetch)
-              (uri (git-reference
-                    (url "https://github.com/plattfot/guix-simplyblack-sddm")
-                    (commit version)))
-              (file-name (git-file-name name version))
-              (sha256
-               (base32 "1fwny6b0xpjs8ad2b16pyxd27gf0sr0nillmhc2h5k0q7dva21vi"))))
+    (version "0.2")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/plattfot/guix-simplyblack-sddm")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "09vb9b0pmyhj6fh0b6by59bykszbkdayhz678pnb4pyrdmlvv1am"))))
     (build-system trivial-build-system)
     (arguments
-     `(#:modules ((guix build utils))
-       #:builder
-       (begin
-         (use-modules (guix build utils))
-         (let* ((out (assoc-ref %outputs "out"))
-                (sddm-themes (string-append out "/share/sddm/themes")))
-           (mkdir-p sddm-themes)
-           (copy-recursively (assoc-ref %build-inputs "source")
-                             (string-append sddm-themes "/guix-simplyblack-sddm"))))))
+     `(#:modules ((guix build utils)
+                  (srfi srfi-26))
+       #:builder (begin
+                   (use-modules (guix build utils)
+                                (srfi srfi-26))
+                   (let* ((out (assoc-ref %outputs "out"))
+                          (themes-dir (string-append out
+                                       "/share/sddm/themes/guix-simplyblack-sddm/")))
+                     (mkdir-p themes-dir)
+                     (copy-recursively (assoc-ref %build-inputs "source")
+                                       themes-dir)
+                     (substitute* (map (cut string-append themes-dir <>)
+                                       '("Main.qml" "theme.conf"))
+                       (("file:")
+                        themes-dir))))))
     (home-page "https://github.com/plattfot/guix-simplyblack-sddm")
     (synopsis "Guix based theme for SDDM")
     (description

base-commit: 9640f4a01ab9d895f8a4d448ccdcbe538aaa4630
-- 
2.45.2

[bug#72812] [PATCH 2/2] gnu: Add guix-simplyblack-sddm-theme-qt5.

[Fredrik Salomonsson]

* gnu/packages/display-managers.scm (guix-simplyblack-sddm-theme-qt5): New variable.

Change-Id: Ia4caa3126a37b8b4f885286d60a27cd72272a75b
---
 gnu/packages/display-managers.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm
index 55c50d59d0..9fef85d71f 100644
--- a/gnu/packages/display-managers.scm
+++ b/gnu/packages/display-managers.scm
@@ -256,6 +256,19 @@ (define-public guix-simplyblack-sddm-theme
     ;; Theme under cc-by-sa3.0, guix logo under license:cc-by-sa4.0
     (license (list license:cc-by-sa3.0 license:cc-by-sa4.0))))
 
+(define-public guix-simplyblack-sddm-theme-qt5
+  (package
+    (inherit guix-simplyblack-sddm-theme)
+    (name "guix-simplyblack-sddm-theme-qt5")
+    (source
+     (origin
+       (inherit (package-source guix-simplyblack-sddm-theme))
+       (modules '((guix build utils)))
+       (snippet '(begin
+                   (substitute* "metadata.desktop"
+                     (("QtVersion=6")
+                      "QtVersion=5"))))))))
+
 (define-public chili-sddm-theme
   (package
     (name "chili-sddm-theme")
-- 
2.45.2

bug#72812: [PATCH 0/2] gnu: guix-simplyblack-sddm-theme: Update to 0.2.

[Ludovic Courtès]

Hi Fredrik,

Fredrik Salomonsson <plattfot@posteo.net> skribis:

> Here is an update to guix-simplyblack-sddm-theme, as it broke when
> moving to qt-6.  There are still some minor things I still need to
> iron out on it, but it should now be usable.  I have only tested this
> in a VM as I dropped SDDM on my main machine.  Given that it can only
> work for one qt major version at the time I also added a -qt5 variant
> as well for those that cannot move to qt-6.
>
> Thanks
>
> Fredrik Salomonsson (2):
>   gnu: guix-simplyblack-sddm-theme: Update to 0.2.
>   gnu: Add guix-simplyblack-sddm-theme-qt5.

Finally applied, thanks!

(Well, I can’t push right now because Savannah is overloaded again…)

Ludo’.