diff --git a/.gitignore b/.gitignore index 9755848..f919db8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ /mate-settings-daemon-1.8.3.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 245a674..3332873 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -13,7 +13,7 @@ %{!?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: 1%{?dist} %else @@ -29,6 +29,10 @@ 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}} +# http://git.mate-desktop.org/mate-settings-daemon/commit/?id=ed55854 +# http://git.mate-desktop.org/mate-settings-daemon/commit/?id=33cb903 +Patch0: mate-session-manager_touchpad.patch + BuildRequires: dbus-glib-devel BuildRequires: dconf-devel BuildRequires: desktop-file-utils @@ -70,6 +74,8 @@ under it. %prep %setup -q%{!?rel_build:n %{name}-%{commit}} +%patch0 -p1 -b .touchpad + %if 0%{?rel_build} #NOCONFIGURE=1 ./autogen.sh %else # 0%{?rel_build} @@ -145,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 + * Tue Jul 14 2015 Wolfgang Ulbrich - 1.10.1.1 - update to 1.10.1 release diff --git a/mate-settings-daemon_a11y-keyboard-crash.patch b/mate-settings-daemon_a11y-keyboard-crash.patch deleted file mode 100644 index 9df1105..0000000 --- a/mate-settings-daemon_a11y-keyboard-crash.patch +++ /dev/null @@ -1,86 +0,0 @@ -diff --git a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c -index 72d42ff..675b993 100644 ---- a/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c -+++ b/plugins/a11y-keyboard/msd-a11y-preferences-dialog.c -@@ -458,7 +458,7 @@ on_sticky_keys_checkbutton_toggled (GtkToggleButton *button, - - static void - on_bounce_keys_checkbutton_toggled (GtkToggleButton *button, -- MsdA11yPreferencesDialog *dialog) -+ MsdA11yPreferencesDialog *dialog) - { - config_set_bounce_keys (dialog, gtk_toggle_button_get_active (button)); - } -@@ -649,7 +649,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog, - g_signal_connect (widget, - "toggled", - G_CALLBACK (on_sticky_keys_checkbutton_toggled), -- NULL); -+ dialog); - enabled = config_get_sticky_keys (dialog, &is_writable); - ui_set_sticky_keys (dialog, enabled); - if (! is_writable) { -@@ -662,7 +662,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog, - g_signal_connect (widget, - "toggled", - G_CALLBACK (on_bounce_keys_checkbutton_toggled), -- NULL); -+ dialog); - enabled = config_get_bounce_keys (dialog, &is_writable); - ui_set_bounce_keys (dialog, enabled); - if (! is_writable) { -@@ -675,7 +675,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog, - g_signal_connect (widget, - "toggled", - G_CALLBACK (on_slow_keys_checkbutton_toggled), -- NULL); -+ dialog); - enabled = config_get_slow_keys (dialog, &is_writable); - ui_set_slow_keys (dialog, enabled); - if (! is_writable) { -@@ -688,7 +688,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog, - g_signal_connect (widget, - "toggled", - G_CALLBACK (on_high_contrast_checkbutton_toggled), -- NULL); -+ dialog); - enabled = config_get_high_contrast (dialog, &is_writable); - ui_set_high_contrast (dialog, enabled); - if (! is_writable) { -@@ -701,7 +701,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog, - g_signal_connect (widget, - "toggled", - G_CALLBACK (on_at_screen_keyboard_checkbutton_toggled), -- NULL); -+ dialog); - enabled = config_get_at_screen_keyboard (dialog, &is_writable); - ui_set_at_screen_keyboard (dialog, enabled); - if (! is_writable) { -@@ -720,7 +720,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog, - g_signal_connect (widget, - "toggled", - G_CALLBACK (on_at_screen_reader_checkbutton_toggled), -- NULL); -+ dialog); - enabled = config_get_at_screen_reader (dialog, &is_writable); - ui_set_at_screen_reader (dialog, enabled); - if (! is_writable) { -@@ -739,7 +739,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog, - g_signal_connect (widget, - "toggled", - G_CALLBACK (on_at_screen_magnifier_checkbutton_toggled), -- NULL); -+ dialog); - enabled = config_get_at_screen_magnifier (dialog, &is_writable); - ui_set_at_screen_magnifier (dialog, enabled); - if (! is_writable) { -@@ -758,7 +758,7 @@ setup_dialog (MsdA11yPreferencesDialog *dialog, - g_signal_connect (widget, - "toggled", - G_CALLBACK (on_large_print_checkbutton_toggled), -- NULL); -+ dialog); - enabled = config_get_large_print (&is_writable); - ui_set_large_print (dialog, enabled); - if (! is_writable) { - diff --git a/mate-settings-daemon_changed-reaction-to-numlock-state.patch b/mate-settings-daemon_changed-reaction-to-numlock-state.patch deleted file mode 100644 index d2a690b..0000000 --- a/mate-settings-daemon_changed-reaction-to-numlock-state.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/plugins/keyboard/msd-keyboard-manager.c b/plugins/keyboard/msd-keyboard-manager.c -index a4b97e5..8d261b6 100644 ---- a/plugins/keyboard/msd-keyboard-manager.c -+++ b/plugins/keyboard/msd-keyboard-manager.c -@@ -267,10 +267,6 @@ apply_settings (GSettings *settings, - bell_volume = (volume_string && !strcmp (volume_string, "on")) ? 50 : 0; - g_free (volume_string); - --#ifdef HAVE_X11_EXTENSIONS_XKB_H -- rnumlock = g_settings_get_boolean (settings, KEY_NUMLOCK_REMEMBER); --#endif /* HAVE_X11_EXTENSIONS_XKB_H */ -- - gdk_error_trap_push (); - if (repeat) { - gboolean rate_set = FALSE; -@@ -306,8 +302,12 @@ apply_settings (GSettings *settings, - &kbdcontrol); - - #ifdef HAVE_X11_EXTENSIONS_XKB_H -- if (manager->priv->have_xkb && rnumlock) { -- numlock_set_xkb_state (numlock_get_settings_state (settings)); -+ rnumlock = g_settings_get_boolean (settings, KEY_NUMLOCK_REMEMBER); -+ -+ if (rnumlock == 0 || key == NULL) { -+ if (manager->priv->have_xkb && rnumlock) { -+ numlock_set_xkb_state (numlock_get_settings_state (settings)); -+ } - } - #endif /* HAVE_X11_EXTENSIONS_XKB_H */ - - diff --git a/mate-settings-daemon_safer-access-to-list-element-data.patch b/mate-settings-daemon_safer-access-to-list-element-data.patch deleted file mode 100644 index e98d2a7..0000000 --- a/mate-settings-daemon_safer-access-to-list-element-data.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/plugins/background/msd-background-manager.c b/plugins/background/msd-background-manager.c -index 215be80..5b6a04b 100644 ---- a/plugins/background/msd-background-manager.c -+++ b/plugins/background/msd-background-manager.c -@@ -269,7 +269,7 @@ on_screen_size_changed (GdkScreen *screen, - return; - - gint scr_num = gdk_screen_get_number (screen); -- gchar *old_size = g_list_nth (manager->priv->scr_sizes, scr_num)->data; -+ gchar *old_size = g_list_nth_data (manager->priv->scr_sizes, scr_num); - gchar *new_size = g_strdup_printf ("%dx%d", gdk_screen_get_width (screen), - gdk_screen_get_height (screen)); - if (g_strcmp0 (old_size, new_size) != 0) - 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