gentoo auto-resync : 28:08:2024 - 12:00:19

3 files changed, 0 insertions, 56 deletions

diff --git a/gui-libs/Manifest.gz b/gui-libs/Manifest.gz
index d88d3ff7aec7..264d30976a2d 100644
--- a/gui-libs/Manifest.gz
+++ b/gui-libs/Manifest.gz
diff --git a/gui-libs/wlroots/Manifest b/gui-libs/wlroots/Manifest
index 520f55d137a1..09cd16a4348e 100644
--- a/gui-libs/wlroots/Manifest
+++ b/gui-libs/wlroots/Manifest
@@ -1,4 +1,3 @@
-AUX wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch 2877 BLAKE2B ff492af5cf7b5c866e49ce1bf78286c57e54eb4d3a6c60d4b1087a796b081618b6fe87afc4efd79aec5b4b3ecdb749027cfc74f09500211a086550a5db9d70d6 SHA512 52a6cf0bd22a514adf427d9f02768f5ecc24d1c83cecd51eda89938bdd79dee50e11103ae9fa2ededfcacb5a485415453308026c68fe1e3ffdb447503696535d
 AUX wlroots-0.17-fix-automagic-libliftoff.patch 1446 BLAKE2B 087afe7764251882c1e9f5a49a6c425261bb7cfe8a385d578067374312c3da8529cd273c81936e81ccf65f9932dfa2391e7d5c574458fd82b869793ec34320a5 SHA512 2b5dae202ef1991531b2751fe716a08f23c550136ab8ef3c7ea84b21e9bab89f53fce0e1b2eb2d8e30402519c086361361634733fa66f8553070218c1c2d7ff0
 DIST wlroots-0.17.4.tar.gz 609179 BLAKE2B dc5a7749533ab54631d4a26be554b86e5b08b2472cf8f22ccebddb319d571cbd98a5c56e64e7bc762a5918d4272eb6b4261050288f3053c18c824c6a9c32b96b SHA512 35803df9fe68cadb0b9b5e522863535407ba2354ed1ca8f824a9c40b64698a97c579fec0afeb444b05d429adc1e3dfc45b20c3a1b7a2004e4f5a10d2305c9116
 DIST wlroots-0.18.0.tar.gz 628190 BLAKE2B b1d725e0397365b69afce24baf5376057a40d225f7cb06ccd5abde3b3da8d5401a6eb5d57ab65154a6faf7961473039833e558e3b25da1210891d34667da5bf9 SHA512 2cf848aa67f41089b60cc7d01c3a344ebaf7f5bbced459675fef885cd4b3e6b99d9a49d6b127518314d0ae38e52e9aff7991611592b2add4cba96f15aa0bf1c6
diff --git a/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch b/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch
deleted file mode 100644
index cff1f72ca5ca..000000000000
--- a/gui-libs/wlroots/files/wlroots-0.15.1-tinywl-dont-crash-upon-missing-keyboard.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 7d950f3dac6cca62635d5e4ff2af33b35372f6db Mon Sep 17 00:00:00 2001
-From: Simon Ser <contact@emersion.fr>
-Date: Sat, 19 Mar 2022 14:00:43 +0100
-Subject: [PATCH] tinywl: don't crash when there is no keyboard
-
-Running with WLR_BACKENDS=headless, there is no keyboard device.
-Avoid crashes like so:
-
-    ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
-    ../tinywl/tinywl.c:136:2: runtime error: member access within null pointer of type 'struct wlr_keyboard'
-    AddressSanitizer:DEADLYSIGNAL
-    =================================================================
-    ==331107==ERROR: AddressSanitizer: SEGV on unknown address 0x000000000120 (pc 0x556ed03e4e99 bp 0x7ffce834bc10 sp 0x7ffce834bbb0 T0)
-    ==331107==The signal is caused by a READ memory access.
-    ==331107==Hint: address points to the zero page.
-        #0 0x556ed03e4e99 in focus_view ../tinywl/tinywl.c:136
-        #1 0x556ed03eb3be in xdg_toplevel_map ../tinywl/tinywl.c:603
-        #2 0x7f75d6f768db in wlr_signal_emit_safe ../util/signal.c:29
-        #3 0x7f75d6e9cac7 in xdg_surface_role_commit ../types/xdg_shell/wlr_xdg_surface.c:315
-        #4 0x7f75d6eb6944 in surface_commit_state ../types/wlr_compositor.c:466
-        #5 0x7f75d6eb7b02 in surface_handle_commit ../types/wlr_compositor.c:523
-        #6 0x7f75d5714d49  (/usr/lib/libffi.so.8+0x6d49)
-        #7 0x7f75d5714266  (/usr/lib/libffi.so.8+0x6266)
-        #8 0x7f75d68cb322  (/usr/lib/libwayland-server.so.0+0xd322)
-        #9 0x7f75d68c65cb  (/usr/lib/libwayland-server.so.0+0x85cb)
-        #10 0x7f75d68c91c9 in wl_event_loop_dispatch (/usr/lib/libwayland-server.so.0+0xb1c9)
-        #11 0x7f75d68c6d36 in wl_display_run (/usr/lib/libwayland-server.so.0+0x8d36)
-        #12 0x556ed03eef55 in main ../tinywl/tinywl.c:905
-        #13 0x7f75d5d2330f in __libc_start_call_main (/usr/lib/libc.so.6+0x2d30f)
-        #14 0x7f75d5d233c0 in __libc_start_main@GLIBC_2.2.5 (/usr/lib/libc.so.6+0x2d3c0)
-        #15 0x556ed03e46e4 in _start (/home/simon/src/wlroots/build/tinywl/tinywl+0x136e4)
----
- tinywl/tinywl.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c
-index dd442aac..8796e9df 100644
---- a/tinywl/tinywl.c
-+++ b/tinywl/tinywl.c
-@@ -130,8 +130,10 @@ static void focus_view(struct tinywl_view *view, struct wlr_surface *surface) {
- 	 * track of this and automatically send key events to the appropriate
- 	 * clients without additional work on your part.
- 	 */
--	wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
--		keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
-+	if (keyboard != NULL) {
-+		wlr_seat_keyboard_notify_enter(seat, view->xdg_surface->surface,
-+			keyboard->keycodes, keyboard->num_keycodes, &keyboard->modifiers);
-+	}
- }
- 
- static void keyboard_handle_modifiers(
--- 
-2.36.1
-