Subject: Re: bug#53581: Acknowledgement ([PATCH 1/8] gnu: libdrm: Update to 2.4.109.)

From: phodina <[email-masked]>
Date: Sun, 17 Apr 2022 02:26:06 +0000

Hi,

here are updated patches rebased on core-update branch.

----
Petr

From aeb2c69293ccc644a8e7e5d13ad71f69076720b0 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:04:28 +0100
Subject: [PATCH v2 1/9] gnu: libdrm: Update to 2.4.110.

* gnu/packages/xdisorg.scm (libdrm): Update to 2.4.110.

diff --git a/gnu/packages/xdisorg.scm b/gnu/packages/xdisorg.scm
index d2caee85ec..f331f62abd 100644
--- a/gnu/packages/xdisorg.scm
+++ b/gnu/packages/xdisorg.scm
@@ -54,6 +54,7 @@
 ;;; Copyright © 2021 jgart <[email-masked]>
 ;;; Copyright © 2022 John Kehayias <[email-masked]>
 ;;; Copyright © 2022 Jai Vetrivelan <[email-masked]>
+;;; Copyright © 2022 Petr Hodina <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -623,7 +624,7 @@ (define-public pixman
 (define-public libdrm
   (package
     (name "libdrm")
-    (version "2.4.107")
+    (version "2.4.110")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -631,7 +632,7 @@ (define-public libdrm
                     version ".tar.xz"))
               (sha256
                (base32
-                "127qf1rzhaf13vdd75a58v5q34617hvangjlfnlkcdh37gqcwm65"))))
+                "0dwpry9m5l27dlhq48j4bsiqwm0247cxdqwv3b7ddmkynk2f9kpf"))))
     (build-system meson-build-system)
     (arguments
      `(#:configure-flags
-- 
2.35.1

From db559186745704fc99252183958d4b718c25d076 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Thu, 27 Jan 2022 09:28:26 +0100
Subject: [PATCH v2 6/9] gnu: cagebreak: Update to 1.8.3.

* gnu/packages/wm.scm (cagebreak): Update to 1.8.3.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 166bd74419..ff10c21147 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2514,7 +2514,7 @@ (define-public xnotify
 (define-public cagebreak
   (package
     (name "cagebreak")
-    (version "1.8.0")
+    (version "1.8.3")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -2523,13 +2523,18 @@ (define-public cagebreak
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0296mnzk7qd0zvnhw716jvpp7madjsar373ixx4qcff0m0jwfrxm"))))
+                "0vm97ak0589v39m3fljf1qhy92dqgiqcrrfp757gg7q58qwa6dkf"))))
     (build-system meson-build-system)
-    (arguments '(#:configure-flags '("-Dxwayland=true")))
-    (native-inputs
-     (list pandoc pkg-config))
-    (inputs
-     (list libevdev pango wlroots))
+    (arguments
+     `(#:configure-flags '("-Dxwayland=true")
+       #:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'fix-data-dir
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "meson.build"
+               (("/etc/") (string-append (assoc-ref outputs "out") "/etc"))))))))
+    (native-inputs (list pandoc pkg-config))
+    (inputs (list libevdev pango wlroots))
     (home-page "https://github.com/project-repo/cagebreak")
     (synopsis "Tiling wayland compositor inspired by ratpoison")
     (description
-- 
2.35.1

From 1080c13d8f0b694cc51aadb4ebc417d17c777e7f Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:09:02 +0100
Subject: [PATCH v2 3/9] gnu: wayland-protocols: Update to 1.24.

* gnu/packages/freedesktop.scm (wayland-protocols): Update to 1.24.

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 129a59386c..181e7f1bd2 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -1031,7 +1031,7 @@ (define-public wayland
 (define-public wayland-protocols
   (package
     (name "wayland-protocols")
-    (version "1.23")
+    (version "1.24")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -1039,7 +1039,7 @@ (define-public wayland-protocols
                     "wayland-protocols-" version ".tar.xz"))
               (sha256
                (base32
-                "0xizccackgwszjhlq7jjiv2z2gwppljx0w32ga91bxlnby8z22kc"))))
+                "1hlb6gvyqlmsdkv5179ccj07p04cn6xacjkgklakbszczv7xiw5z"))))
     (build-system meson-build-system)
     (inputs
      (list wayland))
-- 
2.35.1

From 744c548d5c5a2b6076339bf4c75148b7e8909c0e Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Thu, 27 Jan 2022 09:34:07 +0100
Subject: [PATCH v2 8/9] gnu: hikari: Update to 2.3.3.

* gnu/packages/wm.scm (hikari): Update to 2.3.3.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index e643e0f25b..eb74342ce5 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2571,14 +2571,14 @@ (define-public libucl
 (define-public hikari
   (package
     (name "hikari")
-    (version "2.3.2")
+    (version "2.3.3")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://hikari.acmelabs.space/releases/"
                            "hikari-" version ".tar.gz"))
        (sha256
-        (base32 "1jvy21irh6s7czff2hk63spswqibjcjhrpsgmrki5bii9ddi73wy"))))
+        (base32 "1qjd9dhpmv75idf6jjzwff8wgliad4d0af8pih9526p14vrnyws0"))))
     (build-system gnu-build-system)
     (native-inputs
      (list bmake pkg-config wayland-protocols))
-- 
2.35.1

From f954afbd487a3aa7d578cc7155d5793c216a5267 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:12:34 +0100
Subject: [PATCH v2 5/9] gnu: sway: Update to 1.7.

