Add MR!4985 backport patch needed by phoc 0.45
This patch has already merged into mainline and the 0.18 branch upstream, but has not yet been released. It can be dropped in 0.18.3 Signed-off-by: Sam Day <me@samcday.com>
This commit is contained in:
parent
f55f4ba70e
commit
6eb9ee5920
2 changed files with 44 additions and 1 deletions
38
4985.patch
Normal file
38
4985.patch
Normal file
|
|
@ -0,0 +1,38 @@
|
|||
From d9818603142c42eea7d10fb656aaca857a179cf0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
|
||||
Date: Mon, 27 Jan 2025 17:48:39 +0100
|
||||
Subject: [PATCH] seat: Don't forget to destroy touch points on touch up
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Otherwise the number of touch points goes up constantly and d'n'd via
|
||||
touch can't work as validation always fails.
|
||||
|
||||
Fixes 75ecba44 ("seat: add serials to touch up events")
|
||||
|
||||
Signed-off-by: Guido Günther <agx@sigxcpu.org>
|
||||
(cherry picked from commit fef4f3637a5dfb7022887dfb36ccdd69932d2753)
|
||||
---
|
||||
types/seat/wlr_seat_touch.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/types/seat/wlr_seat_touch.c b/types/seat/wlr_seat_touch.c
|
||||
index 09f33d667..cc5b7c826 100644
|
||||
--- a/types/seat/wlr_seat_touch.c
|
||||
+++ b/types/seat/wlr_seat_touch.c
|
||||
@@ -214,9 +214,10 @@ uint32_t wlr_seat_touch_notify_up(struct wlr_seat *seat, uint32_t time,
|
||||
return 0;
|
||||
}
|
||||
|
||||
- return grab->interface->up(grab, time, point);
|
||||
+ uint32_t serial = grab->interface->up(grab, time, point);
|
||||
|
||||
touch_point_destroy(point);
|
||||
+ return serial;
|
||||
}
|
||||
|
||||
void wlr_seat_touch_notify_motion(struct wlr_seat *seat, uint32_t time,
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
Name: wlroots
|
||||
Version: 0.18.2
|
||||
Release: 3%{?dist}
|
||||
Release: 4%{?dist}
|
||||
Summary: A modular Wayland compositor library
|
||||
|
||||
# Source files/overall project licensed as MIT, but
|
||||
|
|
@ -40,6 +40,8 @@ Source3: examples.meson.build
|
|||
# Fedora patches
|
||||
# Following patch is required for phoc.
|
||||
Patch: Revert-layer-shell-error-on-0-dimension-without-anch.patch
|
||||
# Needed by phoc 0.45.0+, can be dropped in wlroots 0.18.3
|
||||
Patch: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4985.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: glslang
|
||||
|
|
@ -140,6 +142,9 @@ install -pm0644 -D '%{SOURCE3}' '%{buildroot}/%{_pkgdocdir}/examples/meson.build
|
|||
|
||||
|
||||
%changelog
|
||||
* Sat Feb 15 2025 Sam Day <me@samcday.com> - 0.18.2-4
|
||||
- Add wlroots!4985 patch needed by phoc 0.45.0
|
||||
|
||||
* Mon Feb 10 2025 Neal Gompa <ngompa@fedoraproject.org> - 0.18.2-3
|
||||
- Rebuild for libdisplay-info 0.2.0
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue