Avoid uselessly loading background, bug #251350.

(Portage version: 2.2_rc20/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

3 files changed, 92 insertions, 2 deletions

diff --git a/gnome-base/gnome-desktop/ChangeLog b/gnome-base/gnome-desktop/ChangeLog
index 44750068d03c..07665086955c 100644
--- a/gnome-base/gnome-desktop/ChangeLog
+++ b/gnome-base/gnome-desktop/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-desktop
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.230 2008/12/01 23:45:14 eva Exp $
+# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/ChangeLog,v 1.231 2009/01/04 00:20:24 eva Exp $
+
+*gnome-desktop-2.24.2-r1 (04 Jan 2009)
+
+  04 Jan 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  +files/gnome-desktop-2.24.2-background.patch,
+  +gnome-desktop-2.24.2-r1.ebuild:
+  Avoid uselessly loading background, bug #251350.
 
   01 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-desktop-2.22.3.ebuild, gnome-desktop-2.24.2.ebuild:
diff --git a/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch b/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch
new file mode 100644
index 000000000000..4c5fb8fdee16
--- /dev/null
+++ b/gnome-base/gnome-desktop/files/gnome-desktop-2.24.2-background.patch
@@ -0,0 +1,26 @@
+# Do not load background if not needed
+#
+# https://bugs.gentoo.org/show_bug.cgi?id=251350
+# http://bugzilla.gnome.org/show_bug.cgi?id=564909
+--- a/libgnome-desktop/gnome-bg.c	2008-12-17 10:42:28.000000000 -0800
++++ b/libgnome-desktop/gnome-bg.c	2008-12-17 10:44:33.000000000 -0800
+@@ -284,6 +284,7 @@
+ 	GnomeBGColorType ctype;
+ 	GdkColor c1, c2;
+ 	GnomeBGPlacement placement;
++	gboolean enabled;
+ 
+ 	g_return_if_fail (GNOME_IS_BG (bg));
+ 	g_return_if_fail (client != NULL);
+@@ -291,7 +292,9 @@
+ 	/* Filename */
+ 	filename = NULL;
+ 	tmp = gconf_client_get_string (client, BG_KEY_PICTURE_FILENAME, NULL);
+-	if (tmp != NULL && *tmp != '\0') {
++	enabled = gconf_client_get_bool (client, BG_KEY_DRAW_BACKGROUND, NULL);
++
++	if (tmp != NULL && *tmp != '\0' && enabled) {
+ 		if (g_utf8_validate (tmp, -1, NULL) &&
+ 		    g_file_test (tmp, G_FILE_TEST_EXISTS)) {
+ 			filename = g_strdup (tmp);
+
diff --git a/gnome-base/gnome-desktop/gnome-desktop-2.24.2-r1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-2.24.2-r1.ebuild
new file mode 100644
index 000000000000..664ab902f8bb
--- /dev/null
+++ b/gnome-base/gnome-desktop/gnome-desktop-2.24.2-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-desktop/gnome-desktop-2.24.2-r1.ebuild,v 1.1 2009/01/04 00:20:24 eva Exp $
+
+inherit eutils gnome2
+
+DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+# FIXME: Python deps are needed for gnome-about but not
+# listed in configure.ac
+RDEPEND=">=dev-libs/libxml2-2.4.20
+	>=x11-libs/gtk+-2.11.3
+	>=dev-libs/glib-2.15.4
+	>=x11-libs/libXrandr-1.2
+	>=gnome-base/gconf-2
+	>=gnome-base/libgnomeui-2.6
+	>=x11-libs/startup-notification-0.5
+	>=dev-python/pygtk-2.8
+	>=dev-python/pygobject-2.14
+	>=dev-python/libgnome-python-2.22"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.9
+	>=app-text/gnome-doc-utils-0.3.2
+	doc? ( >=dev-util/gtk-doc-1.4 )
+	~app-text/docbook-xml-dtd-4.1.2
+	x11-proto/xproto
+	>=x11-proto/randrproto-1.2"
+# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto
+# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and
+# eventually libXrandr shouldn't RDEPEND on randrproto)
+
+DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --with-gnome-distributor=Gentoo --disable-scrollkeeper"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Do not load background if not needed, bug #251350
+	epatch "${FILESDIR}/${P}-background.patch"
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "If you are upgrading from <gnome-base/gnome-desktop-2.24, please"
+	ewarn "make sure you run revdep-rebuild at the end of the upgrade."
+}