From 77f94979473728b0528abe93c1132f1284b6e93a Mon Sep 17 00:00:00 2001 From: raveit65 Date: Mon, 31 Aug 2015 17:27:42 +0200 Subject: [PATCH] update to 1.10.2 release --- .gitignore | 1 + mate-settings-daemon.spec | 18 ++-- ...atekbd-GSettings-before-reading-them.patch | 35 -------- ...ble-to-better-match-libmatekbd-stuff.patch | 36 -------- mate-settings-daemon_touchpad.patch | 85 +++++++++++++++++++ sources | 2 +- 6 files changed, 98 insertions(+), 79 deletions(-) delete mode 100644 mate-settings-daemon_connect-to-libmatekbd-GSettings-before-reading-them.patch delete mode 100644 mate-settings-daemon_rename-variable-to-better-match-libmatekbd-stuff.patch create mode 100644 mate-settings-daemon_touchpad.patch diff --git a/.gitignore b/.gitignore index b6cd43f..fa116b4 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /mate-settings-daemon-1.9.90.tar.xz /mate-settings-daemon-1.10.0.tar.xz /mate-settings-daemon-1.10.1.tar.xz +/mate-settings-daemon-1.10.2.tar.xz diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 6388449..c71f4d0 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -13,9 +13,9 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: mate-settings-daemon -Version: %{branch}.1 +Version: %{branch}.2 %if 0%{?rel_build} -Release: 2%{?dist} +Release: 1%{?dist} %else Release: 0.1%{?git_rel}%{?dist} %endif @@ -29,9 +29,9 @@ URL: http://mate-desktop.org # Source for snapshot-builds. %{!?rel_build:Source0: http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}} -# https://github.com/mate-desktop/mate-settings-daemon/pull/112 -Patch0: mate-settings-daemon_rename-variable-to-better-match-libmatekbd-stuff.patch -Patch1: mate-settings-daemon_connect-to-libmatekbd-GSettings-before-reading-them.patch +# http://git.mate-desktop.org/mate-settings-daemon/commit/?id=ed55854 +# http://git.mate-desktop.org/mate-settings-daemon/commit/?id=33cb903 +Patch0: mate-settings-daemon_touchpad.patch BuildRequires: dbus-glib-devel BuildRequires: dconf-devel @@ -74,8 +74,7 @@ under it. %prep %setup -q%{!?rel_build:n %{name}-%{commit}} -%patch0 -p1 -b .rename-variable -%patch1 -p1 -b .connect-to +%patch0 -p1 -b .touchpad %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh @@ -152,6 +151,11 @@ fi %changelog +* Mon Aug 31 2015 Wolfgang Ulbrich - 1.10.2-1 +- update to 1.10.2 release +- remove upstreamed patches +- add upstream touchpad improvement + * Wed Aug 19 2015 Wolfgang Ulbrich - 1.10.1-2 - another fix for glib2/gsettings regression diff --git a/mate-settings-daemon_connect-to-libmatekbd-GSettings-before-reading-them.patch b/mate-settings-daemon_connect-to-libmatekbd-GSettings-before-reading-them.patch deleted file mode 100644 index d30a4e0..0000000 --- a/mate-settings-daemon_connect-to-libmatekbd-GSettings-before-reading-them.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c -index a406fe5..bb62f2b 100644 ---- a/plugins/keyboard/msd-keyboard-xkb.c -+++ b/plugins/keyboard/msd-keyboard-xkb.c -@@ -582,14 +582,25 @@ msd_keyboard_xkb_init (MsdKeyboardManager * kbd_manager) - settings_kbd = g_settings_new (MATEKBD_KBD_SCHEMA); - - matekbd_desktop_config_init (¤t_desktop_config, -- xkl_engine); -+ xkl_engine); - matekbd_keyboard_config_init (¤t_kbd_config, -- xkl_engine); -+ xkl_engine); -+ - xkl_engine_backup_names_prop (xkl_engine); - msd_keyboard_xkb_analyze_sysconfig (); - -- g_signal_connect (settings_desktop, "changed", G_CALLBACK(apply_desktop_settings_cb), NULL); -- g_signal_connect (settings_kbd, "changed", G_CALLBACK(apply_xkb_settings_cb), NULL); -+ matekbd_desktop_config_start_listen (¤t_desktop_config, -+ G_CALLBACK (apply_desktop_settings_cb), -+ NULL); -+ -+ matekbd_keyboard_config_start_listen (¤t_kbd_config, -+ G_CALLBACK (apply_xkb_settings_cb), -+ NULL); -+ -+ g_signal_connect (settings_desktop, "changed", -+ G_CALLBACK (apply_desktop_settings_cb), NULL); -+ g_signal_connect (settings_kbd, "changed", -+ G_CALLBACK (apply_xkb_settings_cb), NULL); - - gdk_window_add_filter (NULL, (GdkFilterFunc) - msd_keyboard_xkb_evt_filter, NULL); - diff --git a/mate-settings-daemon_rename-variable-to-better-match-libmatekbd-stuff.patch b/mate-settings-daemon_rename-variable-to-better-match-libmatekbd-stuff.patch deleted file mode 100644 index cccccb8..0000000 --- a/mate-settings-daemon_rename-variable-to-better-match-libmatekbd-stuff.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/plugins/keyboard/msd-keyboard-xkb.c b/plugins/keyboard/msd-keyboard-xkb.c -index b126fa1..a406fe5 100644 ---- a/plugins/keyboard/msd-keyboard-xkb.c -+++ b/plugins/keyboard/msd-keyboard-xkb.c -@@ -58,7 +58,7 @@ static GSettings* settings_kbd; - static XklEngine* xkl_engine; - static XklConfigRegistry* xkl_registry = NULL; - --static MatekbdDesktopConfig current_config; -+static MatekbdDesktopConfig current_desktop_config; - static MatekbdKeyboardConfig current_kbd_config; - - /* never terminated */ -@@ -143,10 +143,10 @@ apply_desktop_settings (void) - return; - - msd_keyboard_manager_apply_settings (manager); -- matekbd_desktop_config_load_from_gsettings (¤t_config); -+ matekbd_desktop_config_load_from_gsettings (¤t_desktop_config); - /* again, probably it would be nice to compare things - before activating them */ -- matekbd_desktop_config_activate (¤t_config); -+ matekbd_desktop_config_activate (¤t_desktop_config); - - show_leds = g_settings_get_boolean (settings_desktop, DUPLICATE_LEDS_KEY); - for (i = sizeof (indicator_icons) / sizeof (indicator_icons[0]); -@@ -581,7 +581,7 @@ msd_keyboard_xkb_init (MsdKeyboardManager * kbd_manager) - settings_desktop = g_settings_new (MATEKBD_DESKTOP_SCHEMA); - settings_kbd = g_settings_new (MATEKBD_KBD_SCHEMA); - -- matekbd_desktop_config_init (¤t_config, -+ matekbd_desktop_config_init (¤t_desktop_config, - xkl_engine); - matekbd_keyboard_config_init (¤t_kbd_config, - xkl_engine); - diff --git a/mate-settings-daemon_touchpad.patch b/mate-settings-daemon_touchpad.patch new file mode 100644 index 0000000..c4ae28c --- /dev/null +++ b/mate-settings-daemon_touchpad.patch @@ -0,0 +1,85 @@ +diff --git a/data/org.mate.peripherals-touchpad.gschema.xml.in.in b/data/org.mate.peripherals-touchpad.gschema.xml.in.in +index 8a30d1f..a7f5d05 100644 +--- a/data/org.mate.peripherals-touchpad.gschema.xml.in.in ++++ b/data/org.mate.peripherals-touchpad.gschema.xml.in.in +@@ -25,5 +25,20 @@ + <_summary>Enable touchpad + <_description>Set this to TRUE to enable all touchpads. + ++ ++ 1 ++ <_summary>One finger tap button ++ <_description>Select the button mapping for one-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button ++ ++ ++ 2 ++ <_summary>Two finger tap button ++ <_description>Select the button mapping for two-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button ++ ++ ++ 3 ++ <_summary>Three finger tap button ++ <_description>Select the button mapping for three-finger tap. Supported values are: 1: left mouse button 2: middle mouse button 3: right mouse button ++ + + +diff --git a/plugins/mouse/msd-mouse-manager.c b/plugins/mouse/msd-mouse-manager.c +index 426697f..6133d2d 100644 +--- a/plugins/mouse/msd-mouse-manager.c ++++ b/plugins/mouse/msd-mouse-manager.c +@@ -62,6 +62,9 @@ + #define KEY_TOUCHPAD_DISABLE_W_TYPING "disable-while-typing" + #ifdef HAVE_X11_EXTENSIONS_XINPUT_H + #define KEY_TOUCHPAD_TAP_TO_CLICK "tap-to-click" ++#define KEY_TOUCHPAD_ONE_FINGER_TAP "tap-button-one-finger" ++#define KEY_TOUCHPAD_TWO_FINGER_TAP "tap-button-two-finger" ++#define KEY_TOUCHPAD_THREE_FINGER_TAP "tap-button-three-finger" + #define KEY_TOUCHPAD_SCROLL_METHOD "scroll-method" + #define KEY_TOUCHPAD_PAD_HORIZ_SCROLL "horiz-scroll-enabled" + #define KEY_TOUCHPAD_ENABLED "touchpad-enabled" +@@ -673,13 +676,25 @@ set_tap_to_click (gboolean state, gboolean left_handed) + rc = XGetDeviceProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device, prop, 0, 2, + False, XA_INTEGER, &type, &format, &nitems, + &bytes_after, &data); ++ ++ GSettings *settings = g_settings_new (MATE_TOUCHPAD_SCHEMA); ++ gint one_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_ONE_FINGER_TAP); ++ gint two_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_TWO_FINGER_TAP); ++ gint three_finger_tap = g_settings_get_int (settings, KEY_TOUCHPAD_THREE_FINGER_TAP); ++ if (one_finger_tap > 3 || one_finger_tap < 1) ++ one_finger_tap = 1; ++ if (two_finger_tap > 3 || two_finger_tap < 1) ++ two_finger_tap = 2; ++ if (three_finger_tap > 3 || three_finger_tap < 1) ++ three_finger_tap = 3; ++ g_object_unref (settings); + + if (rc == Success && type == XA_INTEGER && format == 8 && nitems >= 7) + { + /* Set RLM mapping for 1/2/3 fingers*/ +- data[4] = (state) ? ((left_handed) ? 3 : 1) : 0; +- data[5] = (state) ? ((left_handed) ? 1 : 3) : 0; +- data[6] = (state) ? 2 : 0; ++ data[4] = (state) ? ((left_handed) ? (4-one_finger_tap) : one_finger_tap) : 0; ++ data[5] = (state) ? ((left_handed) ? (4-two_finger_tap) : two_finger_tap) : 0; ++ data[6] = (state) ? three_finger_tap : 0; + XChangeDeviceProperty (GDK_DISPLAY_XDISPLAY(gdk_display_get_default()), device, prop, XA_INTEGER, 8, + PropModeReplace, data, nitems); + } +@@ -1000,6 +1015,15 @@ mouse_callback (GSettings *settings, + } else if (g_strcmp0 (key, KEY_TOUCHPAD_TAP_TO_CLICK) == 0) { + set_tap_to_click (g_settings_get_boolean (settings, key), + g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED)); ++ } else if (g_strcmp0 (key, KEY_TOUCHPAD_ONE_FINGER_TAP) == 0) { ++ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK), ++ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED)); ++ } else if (g_strcmp0 (key, KEY_TOUCHPAD_TWO_FINGER_TAP) == 0) { ++ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK), ++ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED)); ++ } else if (g_strcmp0 (key, KEY_TOUCHPAD_THREE_FINGER_TAP) == 0) { ++ set_tap_to_click (g_settings_get_boolean (settings, KEY_TOUCHPAD_TAP_TO_CLICK), ++ g_settings_get_boolean (manager->priv->settings_mouse, KEY_MOUSE_LEFT_HANDED)); + } else if (g_strcmp0 (key, KEY_TOUCHPAD_SCROLL_METHOD) == 0) { + set_edge_scroll (g_settings_get_int (settings, key)); + set_horiz_scroll (g_settings_get_boolean (settings, KEY_TOUCHPAD_PAD_HORIZ_SCROLL)); + diff --git a/sources b/sources index 19b28bf..4ca134d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8543bb862d370647cd99079c4755eabf mate-settings-daemon-1.10.1.tar.xz +d578476039fb8c1b2c47ed6873617700 mate-settings-daemon-1.10.2.tar.xz