Apply upstream patch for libinput 1.31 compatibility
This commit is contained in:
parent
2ea14ebe8e
commit
5035af13d4
2 changed files with 53 additions and 1 deletions
48
backend-libinput-fix-build-with-libinput-1.31.patch
Normal file
48
backend-libinput-fix-build-with-libinput-1.31.patch
Normal file
|
|
@ -0,0 +1,48 @@
|
|||
From c1452d88114710f5772662b1d8efb9c71edaa34c Mon Sep 17 00:00:00 2001
|
||||
From: Aleksei Bavshin <alebastr89@gmail.com>
|
||||
Date: Sat, 7 Feb 2026 17:48:16 -0800
|
||||
Subject: [PATCH] backend/libinput: fix build with libinput 1.31
|
||||
|
||||
---
|
||||
backend/libinput/meson.build | 4 ++++
|
||||
backend/libinput/switch.c | 5 +++++
|
||||
2 files changed, 9 insertions(+)
|
||||
|
||||
diff --git a/backend/libinput/meson.build b/backend/libinput/meson.build
|
||||
index c244eb77a..091b0e0eb 100644
|
||||
--- a/backend/libinput/meson.build
|
||||
+++ b/backend/libinput/meson.build
|
||||
@@ -29,3 +29,7 @@ features += { 'libinput-backend': true }
|
||||
wlr_deps += libinput
|
||||
|
||||
internal_config.set10('HAVE_LIBINPUT_BUSTYPE', libinput.version().version_compare('>=1.26.0'))
|
||||
+internal_config.set10(
|
||||
+ 'HAVE_LIBINPUT_SWITCH_KEYPAD_SLIDE',
|
||||
+ libinput.version().version_compare('>=1.30.901')
|
||||
+)
|
||||
diff --git a/backend/libinput/switch.c b/backend/libinput/switch.c
|
||||
index abeec86d7..9dde3c9cb 100644
|
||||
--- a/backend/libinput/switch.c
|
||||
+++ b/backend/libinput/switch.c
|
||||
@@ -2,6 +2,7 @@
|
||||
#include <libinput.h>
|
||||
#include <wlr/interfaces/wlr_switch.h>
|
||||
#include "backend/libinput.h"
|
||||
+#include "config.h"
|
||||
|
||||
const struct wlr_switch_impl libinput_switch_impl = {
|
||||
.name = "libinput-switch",
|
||||
@@ -36,6 +37,10 @@ void handle_switch_toggle(struct libinput_event *event,
|
||||
case LIBINPUT_SWITCH_TABLET_MODE:
|
||||
wlr_event.switch_type = WLR_SWITCH_TYPE_TABLET_MODE;
|
||||
break;
|
||||
+#if HAVE_LIBINPUT_SWITCH_KEYPAD_SLIDE
|
||||
+ case LIBINPUT_SWITCH_KEYPAD_SLIDE:
|
||||
+ return;
|
||||
+#endif
|
||||
}
|
||||
switch (libinput_event_switch_get_switch_state(sevent)) {
|
||||
case LIBINPUT_SWITCH_STATE_OFF:
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
Name: wlroots
|
||||
Version: 0.19.2
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: A modular Wayland compositor library
|
||||
|
||||
# Source files/overall project licensed as MIT, but
|
||||
|
|
@ -39,6 +39,7 @@ Source3: examples.meson.build
|
|||
# Upstream patches
|
||||
# https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5203
|
||||
Patch: Fix-discarded-const-qualifier.patch
|
||||
Patch: %{url}/-/commit/c1452d88.patch#/backend-libinput-fix-build-with-libinput-1.31.patch
|
||||
|
||||
# Fedora patches
|
||||
# Following patch is required for phoc.
|
||||
|
|
@ -143,6 +144,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build
|
|||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 12 2026 Aleksei Bavshin <alebastr@fedoraproject.org> - 0.19.2-4
|
||||
- Apply upstream patch for libinput 1.31 compatibility
|
||||
|
||||
* Sat Jan 24 2026 Aleksei Bavshin <alebastr@fedoraproject.org> - 0.19.2-3
|
||||
- Rebuild for libdisplay-info 0.3.0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue