diff --git a/.gitignore b/.gitignore index fa116b4..928611d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /mate-settings-daemon-1.10.0.tar.xz /mate-settings-daemon-1.10.1.tar.xz /mate-settings-daemon-1.10.2.tar.xz +/mate-settings-daemon-1.11.0.tar.xz diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index c71f4d0..5f4b181 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -2,7 +2,7 @@ %global rel_build 1 # This is needed, because src-url contains branched part of versioning-scheme. -%global branch 1.10 +%global branch 1.11 # Settings used for build from snapshots. %{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921} @@ -13,7 +13,7 @@ %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz} Name: mate-settings-daemon -Version: %{branch}.2 +Version: %{branch}.0 %if 0%{?rel_build} Release: 1%{?dist} %else @@ -29,10 +29,6 @@ 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-settings-daemon_touchpad.patch - BuildRequires: dbus-glib-devel BuildRequires: dconf-devel BuildRequires: desktop-file-utils @@ -74,8 +70,6 @@ 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} @@ -151,6 +145,9 @@ fi %changelog +* Wed Oct 21 2015 Wolfgang Ulbrich - 1.11.0-1 +- update to 1.11.0 release + * Mon Aug 31 2015 Wolfgang Ulbrich - 1.10.2-1 - update to 1.10.2 release - remove upstreamed patches diff --git a/mate-settings-daemon_touchpad.patch b/mate-settings-daemon_touchpad.patch deleted file mode 100644 index c4ae28c..0000000 --- a/mate-settings-daemon_touchpad.patch +++ /dev/null @@ -1,85 +0,0 @@ -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 4ca134d..44ea2f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d578476039fb8c1b2c47ed6873617700 mate-settings-daemon-1.10.2.tar.xz +26dffe07a32f754862b2ad67ea3abfc7 mate-settings-daemon-1.11.0.tar.xz