01/17: gnu: sway: Fix build with newer libinput.

[guix-commits]

jpoiret pushed a commit to branch core-updates
in repository guix.

commit 94dddd4bc460467f83c53f52854422ff907de9fa
Author: Josselin Poiret <dev@jpoiret.xyz>
AuthorDate: Thu Dec 28 16:56:12 2023 +0100

    gnu: sway: Fix build with newer libinput.
    
    * gnu/packages/patches/sway-add-libinput-config-accel.patch: New patch.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/wm.scm (sway): Use it.
    
    Change-Id: I6e1c9f4efd33eeb2922550156d560f7125a620b4
---
 gnu/local.mk                                       |  1 +
 .../patches/sway-add-libinput-config-accel.patch   | 49 ++++++++++++++++++++++
 gnu/packages/wm.scm                                |  3 +-
 3 files changed, 52 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6b40b16723..59899a71f3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2064,6 +2064,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/superlu-dist-awpm-grid.patch            \
   %D%/packages/patches/superlu-dist-scotchmetis.patch          \
   %D%/packages/patches/supertux-unbundle-squirrel.patch                \
+  %D%/packages/patches/sway-add-libinput-config-accel.patch    \
   %D%/packages/patches/swig-support-gcc-12.patch               \
   %D%/packages/patches/swish-e-search.patch                    \
   %D%/packages/patches/swish-e-format-security.patch           \
diff --git a/gnu/packages/patches/sway-add-libinput-config-accel.patch 
b/gnu/packages/patches/sway-add-libinput-config-accel.patch
new file mode 100644
index 0000000000..29d6b13800
--- /dev/null
+++ b/gnu/packages/patches/sway-add-libinput-config-accel.patch
@@ -0,0 +1,49 @@
+From dee032d0a0ecd958c902b88302dc59703d703c7f Mon Sep 17 00:00:00 2001
+From: Simon Ser <contact@emersion.fr>
+Date: Sun, 26 Mar 2023 23:27:40 +0200
+Subject: [PATCH] ipc: add LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM entry
+
+This was introduced in the last libinput release.
+
+Fixes the following error:
+
+    ../sway/ipc-json.c:928:17: error: enumeration value 
'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM' not handled in switch [-Werror=switch]
+      928 |                 switch 
(libinput_device_config_accel_get_profile(device)) {
+          |                 ^~~~~~
+---
+ meson.build     | 5 +++++
+ sway/ipc-json.c | 5 +++++
+ 2 files changed, 10 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 84e7c6c56f..d1fbfa38ab 100644
+--- a/meson.build
++++ b/meson.build
+@@ -117,6 +117,11 @@ conf_data.set10('HAVE_LIBSYSTEMD', sdbus.found() and 
sdbus.name() == 'libsystemd
+ conf_data.set10('HAVE_LIBELOGIND', sdbus.found() and sdbus.name() == 
'libelogind')
+ conf_data.set10('HAVE_BASU', sdbus.found() and sdbus.name() == 'basu')
+ conf_data.set10('HAVE_TRAY', have_tray)
++conf_data.set10('HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM', 
cc.has_header_symbol(
++      'libinput.h',
++      'LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM',
++      dependencies: libinput,
++))
+ 
+ scdoc = dependency('scdoc', version: '>=1.9.2', native: true, required: 
get_option('man-pages'))
+ if scdoc.found()
+diff --git a/sway/ipc-json.c b/sway/ipc-json.c
+index 51e6a99518..c7cbea0136 100644
+--- a/sway/ipc-json.c
++++ b/sway/ipc-json.c
+@@ -935,6 +935,11 @@ static json_object *describe_libinput_device(struct 
libinput_device *device) {
+               case LIBINPUT_CONFIG_ACCEL_PROFILE_ADAPTIVE:
+                       accel_profile = "adaptive";
+                       break;
++#if HAVE_LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM
++              case LIBINPUT_CONFIG_ACCEL_PROFILE_CUSTOM:
++                      accel_profile = "custom";
++                      break;
++#endif
+               }
+               json_object_object_add(object, "accel_profile",
+                               json_object_new_string(accel_profile));
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index 3a69e78c0f..6c1d227f74 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -1740,7 +1740,8 @@ modules for building a Wayland compositor.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1y7brfrsjnm9gksijgnr6zxqiqvn06mdiwsk5j87ggmxazxd66av"))))
+        (base32 "1y7brfrsjnm9gksijgnr6zxqiqvn06mdiwsk5j87ggmxazxd66av"))
+       (patches (search-patches "sway-add-libinput-config-accel.patch"))))
     (build-system meson-build-system)
     (arguments
      `(;; elogind is propagated by wlroots -> libseat