sway: drop libinput patch

wayland/sway/build

@@ -3,7 +3,6 @@
 # Build fails with gcc 12 due to -Werror.
 export CFLAGS="$CFLAGS -Wno-error"
 
-patch -p1 < no-evdev.patch
 patch -p1 < pcre2.patch
 
 # Default background color.

wayland/sway/checksums

@@ -1,3 +1,2 @@
 0c64536fb2883ec518e75cfb119f9300115fb49b084e3fde62b794fe2c6c8d84
-089a4e120c4c99ff784f7e5fc0f050f8416b4d5b98d418c2d36afe3f31da3349
 82095453e072da69ee26d9f221f7c25ecf5f092882727e4d2c755d8ad6aa78ee

wayland/sway/depends

@@ -1,6 +1,7 @@
 cairo
 flex make
 json-c
+libevdev
 libinput
 libseat
 libxkbcommon

wayland/sway/patches/no-evdev.patch

@@ -1,119 +0,0 @@
-diff --git a/meson.build b/meson.build
-index 5e4de87..091798d 100644
---- a/meson.build
-+++ b/meson.build
-@@ -49,7 +49,6 @@ pangocairo = dependency('pangocairo')
- gdk_pixbuf = dependency('gdk-pixbuf-2.0', required: get_option('gdk-pixbuf'))
- pixman = dependency('pixman-1')
- glesv2 = dependency('glesv2')
--libevdev = dependency('libevdev')
- libinput = dependency('libinput', version: '>=1.6.0')
- xcb = dependency('xcb', required: get_option('xwayland'))
- drm_full = dependency('libdrm') # only needed for drm_fourcc.h
-diff --git a/sway/commands/bar/bind.c b/sway/commands/bar/bind.c
-index b4b5bc4..5087bff 100644
---- a/sway/commands/bar/bind.c
-+++ b/sway/commands/bar/bind.c
-@@ -1,4 +1,4 @@
--#include <libevdev/libevdev.h>
-+#include <linux/input.h>
- #include <stdlib.h>
- #include <string.h>
- #include <strings.h>
-diff --git a/sway/commands/bind.c b/sway/commands/bind.c
-index 25be415..93f751b 100644
---- a/sway/commands/bind.c
-+++ b/sway/commands/bind.c
-@@ -1,5 +1,4 @@
- #define _POSIX_C_SOURCE 200809L
--#include <libevdev/libevdev.h>
- #include <linux/input-event-codes.h>
- #include <string.h>
- #include <strings.h>
-diff --git a/sway/commands/input/scroll_button.c b/sway/commands/input/scroll_button.c
-index 6b33141..7d4cab4 100644
---- a/sway/commands/input/scroll_button.c
-+++ b/sway/commands/input/scroll_button.c
-@@ -1,4 +1,4 @@
--#include <libevdev/libevdev.h>
-+#include <linux/input.h>
- #include "sway/config.h"
- #include "sway/commands.h"
- #include "sway/input/cursor.h"
-diff --git a/sway/input/cursor.c b/sway/input/cursor.c
-index 6fddee9..5f405bd 100644
---- a/sway/input/cursor.c
-+++ b/sway/input/cursor.c
-@@ -1,7 +1,7 @@
- #define _POSIX_C_SOURCE 200809L
- #include <assert.h>
- #include <math.h>
--#include <libevdev/libevdev.h>
-+#include <libinput.h>
- #include <linux/input-event-codes.h>
- #include <errno.h>
- #include <time.h>
-@@ -1231,7 +1231,7 @@ uint32_t get_mouse_bindsym(const char *name, char **error) {
- 		return buttons[number - 1];
- 	} else if (strncmp(name, "BTN_", strlen("BTN_")) == 0) {
- 		// Get event code from name
--		int code = libevdev_event_code_from_name(EV_KEY, name);
-+		int code = libinput_event_code_from_name(EV_KEY, name);
- 		if (code == -1) {
- 			size_t len = snprintf(NULL, 0, "Unknown event %s", name) + 1;
- 			*error = malloc(len);
-@@ -1257,7 +1257,7 @@ uint32_t get_mouse_bindcode(const char *name, char **error) {
- 		*error = strdup("Button event code out of range.");
- 		return 0;
- 	}
--	const char *event = libevdev_event_code_get_name(EV_KEY, code);
-+	const char *event = libinput_event_code_get_name(EV_KEY, code);
- 	if (!event || strncmp(event, "BTN_", strlen("BTN_")) != 0) {
- 		size_t len = snprintf(NULL, 0, "Event code %d (%s) is not a button",
- 				code, event ? event : "(null)") + 1;
-@@ -1280,7 +1280,7 @@ uint32_t get_mouse_button(const char *name, char **error) {
- }
- 
- const char *get_mouse_button_name(uint32_t button) {
--	const char *name = libevdev_event_code_get_name(EV_KEY, button);
-+	const char *name = libinput_event_code_get_name(EV_KEY, button);
- 	if (!name) {
- 		if (button == SWAY_SCROLL_UP) {
- 			name = "SWAY_SCROLL_UP";
-diff --git a/sway/input/seatop_default.c b/sway/input/seatop_default.c
-index 4320a3b..7dda2f0 100644
---- a/sway/input/seatop_default.c
-+++ b/sway/input/seatop_default.c
-@@ -1,6 +1,6 @@
- #define _POSIX_C_SOURCE 200809L
- #include <float.h>
--#include <libevdev/libevdev.h>
-+#include <linux/input.h>
- #include <wlr/types/wlr_cursor.h>
- #include <wlr/types/wlr_tablet_v2.h>
- #include <wlr/types/wlr_xcursor_manager.h>
-diff --git a/sway/ipc-json.c b/sway/ipc-json.c
-index 1b64f86..a65a009 100644
---- a/sway/ipc-json.c
-+++ b/sway/ipc-json.c
-@@ -1,7 +1,7 @@
- #include <ctype.h>
- #include <float.h>
- #include <json.h>
--#include <libevdev/libevdev.h>
-+#include <linux/input.h>
- #include <stdio.h>
- #include <wlr/backend/libinput.h>
- #include <wlr/types/wlr_output.h>
-diff --git a/sway/meson.build b/sway/meson.build
-index 8eab31a..d52b855 100644
---- a/sway/meson.build
-+++ b/sway/meson.build
-@@ -208,7 +208,6 @@ sway_deps = [
- 	cairo,
- 	drm,
- 	jsonc,
--	libevdev,
- 	libinput,
- 	libudev,
- 	math,

wayland/sway/sources

@@ -1,3 +1,2 @@
 https://github.com/swaywm/sway/releases/download/VERSION/sway-VERSION.tar.gz
-patches/no-evdev.patch
 patches/pcre2.patch

wayland/sway/version

@@ -1 +1 @@
-1.7 2
+1.7 3