aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/gtk+3.0/10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch28
-rw-r--r--main/gtk+3.0/APKBUILD8
2 files changed, 33 insertions, 3 deletions
diff --git a/main/gtk+3.0/10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch b/main/gtk+3.0/10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
new file mode 100644
index 0000000000..22517a796c
--- /dev/null
+++ b/main/gtk+3.0/10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch
@@ -0,0 +1,28 @@
+diff --git a/gdk/gdkseatdefault.c b/gdk/gdkseatdefault.c
+index ce4bdc82d2..9650f4b121 100644
+--- a/gdk/gdkseatdefault.c
++++ b/gdk/gdkseatdefault.c
+@@ -134,22 +134,9 @@ gdk_seat_default_grab (GdkSeat *seat,
+
+ if (capabilities & GDK_SEAT_CAPABILITY_ALL_POINTING)
+ {
+- /* ALL_POINTING spans 3 capabilities; get the mask for the ones we have */
+- GdkEventMask pointer_evmask = 0;
+-
+- /* We let tablet styli take over the pointer cursor */
+- if (capabilities & (GDK_SEAT_CAPABILITY_POINTER |
+- GDK_SEAT_CAPABILITY_TABLET_STYLUS))
+- {
+- pointer_evmask |= POINTER_EVENTS;
+- }
+-
+- if (capabilities & GDK_SEAT_CAPABILITY_TOUCH)
+- pointer_evmask |= TOUCH_EVENTS;
+-
+ status = gdk_device_grab (priv->master_pointer, window,
+ GDK_OWNERSHIP_NONE, owner_events,
+- pointer_evmask, cursor,
++ POINTER_EVENTS, cursor,
+ evtime);
+ }
+
diff --git a/main/gtk+3.0/APKBUILD b/main/gtk+3.0/APKBUILD
index 155f921fdd..358d8bd07e 100644
--- a/main/gtk+3.0/APKBUILD
+++ b/main/gtk+3.0/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=gtk+3.0
pkgver=3.24.1
-pkgrel=0
+pkgrel=1
pkgdesc="The GTK+ Toolkit (v3)"
url="https://www.gtk.org/"
install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
@@ -50,7 +50,8 @@ makedepends="
libice-dev
tiff-dev
zlib-dev"
-source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz"
+source="https://download.gnome.org/sources/gtk+/${pkgver%.*}/gtk+-$pkgver.tar.xz
+ 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch"
builddir="$srcdir"/gtk+-$pkgver
@@ -88,4 +89,5 @@ package() {
rm -f "$pkgdir"/usr/share/man/man1/gtk-update-icon-cache.1
}
-sha512sums="13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d gtk+-3.24.1.tar.xz"
+sha512sums="13ddb1099a2a0eb44ea53fa4be5054a403e1b27468a33862646ba111577b7bb72b9bbe4f6aea15889c2a2bee1238023bc23524b901cf2dbb3adf0e126eb6ea5d gtk+-3.24.1.tar.xz
+e4ea76484b70bd9beb65b2964bbcff3b3f78f5f6fe70b12309a7721ca134e3735e8aaac09803f93b393a6130a703f8f346c0df89ad45d18c580dac1e0e922276 10-Revert-gdkseatdefault-Grab-touch-events-where-applic.patch"