From acce45fe35b22f08be1edcbbb52a90c8ae52ff10 Mon Sep 17 00:00:00 2001
From: Rutherther <rutherther@ditigal.xyz>
Date: Thu, 13 Mar 2025 20:53:45 +0100
Subject: [PATCH] chore: update wlroots, dwl git versions

---
 ruther/packages/wayland.scm | 75 ++++++++++++++++++++++++-------------
 1 file changed, 50 insertions(+), 25 deletions(-)

diff --git a/ruther/packages/wayland.scm b/ruther/packages/wayland.scm
index 493a44e..0d5842b 100644
--- a/ruther/packages/wayland.scm
+++ b/ruther/packages/wayland.scm
@@ -77,37 +77,62 @@
     (inputs (modify-inputs (package-inputs wayland-protocols)
                      (replace "wayland" wayland-1.23)))))
 
-(define meson-1.5
-  (package/inherit meson
-    (name "meson-next")
-    (version "1.5.1")
+(define-public pixman-0.44.2
+  (package
+    (inherit pixman)
+    (name "pixman-next")
+    (version "0.44.2")
+    (arguments
+     (list
+      #:configure-flags
+      '(list
+        "-Dtimers=true"
+        "-Dgnuplot=true")))
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append
+         "https://www.cairographics.org/releases/pixman-"
+         version ".tar.gz"))
+       (sha256
+        (base32 "0riljxqzr1pgbgr7zm0888j74x1pn38r88dra9lsnf53w4f0cjb3"))
+       (patches
+        (origin-patches (package-source pixman)))))
+    (build-system meson:meson-build-system)))
+
+(define-public wayland-protocols/1.40
+  (package
+    (inherit wayland-protocols)
+    (name "wayland-protocols")
+    (version "1.40")
     (source (origin
-              (method url-fetch)
-              (uri (string-append "https://github.com/mesonbuild/meson/"
-                                  "releases/download/" version  "/meson-"
-                                  version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.freedesktop.org/wayland/wayland-protocols")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-                "1vab706pw1q17vh9rbsmlirgiji3k6wljl735lxffp95vwx56zjn"))))
-    (build-system python:python-build-system)))
+                "1lkn4gzpxgz4fg58s694m4g4scxwb1f4icxy72s85psfkzh6g5w1"))))))
 
 (define-public wlroots-0.19-dev
   (package/inherit wlroots
     (name "wlroots-dev")
-    (version "0.19.0-dev")
+    (version "0.19.0-954dba")
     (source
-        (origin
-          (inherit (package-source wlroots))
-          (method git-fetch)
-          (uri (git-reference
-                (url "https://gitlab.freedesktop.org/wlroots/wlroots")
-                (commit "2c64f36e8886d1f26daeb2a4ee79f3f9dd3d4c85")))
-          (file-name (git-file-name name version))
-          (sha256
-           (base32 "0671bgkl66gdw4bsbdi8ddcb5qzm98ykxillza0k2j9nvzfywlbs"))))
-    (arguments
-     (substitute-keyword-arguments (package-arguments wlroots)
-       ((#:meson meson #f) meson-1.5)))))
+     (origin
+       (inherit (package-source wlroots))
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
+             (commit "954dba3968c2eea3bf2c21defe01bf540fd102f9")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "16ac4cdlllwv9vw04fxp5c6zf9j88z3xc1v3l88p67ldhz8cw22z"))))
+    (propagated-inputs (modify-inputs (package-propagated-inputs wlroots)
+                         (replace "pixman" pixman-0.44.2)
+                         (replace "wayland-protocols" wayland-protocols/1.40)))))
 
 (define-public (make-dwl-xwayland dwl)
   (package/inherit dwl
@@ -159,9 +184,9 @@
        (method git-fetch)
        (uri (git-reference
              (url "https://codeberg.org/dwl/dwl.git")
-             (commit "334bbe6f0f5e4f77789b42ac9e5607d5076aef1b")))
+             (commit "aa69ed81b558f74e470e69cdcd442f9048ee624c")))
        (sha256
-        (base32 "1wsql3zs0mjndxzhbx84nkimls66l6zql79rb74lghlkwaajzaq9"))))
+        (base32 "0h05qdw97fddmfv6c8cvpq7vc0lw43cw11fdmkbnm7gq53cy9vm8"))))
     (inputs (list wlroots-0.19-dev))))
 
 (define-public dwlmsg
-- 
2.48.1