gnome-base/gconf-3.2.6-r3: revbump/merge

Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>

6 files changed, 208 insertions, 21 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 9aa57e0..97fb451 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,24 @@
 # ChangeLog for gnome-base/gconf
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.285 2013/12/08 18:25:00 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.288 2014/04/05 07:48:52 pacho Exp $
+
+*gconf-3.2.6-r2 (05 Apr 2014)
+
+  05 Apr 2014; Pacho Ramos <pacho@gentoo.org>
+  +files/gconf-3.2.6-gsettings-data-convert-paths.patch,
+  +files/gconf-3.2.6-mconvert-crasher.patch,
+  +files/gconf-3.2.6-spew-console-error.patch, +gconf-3.2.6-r2.ebuild,
+  -gconf-2.32.4.ebuild, -gconf-3.2.6.ebuild:
+  gtk is not really needed (#505444 by Rafal Muzylo), drop orbit as it's dead
+  for ages, nothing needs it in the tree and we really want people to not use
+  that and, instead, use dbus for GConf's IPC. Also apply patches from upstream
+  master branch. Drop old.
+
+  22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gconf-3.2.6-r1.ebuild:
+  Fix wrong commit, bug 502160
+
+  22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gconf-3.2.6-r1.ebuild:
+  arch stable, bug 888
 
   08 Dec 2013; Pacho Ramos <pacho@gentoo.org> gconf-3.2.6-r1.ebuild:
   x86 stable, bug #478252
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 7a688cf..a312977 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,6 +1,9 @@
 AUX gconf-2.24.0-no-gconfd.patch 787 SHA256 f8352648276d2a2dab162ddade55ec0371e7c4f8bc3834de246fda8c32c66d3c SHA512 c7f7437321d2afcbe75a8b8d819f04e5864cde3b2130f6dcff78c622b9bd336c66a30d666e0a4283d2fcf5c54afc741cc84f90401889127b03ef22b0752fb7b8 WHIRLPOOL 86c118fb0b571b5c47849fd4f7f09ade4ebf76324771fe9cccc64d95462cf3ab1a32de9a312412f843129025c41253d658a6546d7c3d9496451b9aacdf3b9451
 AUX gconf-2.28.0-entry-set-value-sigsegv.patch 533 SHA256 e58c0981491e794de05dd71562e0a9675433469e87c7149088ebea432c9619b0 SHA512 c0576004aa8c8b64750037183a5d3df5b4d8ba520c83f33a906a8549139e2167d08c1bcc56cbdfe202bb078a703bd561680af63588f7ee4eb42ad6077182a3fa WHIRLPOOL eddf3b88ddbec7e29f2a58e6ccf26859e0846ec9b01e821f28dc584a9ad297805f5313e29dca5e5d576cca704e1ddb458fd322a3380ed65ddd4bb7d6924d862c
+AUX gconf-3.2.6-gsettings-data-convert-paths.patch 1370 SHA256 836d5259ae84832004447defc2f0cea15ca1d8fffec6b8bf5d7eabb4d090070d SHA512 f4d7cc2261f82f7a28e574ec3b732a56bb3f067048312e318f8d23df93046489fdd5ad39d669cf0d9ada6cc07617524511c537a4f2fd0a37cd03788e84b9803b WHIRLPOOL 7e0f0d27fc05dcca803600b05ddddd3a7d02d4e984042aaa3be06a86943910dcb734c1a577a24db6f27c9b021a08ca866f6ab357162518398998f8d66ba79e91
+AUX gconf-3.2.6-mconvert-crasher.patch 1514 SHA256 22ada6a8e7c26b1c89df8c79a9a46fd3a43b35b9e96657e328ccd6f376f7034e SHA512 8b6885098b63077610b929c3b958efc04599a1f891a0d7b5f042f2638dbae7b3c67b97e7f4e34c439e55ff8c5df3bcc7c6edc56f11cd6506a4b28c2338c8511b WHIRLPOOL 483cd709829cee9396486f521f07aa978b2fed04d942230bd28f9bc1e040ac668d0bc3c2755c2778356bf754700c7b09e5c15b098a4a23f146d337f5d5ffd99e
+AUX gconf-3.2.6-spew-console-error.patch 2594 SHA256 3638009b19744bd301364e110da70f8013fa41a68e4367f7eefae4b8fd7a05c7 SHA512 abdddbcab24d80870691a45cdf8d4baa7021f363efa26ba140221afef0bd96756b7234fb1d61ea46c4d137854f59d2589f2e1f1d125fdcb1fad3acf9215a8602 WHIRLPOOL 27a02c790d3b59b7c2c717310270f3665bffb1e13d2786f98880e9bf38ab57f694e8ee384c00926ad1a67f62dff2ae20ea3392c176fb91ccedbbff8f1f52d141
 DIST GConf-3.2.6.tar.xz 1559904 SHA256 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c SHA512 35f5f659f9d03f7531a7102adacbda0eb310d8a55a831c768c91a82e07dae21247726e00e0e411f63b1de9ade0f042ded572a3ea4a4b2ad3135231f344540b58 WHIRLPOOL ef38b5fb25b3cf915052ce00f926a0a9bf8ecb5771c2db0fd6f5f11531a8edb1c098a036eaaa20490e3de87a0a5eb411542f86d8c6a2be8ac45dcae0b29d3414
-EBUILD gconf-3.2.6-r2.ebuild 3245 SHA256 5dca37502eb8531db950224eef0b2518558d5adee85edfc6612118a23632cb42 SHA512 0255299bbfbc7c030c038efe2711d51faadbae645344945ed3eaf90be565d9fdf0b53a450493b8619dfe73c42e5859d146beebbf7567fd1e9d6662a4b43838f3 WHIRLPOOL 87a38277cc866a80e5d759ceebc350dcad88b4fe6093fe75b2a1ab84a92e85d7732d3d08d9489754b1e08f55c0121e8772dab7827c42cb5299b9d27e3f55f2b9
-MISC ChangeLog 38588 SHA256 2eb6440b534a6cd8210e61715d562018ec027e99165d4aa4a79fefe5ceb2fb5a SHA512 358907b75a081f7384187c46d5cbd8cb83bc4c4efa45547e5ad3d1594432e1fb4be80779d4bfba060578d94fd1d4cbd6a41a1ba8fbce8328b5c47008f616248c WHIRLPOOL f7f6cd8d43e65cde6089c5c15b2648833880d376662b75d80813f7fa51727122100f923d3d0cbe02a3e2ea32b1df63bd3cbb0487d59266b5a0131e66e4589cda
+EBUILD gconf-3.2.6-r3.ebuild 2990 SHA256 ac8c8c9c36cd505f56eb6f20714b6653440e5bcebba1fab1cf55a212b5eb1a9b SHA512 d44bf38889ffe89937b6658061e9cf78e03d08b1aa5b46cfd3a4bcdfdb9e10968e357b3e8b7fdcc61deeb562aaaa0fdcde6344e3211bea802ae41053694a7300 WHIRLPOOL deb5fc0c784dce7a64a36116dbe038b5a31387d2f61f407b1fe94ae2ce720215761c4c3d34d3de2892608c6439cfc5837c81f9e054bb48219d0ba273363fdfad
+MISC ChangeLog 39341 SHA256 59a7f9c3b527286fd979709368beff55a805ff91f06a25e8db0eb023394c3e3b SHA512 f05bae4968cc85f78ff5732bbeccf6a0b291df1099cbe03e3627d2d4cef3339a8a03be189d4be46e2d7312f58c35d1b5488f189c67484fecec7a64dce20a1ef6 WHIRLPOOL 564c87d073eb51b640e929025c85a64541c3b0e160790ee8e99a566b365df619b70bc06002d1ca77537bed1d1d428252bb2ea1f616ee98b760a3283cf6f543cc
 MISC metadata.xml 429 SHA256 ff1cdff3275ccf7ecf64d87d5929fa31dcb9c6d16647e39bc45348a665e49cb6 SHA512 b911347c41a8957ba77c82f59f9a2d90c1f39b89b85457c157e7e164bdd9d545f12be95dfe10ac0fe10e57c327ef90be81ed67cbdf16f588242ef443c2d3c6a3 WHIRLPOOL dd892feb28b9320dc5bc7cb4e92cae26926e7a3d3b0201bd64c9c73417a214e12e2e3ea067d5670cfec80c4c719841d90601ea0d99ab6db4ffa9be6a9c8916f5
diff --git a/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch b/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch
new file mode 100644
index 0000000..dc6c66b
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-3.2.6-gsettings-data-convert-paths.patch
@@ -0,0 +1,41 @@
+From 405f865c07261a95c8c9a09a84ab679c6dd0a330 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 24 Oct 2013 16:27:24 -0400
+Subject: gsettings-data-convert: Warn (and fix) invalid schema paths
+
+See https://bugzilla.gnome.org/show_bug.cgi?id=704802
+
+https://bugzilla.gnome.org/show_bug.cgi?id=710836
+
+diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
+index 9b2d1d0..160ed41 100644
+--- a/gsettings/gsettings-data-convert.c
++++ b/gsettings/gsettings-data-convert.c
+@@ -182,7 +182,23 @@ handle_file (const gchar *filename)
+         }
+ 
+       if (schema_path[1] != NULL)
+-        settings = g_settings_new_with_path (schema_path[0], schema_path[1]);
++	{
++	  char *compat_path_alloced = NULL; 
++	  char *compat_path;
++	  /* Work around broken .convert files:
++	     https://bugzilla.gnome.org/show_bug.cgi?id=704802
++	  */
++	  if (!g_str_has_suffix (schema_path[1], "/"))
++	    {
++	      g_warning ("Schema file '%s' has missing trailing / in '%s'",
++			 filename, schema_path[1]);
++	      compat_path = compat_path_alloced = g_strconcat (schema_path[1], "/", NULL);
++	    }
++	  else
++	    compat_path = schema_path[1];
++	  settings = g_settings_new_with_path (schema_path[0], compat_path);
++	  g_free (compat_path_alloced);
++	}
+       else
+         settings = g_settings_new (schema_path[0]);
+ 
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch b/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch
new file mode 100644
index 0000000..54681bc
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-3.2.6-mconvert-crasher.patch
@@ -0,0 +1,45 @@
+From 98ff7acca7595f508b094506195aeffaf2e8b74c Mon Sep 17 00:00:00 2001
+From: Stefan Sauer <ensonic@users.sf.net>
+Date: Wed, 23 Jan 2013 08:11:18 +0100
+Subject: mconvert: enable recursive scheme lookup and fix a crasher
+
+The recursive scheme lookup is needed to scan the whole settings path. The crash
+would happen in the case of a misconfiguration (e.g. building gconf from source
+and running uninstalled while the configure settings don't match the one used to
+create the installed package).
+
+diff --git a/gsettings/gsettings-data-convert.c b/gsettings/gsettings-data-convert.c
+index a8af942..9b2d1d0 100644
+--- a/gsettings/gsettings-data-convert.c
++++ b/gsettings/gsettings-data-convert.c
+@@ -22,6 +22,7 @@
+ #include <string.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
++#include <stdlib.h>
+ #include <unistd.h>
+ #include <errno.h>
+ 
+@@ -90,6 +91,10 @@ get_writable_client (void)
+   GSList *addresses;
+ 
+   addresses = get_writable_source_path ();
++  if (!addresses) {
++    g_printf("No writable gconf locations found\n");
++    exit (1);
++  }
+   engine = gconf_engine_get_local_for_addresses (addresses, NULL);
+   gconf_address_list_free (addresses);
+ 
+@@ -155,7 +160,7 @@ handle_file (const gchar *filename)
+ 
+       schema_path = g_strsplit (groups[i], ":", 2);
+ 
+-      schema = g_settings_schema_source_lookup (source, schema_path[0], FALSE);
++      schema = g_settings_schema_source_lookup (source, schema_path[0], TRUE);
+       if (schema == NULL)
+         {
+           if (verbose)
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch b/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch
new file mode 100644
index 0000000..26503f7
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-3.2.6-spew-console-error.patch
@@ -0,0 +1,83 @@
+From b0895e1998ebc83ab030ec0f17c0685439f5b404 Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Mon, 15 Apr 2013 09:57:34 -0400
+Subject: dbus: Don't spew to console when unable to connect to dbus daemon
+
+Instead pass the error up for the caller to decide what to do.
+
+This prevent untrappable warning messages from showing up at the
+console if gconftool --makefile-install-rule is called.
+
+diff --git a/gconf/gconf-dbus.c b/gconf/gconf-dbus.c
+index 5610fcf..048e3ea 100644
+--- a/gconf/gconf-dbus.c
++++ b/gconf/gconf-dbus.c
+@@ -105,7 +105,7 @@ static GHashTable     *engines_by_db = NULL;
+ static GHashTable     *engines_by_address = NULL;
+ static gboolean        dbus_disconnected = FALSE;
+ 
+-static gboolean     ensure_dbus_connection      (void);
++static gboolean     ensure_dbus_connection      (GError **error);
+ static gboolean     ensure_service              (gboolean          start_if_not_found,
+ 						 GError          **err);
+ static gboolean     ensure_database             (GConfEngine      *conf,
+@@ -383,7 +383,7 @@ gconf_engine_detach (GConfEngine *conf)
+ }
+ 
+ static gboolean
+-ensure_dbus_connection (void)
++ensure_dbus_connection (GError **err)
+ {
+   DBusError error;
+ 
+@@ -392,7 +392,9 @@ ensure_dbus_connection (void)
+ 
+   if (dbus_disconnected)
+     {
+-      g_warning ("The connection to DBus was broken. Can't reinitialize it.");
++      g_set_error (err, GCONF_ERROR,
++                   GCONF_ERROR_NO_SERVER,
++                   "The connection to DBus was broken. Can't reinitialize it.");
+       return FALSE;
+     }
+ 
+@@ -402,7 +404,10 @@ ensure_dbus_connection (void)
+   
+   if (!global_conn) 
+     {
+-      g_warning ("Client failed to connect to the D-BUS daemon:\n%s", error.message);
++      g_set_error (err, GCONF_ERROR,
++                   GCONF_ERROR_NO_SERVER,
++                   "Client failed to connect to the D-BUS daemon:\n%s",
++                   error.message);
+       
+       dbus_error_free (&error);
+       return FALSE;
+@@ -431,13 +436,8 @@ ensure_service (gboolean  start_if_not_found,
+ 
+   if (global_conn == NULL)
+     {
+-      if (!ensure_dbus_connection ())
+-	{
+-	  g_set_error (err, GCONF_ERROR,
+-		       GCONF_ERROR_NO_SERVER,
+-		       _("No D-BUS daemon running\n"));
+-	  return FALSE;
+-	}
++      if (!ensure_dbus_connection (err))
++        return FALSE;
+ 
+       g_assert (global_conn != NULL);
+     }
+@@ -2512,7 +2512,7 @@ gconf_ping_daemon (void)
+ {
+   if (global_conn == NULL)
+   {
+-    if (!ensure_dbus_connection ())
++    if (!ensure_dbus_connection (NULL))
+     {
+       return FALSE;
+     }
+-- 
+cgit v0.10.1
+
diff --git a/gnome-base/gconf/gconf-3.2.6-r2.ebuild b/gnome-base/gconf/gconf-3.2.6-r3.ebuild
index 5eeb997..c832c62 100644
--- a/gnome-base/gconf/gconf-3.2.6-r2.ebuild
+++ b/gnome-base/gconf/gconf-3.2.6-r3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="http://projects.gnome.org/gconf/"
 LICENSE="LGPL-2+"
 SLOT="2"
 KEYWORDS="~amd64"
-IUSE="debug gtk +introspection ldap orbit policykit"
+IUSE="debug +introspection ldap policykit"
 
 RDEPEND="
 	${PYTHON_DEPS}
@@ -25,10 +25,8 @@ RDEPEND="
 	>=dev-libs/dbus-glib-0.74:=[${MULTILIB_USEDEP}]
 	>=sys-apps/dbus-1:=[${MULTILIB_USEDEP}]
 	>=dev-libs/libxml2-2:2[${MULTILIB_USEDEP}]
-	gtk? ( >=x11-libs/gtk+-2.90:3[${MULTILIB_USEDEP}] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.5:=[${MULTILIB_USEDEP}] )
 	ldap? ( net-nds/openldap:=[${MULTILIB_USEDEP}] )
-	orbit? ( >=gnome-base/orbit-2.4:2[${MULTILIB_USEDEP}] )
 	policykit? ( sys-auth/polkit:=[${MULTILIB_USEDEP}] )
 "
 DEPEND="${RDEPEND}
@@ -51,6 +49,16 @@ src_prepare() {
 	# Do not crash in gconf_entry_set_value() when entry pointer is NULL, upstream #631985
 	epatch "${FILESDIR}/${PN}-2.28.0-entry-set-value-sigsegv.patch"
 
+	# From 'master'
+	# mconvert: enable recursive scheme lookup and fix a crasher
+	epatch "${FILESDIR}/${P}-mconvert-crasher.patch"
+
+	# dbus: Don't spew to console when unable to connect to dbus daemon
+	epatch "${FILESDIR}/${P}-spew-console-error.patch"
+
+	# gsettings-data-convert: Warn (and fix) invalid schema paths
+	epatch "${FILESDIR}/${P}-gsettings-data-convert-paths.patch"
+
 	gnome2-multilib_src_prepare
 }
 
@@ -58,13 +66,11 @@ src_configure() {
 	gnome2-multilib_src_configure \
 		--disable-static \
 		--enable-gsettings-backend \
-		$(use_enable gtk) \
-		$(usex gtk --with-gtk=3.0 "") \
+		--with-gtk=3.0 \
+		--disable-orbit \
 		$(use_enable introspection) \
 		$(use_with ldap openldap) \
-		$(use_enable orbit) \
-		$(use_enable policykit defaults-service) \
-		ORBIT_IDL=$(type -P orbit-idl-2)
+		$(use_enable policykit defaults-service)
 }
 
 src_install() {
@@ -95,15 +101,6 @@ pkg_postinst() {
 
 	einfo "changing permissions for gconf files"
 	find  "${EPREFIX}"/etc/gconf/ -type f -exec chmod ugo+r "{}" \;
-
-	if ! use orbit; then
-		ewarn "You are using dbus for GConf's IPC. If you are upgrading from"
-		ewarn "<=gconf-3.2.3, or were previously using gconf with USE=orbit,"
-		ewarn "you will need to now restart your desktop session (for example,"
-		ewarn "by logging out and then back in)."
-		ewarn "Otherwise, gconf-based applications may crash with 'Method ..."
-		ewarn "on interface \"org.gnome.GConf.Server\" doesn't exist' errors."
-	fi
 }
 
 kill_gconf() {