Bump, drop old. Lots of bugs fixed, several memory leaks plugged.

(Portage version: 2.2.0_alpha74/cvs/Linux x86_64)

8 files changed, 54 insertions, 211 deletions

diff --git a/gnome-base/gnome-settings-daemon/ChangeLog b/gnome-base/gnome-settings-daemon/ChangeLog
index cf8c598b0f0d..a04c5d2310da 100644
--- a/gnome-base/gnome-settings-daemon/ChangeLog
+++ b/gnome-base/gnome-settings-daemon/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for gnome-base/gnome-settings-daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.96 2011/10/30 16:09:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/ChangeLog,v 1.97 2011/11/13 18:02:09 tetromino Exp $
+
+*gnome-settings-daemon-3.2.2 (13 Nov 2011)
+
+  13 Nov 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -gnome-settings-daemon-3.0.2-r2.ebuild,
+  -files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch,
+  -files/gnome-settings-daemon-3.0.2-keygrab-defines.patch,
+  -files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch,
+  -files/gnome-settings-daemon-3.0.2-keygrab-pause.patch,
+  -files/gnome-settings-daemon-3.0.2-keygrab-range.patch,
+  -files/gnome-settings-daemon-3.0.2-wacom-touch.patch,
+  +gnome-settings-daemon-3.2.2.ebuild:
+  Bump, drop old. Lots of bugs fixed, several memory leaks plugged.
 
   30 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -gnome-settings-daemon-2.32.1.ebuild,
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch
deleted file mode 100644
index 23146b6a5e10..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-broken-logic.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 33efc3649aa75fc77e4f1521031992376131d507 Mon Sep 17 00:00:00 2001
-From: Chris Coulson <chris.coulson@canonical.com>
-Date: Wed, 13 Jul 2011 11:58:29 +0200
-Subject: [PATCH 01/11] common: Fix grabbing of multimedia keys
-
----
- plugins/common/gsd-keygrab.c |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 70fde7a..1d50a22 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -146,9 +146,9 @@ grab_key_unsafe (Key                 *key,
-          * (which are useful to grab without a modifier).
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
--            (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
--             IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) ||
--             key->keysym == GDK_KEY_Pause)) {
-+            !IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
-+            !IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) &&
-+             key->keysym != GDK_KEY_Pause) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
--- 
-1.7.6
-
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch
deleted file mode 100644
index 84d6d6beceab..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-defines.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From afceb3e697934780b487db1e11e21fb23cbe9e28 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 01 Jul 2011 12:28:51 +0000
-Subject: common: Use defines instead of variables for ranges
-
-Seeing as those won't ever change.
----
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 464f6e8..17e287c 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -42,8 +42,10 @@ static GdkModifierType gsd_ignored_mods = 0;
- static GdkModifierType gsd_used_mods = 0;
- 
- /* Taken from a comment in XF86keysym.h */
--static guint gsd_unmodified_keysym_min = 0x10080001;
--static guint gsd_unmodified_keysym_max = 0x1008FFFF;
-+#define XF86KEYS_RANGE_MIN 0x10080001
-+#define XF86KEYS_RANGE_MAX 0x1008FFFF
-+
-+#define IN_RANGE(x, min, max) (x >= min && x <= max)
- 
- static void
- setup_modifiers (void)
-@@ -141,8 +143,7 @@ grab_key_unsafe (Key                 *key,
-          * a modifier).
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
--            ((key->keysym < gsd_unmodified_keysym_min) ||
--             (key->keysym > gsd_unmodified_keysym_max))) {
-+            (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX))) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch
deleted file mode 100644
index 6603f7e22173..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-function-keys.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From bc6561d2b2adbe39e928528dfaba2d129b143952 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 01 Jul 2011 12:32:30 +0000
-Subject: common: Fix function keys not being grabbed
-
-Because they were unmodified, and we tried to avoid screwing
-up the user's keymaps for those.
-
-Bug was introduced in 469145ff59fe2a65d603cfeb5011427dc0f7c36b
-
-https://bugzilla.gnome.org/show_bug.cgi?id=649222
----
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 17e287c..31c1ba6 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -45,6 +45,9 @@ static GdkModifierType gsd_used_mods = 0;
- #define XF86KEYS_RANGE_MIN 0x10080001
- #define XF86KEYS_RANGE_MAX 0x1008FFFF
- 
-+#define FKEYS_RANGE_MIN GDK_KEY_F1
-+#define FKEYS_RANGE_MAX GDK_KEY_F35
-+
- #define IN_RANGE(x, min, max) (x >= min && x <= max)
- 
- static void
-@@ -139,11 +142,12 @@ grab_key_unsafe (Key                 *key,
-         /* If key doesn't have a usable modifier, we don't want
-          * to grab it, since the user might lose a useful key.
-          *
--         * The exception is the XFree86 keys (which are useful to grab without
--         * a modifier).
-+         * The exception is the XFree86 keys and the Function keys
-+         * (which are useful to grab without a modifier).
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
--            (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX))) {
-+            IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
-+            IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX)) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch
deleted file mode 100644
index a5fc2d3abd84..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-pause.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 65a5ca27a24a2d5a59797d13f305b13026794fc2 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 01 Jul 2011 12:39:45 +0000
-Subject: common: Allow the "Pause" key to be used
-
-That'd be the "Pause"/"PrtScreen" key, not AudioPause.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=653524
----
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 304c8c2..70fde7a 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -147,7 +147,8 @@ grab_key_unsafe (Key                 *key,
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
-             (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
--             IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX))) {
-+             IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX) ||
-+             key->keysym == GDK_KEY_Pause)) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
---
-cgit v0.9
diff --git a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch b/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch
deleted file mode 100644
index 7a2f3052b021..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-keygrab-range.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 74631cb8e0950c7a648df53195377b0c96a09008 Mon Sep 17 00:00:00 2001
-From: Bastien Nocera <hadess@hadess.net>
-Date: Fri, 01 Jul 2011 12:38:50 +0000
-Subject: common: Fix keys range check
-
-That could never happen...
----
-diff --git a/plugins/common/gsd-keygrab.c b/plugins/common/gsd-keygrab.c
-index 31c1ba6..304c8c2 100644
---- a/plugins/common/gsd-keygrab.c
-+++ b/plugins/common/gsd-keygrab.c
-@@ -146,8 +146,8 @@ grab_key_unsafe (Key                 *key,
-          * (which are useful to grab without a modifier).
-          */
-         if ((modifiers & gsd_used_mods) == 0 &&
--            IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) &&
--            IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX)) {
-+            (IN_RANGE(key->keysym, XF86KEYS_RANGE_MIN, XF86KEYS_RANGE_MAX) ||
-+             IN_RANGE(key->keysym, FKEYS_RANGE_MIN, FKEYS_RANGE_MAX))) {
-                 GString *keycodes;
- 
-                 keycodes = g_string_new ("");
---
-cgit v0.9
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
deleted file mode 100644
index 977b38ce40b1..000000000000
--- a/gnome-base/gnome-settings-daemon/files/gnome-settings-daemon-3.0.2-wacom-touch.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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-r2.ebuild b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild
index ab0567473e46..aae1315861c0 100644
--- a/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild
+++ b/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.0.2-r2.ebuild,v 1.3 2011/09/05 19:51:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-settings-daemon/gnome-settings-daemon-3.2.2.ebuild,v 1.1 2011/11/13 18:02:09 tetromino Exp $
 
-EAPI="3"
+EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit eutils gnome2
+inherit autotools eutils gnome2 virtualx
 
 DESCRIPTION="Gnome Settings Daemon"
 HOMEPAGE="http://www.gnome.org"
@@ -14,34 +14,40 @@ HOMEPAGE="http://www.gnome.org"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
+IUSE="+colord +cups debug packagekit policykit short-touchpad-timeout smartcard +udev"
 
 # Latest gsettings-desktop-schemas is needed due to commit e8d1de92
+# Latest gnome-desktop needed to fix the DPMS timeout bug #385063
+# colord-0.1.13 needed to avoid polkit errors in CreateProfile and CreateDevice
+# upower-0.9.11 needed for UpSleepKind
 COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
-	>=dev-libs/glib-2.26.0:2
+	>=dev-libs/glib-2.29.14:2
 	>=x11-libs/gtk+-2.99.3:3
 	>=gnome-base/gconf-2.6.1:2
 	>=gnome-base/libgnomekbd-2.91.1
-	>=gnome-base/gnome-desktop-2.91.5:3
+	>=gnome-base/gnome-desktop-3.2.0-r1:3
 	>=gnome-base/gsettings-desktop-schemas-0.1.7.1
 	media-fonts/cantarell
 	media-libs/fontconfig
-
-	>=x11-libs/libnotify-0.6.1
+	>=media-libs/lcms-2.2:2
+	media-libs/libcanberra[gtk3]
+	>=media-sound/pulseaudio-0.9.16
+	>=sys-power/upower-0.9.11
+	>=x11-libs/libnotify-0.7.3
+	x11-libs/libX11
 	x11-libs/libXi
 	x11-libs/libXext
+	x11-libs/libXfixes
 	x11-libs/libXxf86misc
 	>=x11-libs/libxklavier-5.0
 	>=media-sound/pulseaudio-0.9.16
-	media-libs/libcanberra[gtk3]
 
+	colord? ( >=x11-misc/colord-0.1.13 )
 	cups? ( >=net-print/cups-1.4[dbus] )
 	packagekit? (
-		dev-libs/glib:2
 		|| ( sys-fs/udev[gudev]
 			sys-fs/udev[extras] )
-		>=app-admin/packagekit-base-0.6.4
-		>=sys-power/upower-0.9.1 )
+		>=app-admin/packagekit-base-0.6.12 )
 	policykit? (
 		>=sys-auth/polkit-0.97
 		>=sys-apps/dbus-1.1.2[X] )
@@ -49,19 +55,26 @@ COMMON_DEPEND=">=dev-libs/dbus-glib-0.74
 	udev? ( || ( sys-fs/udev[gudev]
 		sys-fs/udev[extras] ) )"
 # Themes needed by g-s-d, gnome-shell, gtk+:3 apps to work properly
+# <gnome-color-manager-3.1.1 has file collisions with g-s-d-3.1.x
+# <gnome-power-manager-3.1.3 has file collisions with g-s-d-3.1.x
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/dconf
 	>=x11-themes/gnome-themes-standard-2.91
 	>=x11-themes/gnome-icon-theme-2.91
 	>=x11-themes/gnome-icon-theme-symbolic-2.91
-	!<gnome-base/gnome-control-center-2.22"
+	!<gnome-base/gnome-control-center-2.22
+	!<gnome-extra/gnome-color-manager-3.1.1
+	!<gnome-extra/gnome-power-manager-3.1.3"
+# xproto-7.0.15 needed for power plugin
 DEPEND="${COMMON_DEPEND}
 	cups? ( sys-apps/sed )
 	sys-devel/gettext
 	>=dev-util/intltool-0.40
 	>=dev-util/pkgconfig-0.19
 	x11-proto/inputproto
-	x11-proto/xproto"
+	x11-proto/kbproto
+	x11-proto/xf86miscproto
+	>=x11-proto/xproto-7.0.15"
 
 pkg_setup() {
 	# README is empty
@@ -70,6 +83,8 @@ pkg_setup() {
 		--disable-static
 		--disable-schemas-compile
 		--enable-gconf-bridge
+		--with-pnpids=${EPREFIX}/usr/share/libgnome-desktop-3.0/pnp.ids
+		$(use_enable colord color)
 		$(use_enable cups)
 		$(use_enable debug)
 		$(use_enable debug more-warnings)
@@ -80,12 +95,9 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Patch from upstream git, will be in next release
-	epatch "${FILESDIR}/${P}-wacom-touch.patch"
-	# Patches for various keyboard shortcut bugs, will be in next release
-	epatch "${FILESDIR}/${P}-keygrab-"{defines,function-keys,range,pause}.patch
-	# bug #375087
-	epatch "${FILESDIR}/${P}-keygrab-broken-logic.patch"
+	# Backport patch from git master branch (not in gnome-3-2 branch yet)
+	# fixing loading color profiles at startup
+	epatch "${FILESDIR}/${PN}-3.2.0-color-unbreak-loading-profiles.patch"
 
 	# https://bugzilla.gnome.org/show_bug.cgi?id=621836
 	# Apparently this change severely affects touchpad usability for some
@@ -94,9 +106,17 @@ src_prepare() {
 	use short-touchpad-timeout &&
 		epatch "${FILESDIR}/${PN}-3.0.2-short-touchpad-timeout.patch"
 
+	# Make colord optional; requires eautoreconf
+	epatch "${FILESDIR}/${PN}-3.2.1-optional-colord.patch"
+	eautoreconf
+
 	gnome2_src_prepare
 }
 
+src_test() {
+	Xemake check
+}
+
 src_install() {
 	gnome2_src_install