From 09f7e84f2c8e94566df8f34cd6a42c5da77b1ec0e1f9be4e6f6360cf31c27284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 12 Jan 2016 08:57:39 +0000 Subject: [PATCH] Accepting request 353180 from home:dimstar:branches:GNOME:Factory - Add gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch: The QEMU USB Tablet is not really a touchscreen - although it simulates it for VNC based viewers (making mouse-input more reliable). This patch fixes issues where openQA was not able to correctly handle the CTRL-ALT-DEL handler to show the logout dialog. OBS-URL: https://build.opensuse.org/request/show/353180 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gtk3?expand=0&rev=212 --- gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch | 12 ++++++++++++ gtk3.changes | 9 +++++++++ gtk3.spec | 5 ++++- 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch diff --git a/gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch b/gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch new file mode 100644 index 0000000..2f4b90b --- /dev/null +++ b/gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch @@ -0,0 +1,12 @@ +Index: gtk+-3.18.6/gdk/x11/gdkdevicemanager-xi2.c +=================================================================== +--- gtk+-3.18.6.orig/gdk/x11/gdkdevicemanager-xi2.c ++++ gtk+-3.18.6/gdk/x11/gdkdevicemanager-xi2.c +@@ -428,6 +428,7 @@ create_device (GdkDeviceManager *device_ + input_source = GDK_SOURCE_PEN; + else if (!strstr (tmp_name, "mouse") && + !strstr (tmp_name, "pointer") && ++ !strstr (tmp_name, "qemu usb tablet") && + has_abs_axes (display, dev->classes, dev->num_classes)) + input_source = GDK_SOURCE_TOUCHSCREEN; + else diff --git a/gtk3.changes b/gtk3.changes index 3ee82f4..ac59382 100644 --- a/gtk3.changes +++ b/gtk3.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Jan 11 10:24:48 UTC 2016 - dimstar@opensuse.org + +- Add gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch: The QEMU + USB Tablet is not really a touchscreen - although it simulates + it for VNC based viewers (making mouse-input more reliable). + This patch fixes issues where openQA was not able to correctly + handle the CTRL-ALT-DEL handler to show the logout dialog. + ------------------------------------------------------------------- Sat Dec 26 14:19:15 UTC 2015 - zaitor@opensuse.org diff --git a/gtk3.spec b/gtk3.spec index 2cfa72b..0e6d29c 100644 --- a/gtk3.spec +++ b/gtk3.spec @@ -1,7 +1,7 @@ # # spec file for package gtk3 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2010 Dominique Leuenebrger, Amsterdam, Netherlands # # All modifications and additions to the file contributed by third parties @@ -49,6 +49,8 @@ Patch1: gtk3-path-local.patch Patch3: gtk3-bnc130159-bgo319483-async-font-selection.patch # PATCH-FIX-UPSTREAM gtk3-gdk_pixbuf_get_from_surface.patch bgo#757147 zaitor@opensuse.org -- Restore old behavior to return a scaled version when the underlying surface is scaled. From upstream git. Patch4: gtk3-gdk_pixbuf_get_from_surface.patch +# PATCH-FIX-UPSTREAM gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch bgo#760445 dimstar@opensuse.org -- The QEMU USB Tablet device is no real touchscreen; fixes issues in openQA where ctrl-alt-del was not accepted +Patch5: gtk3-qemu-usb-tablet-is-no-real-touchscreen.patch BuildRequires: cups-devel >= 1.2 BuildRequires: docbook-xsl-stylesheets BuildRequires: fdupes @@ -341,6 +343,7 @@ cp -a %{S:1} . ## PATCH-DISABLED - Upstream bug was closed as obsolete in 2011, as there was a new fontchooser, lets disable the patch and see if anyone complains. #%%patch3 -p1 %patch4 -p1 +%patch5 -p1 %build # Needed for patch1