Add functionality for setting the default background for gdm, per bug #293439. Many thanks to Peter Henriksson. Fix QA.

Package-Manager: portage-2.2_rc50/cvs/Linux x86_64

4 files changed, 268 insertions, 12 deletions

diff --git a/gnome-base/gnome-control-center/ChangeLog b/gnome-base/gnome-control-center/ChangeLog
index 364e4aba2bf3..c837cbad5c23 100644
--- a/gnome-base/gnome-control-center/ChangeLog
+++ b/gnome-base/gnome-control-center/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for gnome-base/gnome-control-center
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.39 2009/11/05 20:38:58 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/ChangeLog,v 1.40 2009/11/17 18:58:31 mrpouet Exp $
+
+*gnome-control-center-2.28.1-r1 (17 Nov 2009)
+
+  17 Nov 2009; Romain Perier <mrpouet@gentoo.org>
+  +gnome-control-center-2.28.1-r1.ebuild,
+  +files/gnome-control-center-2.28.1-gdm-default-bg.patch:
+  Add functionality for setting the default background for gdm,
+  per bug #293439. Many thanks to Peter Henriksson. Fix QA.
+
 
   05 Nov 2009; Markus Meier <maekke@gentoo.org>
   gnome-control-center-2.26.0.ebuild:
diff --git a/gnome-base/gnome-control-center/Manifest b/gnome-base/gnome-control-center/Manifest
index 1f7b38adce6c..5c3d0895d656 100644
--- a/gnome-base/gnome-control-center/Manifest
+++ b/gnome-base/gnome-control-center/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX gnome-control-center-2.24.0.1-capplet-help.patch 2345 RMD160 c92a563b9881b41015918f9fdba546d50e471b60 SHA1 e91afbf8f8802a51411ad5e5c22cf417800b3452 SHA256 c6f3cc0a9b5eeb569e2b62c75bf55f211fd7ba08de7b6db3923c7b40a71e7a95
 AUX gnome-control-center-2.24.0.1-fbsd.patch 394 RMD160 e5558b7be781663e05c8964355443a2ec993b6a4 SHA1 e6a23b54558824b279a74fdda6afbecb7621b9cf SHA256 d7216a88d518110e3d6a9b64e72e8a02fea1c1b48da43783d0ca0c06f610e11f
 AUX gnome-control-center-2.24.0.1-gnome-desktop-api.patch 1247 RMD160 1abed623fbddf91a868b9996d58fa48fd5153671 SHA1 332f4768418c4ddf7127fce28005a1f4580d8b18 SHA256 5441d0c54f18dc20a4bf81b2e79b4ad047e65ac2e3d4afad0d54c6b8d4a7eeea
@@ -10,6 +7,7 @@ AUX gnome-control-center-2.26.0-automagics-canberra+polkit.patch 2432 RMD160 8dc
 AUX gnome-control-center-2.26.0-default-background.patch 6341 RMD160 287b29d28ea56a7a25cb189412b41b0ba4dec9af SHA1 58297198e1e1d3c0f8de0b63316ddfd9e7488d5d SHA256 c6cf58d7e284df4a25b8ad226b5d3dc8c56f697e23962a4944e140c65c109edd
 AUX gnome-control-center-2.26.0-gconf-unref.patch 680 RMD160 46e913235adea15003228959e9b198941602d904 SHA1 ddac887dd06f47ba2c624882e60f60ff6cb2986e SHA256 cd79f88e29b2c662910c6ddc57bd24958ba4f1c71ca60bf668f7c20261b1c573
 AUX gnome-control-center-2.26.0-libxklavier4.patch 1651 RMD160 1bacf04c569b59a091a4ee2ac4d2b7d695be0f68 SHA1 7666c459f5aa71dd65e14ea092fff83588227f39 SHA256 453c08693d9fa79e6252a17e9aeef297089f6c709e2132e78b9a6b2858f051e4
