diff --git a/SOURCES/0001-backends-x11-Support-synaptics-configuration.patch b/SOURCES/0001-backends-x11-Support-synaptics-configuration.patch index 545f784..d932796 100644 --- a/SOURCES/0001-backends-x11-Support-synaptics-configuration.patch +++ b/SOURCES/0001-backends-x11-Support-synaptics-configuration.patch @@ -1,4 +1,4 @@ -From 23996c5290918e264d9385dbf68b90247423187d Mon Sep 17 00:00:00 2001 +From 39d66b990adfaed99e0a5ea473c8d1d0116c0757 Mon Sep 17 00:00:00 2001 From: Carlos Garnacho Date: Thu, 19 Jan 2017 15:03:41 +0100 Subject: [PATCH] backends/x11: Support synaptics configuration @@ -6,11 +6,11 @@ Subject: [PATCH] backends/x11: Support synaptics configuration The code is taken mostly as-is from g-s-d, so we can drag the dead horse a bit longer. --- - src/backends/x11/meta-input-settings-x11.c | 266 +++++++++++++++++++++ - 1 file changed, 266 insertions(+) + src/backends/x11/meta-input-settings-x11.c | 269 ++++++++++++++++++++- + 1 file changed, 268 insertions(+), 1 deletion(-) diff --git a/src/backends/x11/meta-input-settings-x11.c b/src/backends/x11/meta-input-settings-x11.c -index 9687fb36f..1d84dfccf 100644 +index 9687fb3..effcc5f 100644 --- a/src/backends/x11/meta-input-settings-x11.c +++ b/src/backends/x11/meta-input-settings-x11.c @@ -26,6 +26,7 @@ @@ -227,8 +227,13 @@ index 9687fb36f..1d84dfccf 100644 change_property (device, "libinput Accel Speed", XInternAtom (xdisplay, "FLOAT", False), 32, &value, 1); -@@ -245,6 +431,19 @@ meta_input_settings_x11_set_left_handed (MetaInputSettings *settings, - else +@@ -242,9 +428,23 @@ meta_input_settings_x11_set_left_handed (MetaInputSettings *settings, + change_property (device, "Wacom Rotation", + XA_INTEGER, 8, &value, 1); + } +- else ++ else if (device_type == CLUTTER_POINTER_DEVICE || ++ device_type == CLUTTER_TOUCHPAD_DEVICE) { value = enabled ? 1 : 0; + @@ -247,7 +252,7 @@ index 9687fb36f..1d84dfccf 100644 change_property (device, "libinput Left Handed Enabled", XA_INTEGER, 8, &value, 1); } -@@ -268,6 +467,20 @@ meta_input_settings_x11_set_tap_enabled (MetaInputSettings *settings, +@@ -268,6 +468,20 @@ meta_input_settings_x11_set_tap_enabled (MetaInputSettings *settings, { guchar value = (enabled) ? 1 : 0; @@ -268,7 +273,7 @@ index 9687fb36f..1d84dfccf 100644 change_property (device, "libinput Tapping Enabled", XA_INTEGER, 8, &value, 1); } -@@ -290,6 +503,27 @@ meta_input_settings_x11_set_invert_scroll (MetaInputSettings *settings, +@@ -290,6 +504,27 @@ meta_input_settings_x11_set_invert_scroll (MetaInputSettings *settings, { guchar value = (inverted) ? 1 : 0; @@ -296,7 +301,7 @@ index 9687fb36f..1d84dfccf 100644 change_property (device, "libinput Natural Scrolling Enabled", XA_INTEGER, 8, &value, 1); } -@@ -303,6 +537,22 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings *settings, +@@ -303,6 +538,22 @@ meta_input_settings_x11_set_edge_scroll (MetaInputSettings *settings, guchar *current = NULL; guchar *available = NULL; @@ -319,7 +324,7 @@ index 9687fb36f..1d84dfccf 100644 available = get_property (device, "libinput Scroll Methods Available", XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS); if (!available || !available[SCROLL_METHOD_FIELD_EDGE]) -@@ -332,6 +582,22 @@ meta_input_settings_x11_set_two_finger_scroll (MetaInputSettings *set +@@ -332,6 +583,22 @@ meta_input_settings_x11_set_two_finger_scroll (MetaInputSettings *set guchar *current = NULL; guchar *available = NULL; @@ -343,5 +348,5 @@ index 9687fb36f..1d84dfccf 100644 XA_INTEGER, 8, SCROLL_METHOD_NUM_FIELDS); if (!available || !available[SCROLL_METHOD_FIELD_2FG]) -- -2.20.1 +2.21.0 diff --git a/SPECS/mutter.spec b/SPECS/mutter.spec index d0a28fd..f5c4062 100644 --- a/SPECS/mutter.spec +++ b/SPECS/mutter.spec @@ -7,7 +7,7 @@ Name: mutter Version: 3.28.3 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Window and compositing manager based on Clutter License: GPLv2+ @@ -362,6 +362,10 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop %{_datadir}/mutter/tests %changelog +* Tue Apr 02 2019 Carlos Garnacho - 3.28.3-19 +- Fix synaptics/evdev driver support forward port to not break tablet pads + Resolves: #1687949 + * Thu Feb 21 2019 Jonas Ã…dahl - 3.28.3-18 - Remove patch enabling monitor framebuffer scaling Related: #1668883