[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-settings-daemon/, gnome-base/gnome-settings-daemon/files/

["Nirbheek Chauhan" <nirbheek@gentoo.org>]

commit:     cf9f0032e3e12803e51814640a37c5ba441e8080
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 20:03:05 2011 +0000
Commit:     Nirbheek Chauhan <nirbheek <AT> gentoo <DOT> org>
CommitDate: Tue Jun 14 05:59:00 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=cf9f0032

gnome-base/gnome-settings-daemon-3.0.2 : touchpad timeout, udev[extras] fix

Add short-touchpad-timeout USE flag to allow reverting to 0.5 second syndaemon
timeout (like in GNOME 2) because the current 2.0 second timeout apparently
severely affects touchpad usability for some people (thanks to shiznix_ on
IRC for the report). See https://bugzilla.gnome.org/show_bug.cgi?id=621836
for details.
Also, add a patch from upstream git fixing wacom tablet touch functionality,
and update for new udev USE flags (see bug #348472).

Signed-off-by: Nirbheek Chauhan <nirbheek <AT> gentoo.org>

---
 ...tings-daemon-3.0.2-short-touchpad-timeout.patch |   13 ++++++++
 .../gnome-settings-daemon-3.0.2-wacom-touch.patch  |   32 ++++++++++++++++++++
 .../gnome-settings-daemon-3.0.2.ebuild             |   23 ++++++++++++--
 .../gnome-settings-daemon-9999.ebuild              |    6 ++-
 4 files changed, 68 insertions(+), 6 deletions(-)

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
new file mode 100644
index 0000000..a87a3d9
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-short-touchpad-timeout.patch
@@ -0,0 +1,13 @@
+diff --git a/plugins/mouse/gsd-mouse-manager.c b/plugins/mouse/gsd-mouse-manager.c
+index 80f664a..c9a29fb 100644
+--- a/plugins/mouse/gsd-mouse-manager.c
++++ b/plugins/mouse/gsd-mouse-manager.c
+@@ -533,7 +533,7 @@ set_disable_w_typing (GsdMouseManager *manager, gboolean state)
+ 
+                 args[0] = "syndaemon";
+                 args[1] = "-i";
+-                args[2] = "2.0";
++                args[2] = "0.5";
+                 args[3] = "-K";
+                 args[4] = "-R";
+                 args[5] = NULL;

diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch
new file mode 100644
index 0000000..977b38c
--- /dev/null
+++ b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch
@@ -0,0 +1,32 @@
+From 4248d799058f36bbb93ab9be173b249e7f631f80 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed, 25 May 2011 02:50:15 +0000
+Subject: wacom: enable wacom touch key by default.
+
+This was caused by a misunderstanding of the touch behaviour.
+This key enables/disables the touch part of the tablet altogether, not the
+behaviour of touch while using the pen. Hence the erroneous default, we
+really don't want to disable touch on most tablets by default.
+
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+https://bugzilla.gnome.org/show_bug.cgi?id=651020
+---
+diff --git a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+index 738b26a..4554d62 100644
+--- a/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
++++ b/data/org.gnome.settings-daemon.peripherals.wacom.gschema.xml.in.in
+@@ -23,9 +23,9 @@
+     <_description>Set this to 'none', 'cw' for 90 degree clockwise, 'half' for 180 degree, and 'ccw' for 90 degree counterclockwise.</_description>
+     </key>
+     <key name="touch" type="b">
+-      <default>false</default>
++      <default>true</default>
+       <_summary>Wacom touch feature</_summary>
+-      <_description>Enable this to only move the cursor when the user touches the tablet.</_description>
++      <_description>Enable this to move the cursor when the user touches the tablet.</_description>
+     </key>
+     <key name="tablet-pc-button" type="b">
+       <default>false</default>
+--
+cgit v0.9

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild
index 95407ec..dadd8e0 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2.ebuild
@@ -6,7 +6,7 @@ EAPI="3"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -21,7 +21,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
 fi
-IUSE="+cups debug packagekit policykit smartcard +udev"
+IUSE="+cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
 
 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
@@ -45,14 +45,16 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
 		dev-libs/glib:2
-		sys-fs/udev[extras]
+		|| ( sys-fs/udev[gudev]
+			sys-fs/udev[extras] )
 		>=app-portage/packagekit-0.6.4
 		>=sys-power/upower-0.9.1 )
 	policykit? (
 		>=sys-auth/polkit-0.97
 		>=sys-apps/dbus-1.1.2 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( sys-fs/udev[extras] )"
+	udev? ( || ( sys-fs/udev[gudev]
+		sys-fs/udev[extras] ) )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-themes-standard-2.91
@@ -83,6 +85,19 @@ pkg_setup() {
 		$(use_enable udev gudev)"
 }
 
+src_prepare() {
+	# Patch from upstream git, will be in next release
+	epatch "${FILESDIR}/${P}-wacom-touch.patch"
+
+	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
+	# Apparently this change severely affects touchpad usability for some
+	# people, so revert it if USE=short-touchpad-timeout.
+	# Revisit if/when upstream adds a setting for customizing the timeout.
+	use short-touchpad-timeout &&
+		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
+
+	gnome2_src_prepare
+}
 
 src_install() {
 	gnome2_src_install

diff --git a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
index 95407ec..2804d7b 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-9999.ebuild
@@ -45,14 +45,16 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
 		dev-libs/glib:2
-		sys-fs/udev[extras]
+		|| ( sys-fs/udev[gudev]
+			sys-fs/udev[extras] )
 		>=app-portage/packagekit-0.6.4
 		>=sys-power/upower-0.9.1 )
 	policykit? (
 		>=sys-auth/polkit-0.97
 		>=sys-apps/dbus-1.1.2 )
 	smartcard? ( >=dev-libs/nss-3.11.2 )
-	udev? ( sys-fs/udev[extras] )"
+	udev? ( || ( sys-fs/udev[gudev]
+		sys-fs/udev[extras] ) )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
 RDEPEND="${COMMON_DEPEND}
 	>=x11-themes/gnome-themes-standard-2.91