+AUX gnome-control-center-2.28.1-gdm-default-bg.patch 4946 RMD160 7a8593a071548dd7b8a562927eae56d08164c489 SHA1 2c36d84ba5498a387dd7973eef7b18bac9a40609 SHA256 d6cdfbf3c293d3fa57bf49bd7ba55f41074202df617cd12607b9bacbdb2eb49e
 AUX org.gnome.control-center.defaultbackground.policy 836 RMD160 0e830941e4e03bd0c84ec6a352ed5df598f2ccb5 SHA1 c70e2db5e125e1236b0e796c3d9e293ecb3b58a7 SHA256 4fb135d55626e03a2b02b6c325e0fa3ee773984af2258acb3e2f1b22373dce52
 DIST gnome-control-center-2.24.0.1.tar.bz2 2113356 RMD160 5f211b12f7260a8af8c602066133d72cb61cc3f6 SHA1 daf737c762d53ef984a55fc5008e6a4e85b88294 SHA256 fa5d1ba5cb2f88d3c689c8a2bceb57508777a23cff020dcf2de67ad81b0fe57d
 DIST gnome-control-center-2.26.0.tar.bz2 2262324 RMD160 d22c75b21d63bad9321ad1221e442f381da8dd35 SHA1 4730780aaab599869a2dfe2d72d68dd54bb77058 SHA256 62fb84ea1053971a53c5259b92eb3a282c2f317f72f761ed4dff434ed0e99c05
@@ -18,13 +16,7 @@ EBUILD gnome-control-center-2.24.0.1-r1.ebuild 2769 RMD160 8df832492e029b55239eb
 EBUILD gnome-control-center-2.24.0.1-r10.ebuild 2938 RMD160 f78416df69f49fe61074522791495241caffeed5 SHA1 c54dc1420c43c801806def07bc9bc7c3be8529db SHA256 661d46db71e3b81af155a8cb42dfed0d2a97ef9a87924e6f57d4f24ff852b20d
 EBUILD gnome-control-center-2.24.0.1.ebuild 2556 RMD160 76370a1d6750c343fe9c5791d0335991133a4dfa SHA1 2baecb6a12008f05d9b3f011413e6fe9bdf79bb4 SHA256 413162a78846d58d95e46e051e2a6d6d24ecd235e4acb1a2a5fa636670b6e698
 EBUILD gnome-control-center-2.26.0.ebuild 2977 RMD160 c1e285aa9bd535f2b615c5e4f78c61b249fff63b SHA1 8051ca52c579f68281aefec93a28a8e2f1b856eb SHA256 37bdfddefab75078471c82fb35d60879e9d79e5d12d80ad27873cc26b54410b0
+EBUILD gnome-control-center-2.28.1-r1.ebuild 2350 RMD160 1c63b7588e065d133b423f00ca3bc19535006b06 SHA1 6b29fced6be4cf3752cfc1fee16259b6d4555efd SHA256 2cfb59513ead90e18b75fa74b6ea9bea01d8148e129383754b4ad32cd3696439
 EBUILD gnome-control-center-2.28.1.ebuild 2226 RMD160 fc8765ff967ec8f19e02abbe70423607eeb2d218 SHA1 2abf3bbbb9d5ee3f510e14bece9203b7836c6478 SHA256 924c70582de6e2cffe770edfd5530415e1c7cda7c8860b44ff74d20c3ec4a8a6
