[bug#47938] [PATCH 2/2] gnu: wlroots: Update to 0.13.0.

[bug#47938] [PATCH 2/2] gnu: wlroots: Update to 0.13.0.

[Alexandr Vityazev]

---
 gnu/packages/wm.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index f92b8f4d85..a694913ca8 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -45,6 +45,7 @@
 ;;; Copyright © 2021 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2021 qblade <qblade@protonmail.com>
 ;;; Copyright © 2021 lasnesne <lasnesne@lagunposprasihopre.org>
+;;; Copyright © 2021 Alexandr Vityazev <avityazev@posteo.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -1391,7 +1392,7 @@ functionality to display information about the most commonly used services.")
 (define-public wlroots
   (package
     (name "wlroots")
-    (version "0.12.0")
+    (version "0.13.0")
     (source
      (origin
        (method git-fetch)
@@ -1400,11 +1401,11 @@ functionality to display information about the most commonly used services.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "01j38lmgs2c6fq68v8b75pkilia2wsgzgp46ivfbi9hhx47kgcfn"))))
+        (base32 "01plhbnsp5yg18arz0v8fr0pr9l4w4pdzwkg9px486qdvb3s1vgy"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags '("-Dlogind-provider=elogind")
-       #:meson ,meson-0.55
+       #:meson ,meson-next
        #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'hardcode-paths
-- 
2.31.1



-- 

Alexandr Vityazev

[bug#47938] [PATCH] gnu: sway: Update to 1.6.

[Alexandr Vityazev]

Add argument #:meson ,meson-next to build correctly.
---
 gnu/packages/wm.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index a694913ca8..7f4af88721 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1440,7 +1440,7 @@ modules for building a Wayland compositor.")
 (define-public sway
   (package
     (name "sway")
-    (version "1.5.1")
+    (version "1.6")
     (source
      (origin
        (method git-fetch)
@@ -1449,10 +1449,11 @@ modules for building a Wayland compositor.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1xsa3h8zhf29p0mi90baxpr76jkd9pd1gr97ky8cnjbcs4isj9j0"))))
+        (base32 "0vnplva11yafhbijrk68wy7pw0psn9jm0caaymswq1s951xsn1c8"))))
     (build-system meson-build-system)
     (arguments
-     `(#:phases
+     `(#:meson ,meson-next
+       #:phases
        (modify-phases %standard-phases
          (add-before 'configure 'hardcode-paths
            (lambda* (#:key inputs #:allow-other-keys)
-- 
2.31.1



-- 

Alexandr Vityazev

bug#47938: [PATCH] gnu: sway: Update to 1.6.

[Jack Hill]

Thanks for preparing these patches. Sway and wlroots were already upgraded 
on the core-updates branch in afd2d66f2a4a7e4e7157f0a785491295434964c8 and 
b7daa450d93438e9c01fd72f930880e8d055921a. The new wlroots requires a new 
Wayland, which can only be updated on core updates because, according to 
`guix refresh -l wayland` 2474 would need to be rebuilt.

When the core-updates branch is merged, the new Sway and wlroots will 
become available. I don't know the timeline for that, but hopefully it 
won't be too long.

Therefore, I'm going to close this ticket. Thanks again for preparing it. 
For feedback on the patches, they looked good to me. Ordinarily, I would 
have tried to build them when reviewing as well, but I didn't in this case 
because of the Wayland dependency issue.

Best,
Jack