* gnu/packages/wm.scm (sway): Update to 1.7.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 59cad3c2a0..166bd74419 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1578,7 +1578,7 @@ (define-public wlroots
 (define-public sway
   (package
     (name "sway")
-    (version "1.6.1")
+    (version "1.7")
     (source
      (origin
        (method git-fetch)
@@ -1587,7 +1587,7 @@ (define-public sway
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0j4sdbsrlvky1agacc0pcz9bwmaxjmrapjnzscbd2i0cria2fc5j"))))
+        (base32 "0ss3l258blyf2d0lwd7pi7ga1fxfj8pxhag058k7cmjhs3y30y5l"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
2.35.1

From 37e22a0974dbb94b1f912a30f3d56cd108802b1e Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Sun, 17 Apr 2022 04:10:45 +0200
Subject: [PATCH v2 9/9] gnu: hikari: Simplify inputs.

* gnu/packages/wm.scm (hikari)[inputs]: Simplify.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index eb74342ce5..0a0551113e 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -2583,14 +2583,14 @@ (define-public hikari
     (native-inputs
      (list bmake pkg-config wayland-protocols))
     (inputs
-     `(("cairo" ,cairo)
-       ("libinput" ,libinput)
-       ("libucl" ,libucl)
-       ("libxkbcommon" ,libxkbcommon)
-       ("pam" ,linux-pam)
-       ("pango" ,pango)
-       ("wayland" ,wayland)
-       ("wlroots" ,wlroots)))
+     (list cairo
+           libinput
+           libucl
+           libxkbcommon
+           linux-pam
+           pango
+           wayland
+           wlroots))
     (arguments
      `(#:tests? #f                      ; no tests
        #:make-flags
-- 
2.35.1

From bcccb9e01eb294bab7a7d2e0bba96de6d7487d02 Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:09:58 +0100
Subject: [PATCH v2 4/9] gnu: wlroots: Update to 0.15.1.

* gnu/packages/wm.scm (wlroots): Update to 0.15.1.
  [source]: Update url link to
  'https://gitlab.freedesktop.org/wlroots/wlroots' due to original link
  pointing now to archived repo.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 3de760d7a6..59cad3c2a0 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -45,7 +45,7 @@
 ;;; Copyright © 2021 Sharlatan Hellseher <[email-masked]>
 ;;; Copyright © 2021 qblade <[email-masked]>
 ;;; Copyright © 2021 lasnesne <[email-masked]>
-;;; Copyright © 2021 Petr Hodina <[email-masked]>
+;;; Copyright © 2021, 2022 Petr Hodina <[email-masked]>
 ;;; Copyright © 2021 jgart <[email-masked]>
 ;;; Copyright © 2021 Disseminate Dissent <[email-masked]>
 ;;; Copyright © 2022 John Kehayias <[email-masked]>
@@ -1532,16 +1532,16 @@ (define-public polybar
 (define-public wlroots
   (package
     (name "wlroots")
-    (version "0.14.1")
+    (version "0.15.1")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
-             (url "https://github.com/swaywm/wlroots")
+             (url "https://gitlab.freedesktop.org/wlroots/wlroots")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1sshp3lvlkl1i670kxhwsb4xzxl8raz6769kqvgmxzcb63ns9ay1"))))
+        (base32 "00s73nhi3sc48l426jdlqwpclg41kx1hv0yk4yxhbzw19gqpfm1h"))))
     (build-system meson-build-system)
     (arguments
      `(#:phases
-- 
2.35.1

From b3c71c2101e7bf1f833d5fcaeeb21241d1b0241d Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Thu, 27 Jan 2022 09:31:00 +0100
Subject: [PATCH v2 7/9] gnu: dwl: Update to 0.3.1.

* gnu/packages/wm.scm (dwl): Update to 0.3.1.

diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index ff10c21147..e643e0f25b 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1411,7 +1411,7 @@ (define-public cwm
 (define-public dwl
   (package
     (name "dwl")
-    (version "0.2.1")
+    (version "0.3.1")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -1420,7 +1420,7 @@ (define-public dwl
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0js8xjc2rx1ml6s58s90jrak5n7vh3kj5na2j4yy3qy0cb501xcm"))))
+                "0952kajc60ijy6qz14y6s5n7dyyf14ndzrhs4ynxj97k76742z2l"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
-- 
2.35.1

From 890321f986bca42cf0d1d178e8cd3ca4af6e21ec Mon Sep 17 00:00:00 2001
From: Petr Hodina <[email-masked]>
Date: Wed, 26 Jan 2022 18:07:17 +0100
Subject: [PATCH v2 2/9] gnu: wayland: Update to 1.20.0.

* gnu/packages/freedesktop.scm (wayland): Update to 1.20.0.

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 55bde8e705..129a59386c 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -29,6 +29,7 @@
 ;;; Copyright © 2021 John Kehayias <[email-masked]>
 ;;; Copyright © 2021 Maxim Cournoyer <[email-masked]>
 ;;; Copyright © 2022 Daniel Meißner <[email-masked]>
+;;; Copyright © 2022 Petr Hodina <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -965,14 +966,14 @@ (define-public python2-pyxdg
 (define-public wayland
   (package
     (name "wayland")
-    (version "1.19.0")
+    (version "1.20.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://wayland.freedesktop.org/releases/"
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "05bd2vphyx8qwa1mhsj1zdaiv4m4v94wrlssrn0lad8d601dkk5s"))))
+                "09c7rpbwavjg4y16mrfa57gk5ix6rnzpvlnv1wp7fnbh9hak985q"))))
     (build-system meson-build-system)
     (outputs '("out" "doc"))
     (arguments
-- 
2.35.1