-MISC ChangeLog 44049 RMD160 3d74c2c13ea336dfcbcdd15ec792049a712d441f SHA1 4c84d9d446ff6d76d8afe8583e4222e85f78ebdb SHA256 6ea7beb7ca08ac6eedd72003b1c4e8858669de3e85cd0ddb2a9b763b7d23344b
+MISC ChangeLog 44374 RMD160 0b541558fa2eca6d7ee95544eac5bb47bbd37d9d SHA1 aa5300f7fb4a3be4fb104abfb93ac99c0c939068 SHA256 b0388b3645626cd9ff584622075d41a1b49b7f22efb38cdbcc326616330d2cf8
 MISC metadata.xml 264 RMD160 e891c8cddd44dc4a25f7b9a1172e8ad7332177c0 SHA1 379b57843ca1c94fe14c334b39d6aa2d1822623c SHA256 3df2f5e7333311872f1351c41df47ecfbfa3a85534f210911603d72968cb2d22
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkrzN/YACgkQkKaRLQcq0GL4bwCfYQwqF5kcV8ag1wYjyt5s257B
-jmkAn2vKJEYzE8yu8EpTbBFyU+hbMnWR
-=aKlo
------END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-control-center/files/gnome-control-center-2.28.1-gdm-default-bg.patch b/gnome-base/gnome-control-center/files/gnome-control-center-2.28.1-gdm-default-bg.patch
new file mode 100644
index 000000000000..bfd44cf7c768
--- /dev/null
+++ b/gnome-base/gnome-control-center/files/gnome-control-center-2.28.1-gdm-default-bg.patch
@@ -0,0 +1,160 @@
+From d97abc9405b138f9d5ed600b85a9c1d0a97f1877 Mon Sep 17 00:00:00 2001
+From: Peter Henriksson <peter.henriksson@gmail.com>
+Date: Mon, 16 Nov 2009 23:45:56 +0100
+Subject: [PATCH] Add functionality for setting the default background
+
+Rebased patch from gnome bug #536531.
+---
+ capplets/appearance/appearance-desktop.c |  115 ++++++++++++++++++++++++++++++
+ 1 files changed, 115 insertions(+), 0 deletions(-)
+
+diff --git a/capplets/appearance/appearance-desktop.c b/capplets/appearance/appearance-desktop.c
+index b0043dc..2568e35 100644
+--- a/capplets/appearance/appearance-desktop.c
++++ b/capplets/appearance/appearance-desktop.c
+@@ -30,6 +30,7 @@
+ #include <gconf/gconf-client.h>
+ #include <libgnomeui/gnome-desktop-thumbnail.h>
+ #include <libgnomeui/gnome-bg.h>
++#include <dbus/dbus-glib.h>
+ 
+ enum {
+   TARGET_URI_LIST,
+@@ -984,6 +985,100 @@ wp_select_after_realize (GtkWidget *widget,
+   select_item (data, item, TRUE);
+ }
+ 
++static char *background_keys[7] = {
++  "/desktop/gnome/background/picture_filename",
++  "/desktop/gnome/background/picture_opacity",
++  "/desktop/gnome/background/picture_options",
++  "/desktop/gnome/background/color_shading_type",
++  "/desktop/gnome/background/primary_color",
++  "/desktop/gnome/background/secondary_color",
++  NULL
++};
++
++static void
++set_background (GtkAction *action, gpointer data)
++{
++  AppearanceData *adata = (AppearanceData *)data;
++  DBusGProxy *proxy;
++  DBusGConnection *connection;
++  GError *error;
++
++  gconf_client_suggest_sync (adata->client, NULL);
++
++  error = NULL;
++  connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++  if (error != NULL) {
++    g_warning ("failed to get system bus connection: %s", error->message);
++    g_error_free (error);
++    return;
++  }
++
++  proxy = dbus_g_proxy_new_for_name (connection,
++                                     "org.gnome.GConf.Defaults",
++                                     "/",
++                                     "org.gnome.GConf.Defaults");
++  if (proxy == NULL) {
++    g_warning ("Cannot connect to defaults mechanism");
++    return;
++  }
++
++  if (!dbus_g_proxy_call (proxy, "SetSystem",
++                          &error,
++                          G_TYPE_STRV, background_keys,
++                          G_TYPE_STRV, NULL,
++                          G_TYPE_INVALID,
++                          G_TYPE_INVALID)) {
++    g_warning ("error calling SetSystem: %s\n", error->message);
++    g_error_free (error);
++  }
++
++  g_object_unref (proxy);
++}
++
++static void
++check_can_set_background (GtkAction *action)
++{
++  DBusGProxy *proxy;
++  DBusGConnection *connection;
++  GError *error;
++  guint result;
++
++  result = 0;
++
++  error = NULL;
++  connection = dbus_g_bus_get (DBUS_BUS_SYSTEM, &error);
++  if (error != NULL) {
++    g_warning ("failed to get system bus connection: %s", error->message);
++    g_error_free (error);
++    goto out;
++  }
++
++  proxy = dbus_g_proxy_new_for_name (connection,
++                                     "org.gnome.GConf.Defaults",
++                                     "/",
++                                     "org.gnome.GConf.Defaults");
++  if (proxy == NULL) {
++    g_warning ("Cannot connect to defaults mechanism");
++    goto out;
++  }
++
++  if (!dbus_g_proxy_call (proxy, "CanSetSystem",
++                          &error,
++                          G_TYPE_STRV, background_keys,
++                          G_TYPE_INVALID,
++		          G_TYPE_UINT, &result,
++                          G_TYPE_INVALID)) {
++    g_warning ("error calling CanSetSystem: %s\n", error->message);
++    g_error_free (error);
++  }
++
++  g_print ("calling CanSetSystem: %d\n", result);
++  g_object_unref (proxy);
++
++out:
++  gtk_action_set_visible (action, result != 0);
++}
++
+ static GdkPixbuf *buttons[3];
+ 
+ static void
+@@ -1146,6 +1241,8 @@ desktop_init (AppearanceData *data,
+ {
+   GtkWidget *add_button, *w;
+   GtkCellRenderer *cr;
++  GtkAction *action;
++  GtkWidget *widget, *box, *button;
+   char *url;
+ 
+   g_object_set (gtk_settings_get_default (), "gtk-tooltip-timeout", 500, NULL);
+@@ -1295,6 +1392,24 @@ desktop_init (AppearanceData *data,
+   /* create the file selector later to save time on startup */
+   data->wp_filesel = NULL;
+ 
++  widget = appearance_capplet_get_widget (data, "background_vbox");
++  box = gtk_hbox_new (FALSE, 0);
++  gtk_box_pack_end (GTK_BOX (widget), box, FALSE, FALSE, 0);
++
++  action = gtk_action_new ("set-system",
++                           _("Make Default"),
++                           _("Set the current background as the system-wide default"),
++                           NULL);
++  check_can_set_background (action);
++          
++  button = gtk_button_new ();
++  gtk_activatable_set_related_action (GTK_ACTIVATABLE (button), action);
++  gtk_widget_set_no_show_all (button, TRUE);
++  g_object_unref (action);
++
++  gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
++
++  g_signal_connect (action, "activate", G_CALLBACK (set_background), data);
+ }
+ 
+ void
+-- 
+1.6.5.2
+
diff --git a/gnome-base/gnome-control-center/gnome-control-center-2.28.1-r1.ebuild b/gnome-base/gnome-control-center/gnome-control-center-2.28.1-r1.ebuild
new file mode 100644
index 000000000000..c91168c639f5
--- /dev/null
+++ b/gnome-base/gnome-control-center/gnome-control-center-2.28.1-r1.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-control-center/gnome-control-center-2.28.1-r1.ebuild,v 1.1 2009/11/17 18:58:31 mrpouet Exp $
+
+EAPI="2"
+
+inherit eutils gnome2
+
+DESCRIPTION="The gnome2 Desktop configuration tool"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="eds"
+
+RDEPEND="x11-libs/libXft
+	>=x11-libs/libXi-1.2
+	>=x11-libs/gtk+-2.15.0
+	>=dev-libs/glib-2.17.4
+	>=gnome-base/gconf-2.0
+	>=gnome-base/librsvg-2.0
+	>=gnome-base/nautilus-2.6
+	>=media-libs/fontconfig-1
+	>=dev-libs/dbus-glib-0.73
+	>=x11-libs/libxklavier-4.0
+	>=x11-wm/metacity-2.23.1
+	>=gnome-base/libgnomekbd-2.27.4
+	>=gnome-base/gnome-desktop-2.27.90
+	>=gnome-base/gnome-menus-2.11.1
+	gnome-base/gnome-settings-daemon
+
+	dev-libs/libunique
+	x11-libs/pango
+	dev-libs/libxml2
+	media-libs/freetype
+	>=media-libs/libcanberra-0.4[gtk]
+
+	eds? ( >=gnome-extra/evolution-data-server-1.7.90 )
+
+	x11-apps/xmodmap
+	x11-libs/libXScrnSaver
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-libs/libXxf86misc
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libXcursor"
+DEPEND="${RDEPEND}
+	x11-proto/scrnsaverproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	x11-proto/xf86miscproto
+	x11-proto/kbproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+
+	sys-devel/gettext
+	>=dev-util/intltool-0.40
+	>=dev-util/pkgconfig-0.19
+	dev-util/desktop-file-utils
+
+	app-text/scrollkeeper
+	>=app-text/gnome-doc-utils-0.10.1"
+# Needed for autoreconf
+#	gnome-base/gnome-common
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		--disable-update-mimedb
+		--disable-static
+		$(use_enable eds aboutme)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Fix intltoolize broken file, see upstream #577133
+	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	# Fix compilation on fbsd, bug #256958
+	epatch "${FILESDIR}/${PN}-2.24.0.1-fbsd.patch"
+	# Add functionality for setting the default background in gdm,
+	# bug 293439.
+	epatch "${FILESDIR}/${P}-gdm-default-bg.patch"
+}
+
+src_install() {
+	gnome2_src_install
+	# gmodule is used to load plugins
+	# (on POSIX systems gmodule uses dlopen)
+	find "${D}" -name "*.la" -delete || die "remove of la files failed"
+}