version 3.2.6-5

4 files changed, 149 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7cf4116a0a12..caee54c8508a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = gconf-gtk2
 	pkgdesc = A configuration database system compiled for GTK2
 	pkgver = 3.2.6
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.gnome.org
 	install = gconf.install
 	arch = i686
@@ -24,6 +24,8 @@ pkgbase = gconf-gtk2
 	source = gconf-install.hook
 	source = gconf-remove.hook
 	source = 01_xml-gettext-domain.patch
+	source = dbus-dontspew.patch
+	source = gsettings-data-convert-fix-invalid-schema-path.patch
 	sha256sums = 1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c
 	sha256sums = ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028
 	sha256sums = bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898
@@ -31,6 +33,8 @@ pkgbase = gconf-gtk2
 	sha256sums = 2732b2a6b187c5620105a036bde12edee99669605f70cbde56fe5f39619c3dc0
 	sha256sums = 436a65ff290095bc3d35d7d6297cf4d647f61e9f9922cea7ef9f1e251b447ff7
 	sha256sums = c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8
+	sha256sums = b490394b0f541ca92134478fa2235536bdb1ccd3b3200d5040dd458cec33bfe8
+	sha256sums = 0f2057fbd20837091cbcc1e291bb64c9c6066534891a4ee010bbf5b304bd831d
 
 pkgname = gconf-gtk2
 
diff --git a/PKGBUILD b/PKGBUILD
index 3156ee9c31db..7ff1c52680fd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 266210 2016-04-27 12:18:24Z allan $
+# $Id: PKGBUILD 273521 2016-08-08 22:26:45Z jgc $
 # Maintainer: Brian Bidulock <bidulock@openss7.org>
 # Contributor:  Jan de Groot <jan@archlinux.org>
 
 pkgname=gconf-gtk2
 pkgver=3.2.6
-pkgrel=4
+pkgrel=5
 pkgdesc="A configuration database system compiled for GTK2"
 arch=(i686 x86_64)
 license=('LGPL')
@@ -19,14 +19,18 @@ source=(https://download.gnome.org/sources/GConf/3.2/GConf-$pkgver.tar.xz
         gconfpkg
         gconf-reload.patch
         gconf-{install,remove}.hook
-        01_xml-gettext-domain.patch)
+        01_xml-gettext-domain.patch
+	dbus-dontspew.patch
+	gsettings-data-convert-fix-invalid-schema-path.patch)
 sha256sums=('1912b91803ab09a5eed34d364bf09fe3a2a9c96751fde03a4e0cfa51a04d784c'
             'ee6b6e6f4975dad13a8c45f1c1f0547a99373bdecdcd6604bfc12965c328a028'
             'bf1928718caa5df2b9e54a13cfd0f15a8fe0e09e86b84385ce023616a114e898'
             '567b78d8b4b4bbcb77c5f134d57bc503c34867fcc6341c0b01716bcaa4a21694'
             '2732b2a6b187c5620105a036bde12edee99669605f70cbde56fe5f39619c3dc0'
             '436a65ff290095bc3d35d7d6297cf4d647f61e9f9922cea7ef9f1e251b447ff7'
-            'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8')
+            'c883dec2b96978874a53700cfe7f26f24f8296767203e970bc6402b4b9945eb8'
+	    'b490394b0f541ca92134478fa2235536bdb1ccd3b3200d5040dd458cec33bfe8'
+            '0f2057fbd20837091cbcc1e291bb64c9c6066534891a4ee010bbf5b304bd831d')
 
 prepare() {
   cd "GConf-$pkgver"
@@ -36,6 +40,10 @@ prepare() {
   # http://bugzilla.gnome.org/show_bug.cgi?id=568845
   patch -Np1 -i "$srcdir/01_xml-gettext-domain.patch"
 
+  # Upstream fixes
+  patch -Np1 -i ../dbus-dontspew.patch
+  patch -Np1 -i ../gsettings-data-convert-fix-invalid-schema-path.patch
+
   # Python2 fix
   sed -i '1s|#!/usr/bin/env python$|&2|' gsettings/gsettings-schema-convert
 }
@@ -49,6 +57,8 @@ build() {
       --with-gtk=2.0 \
       --disable-orbit
 
+  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
+
   make pkglibdir=/usr/lib/GConf
 }
 
diff --git a/dbus-dontspew.patch b/dbus-dontspew.patch
new file mode 100644
index 000000000000..0b4cd37afee2
--- /dev/null
+++ b/dbus-dontspew.patch
@@ -0,0 +1,86 @@
+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.
+---
+ gconf/gconf-dbus.c | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+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.12
+
diff --git a/gsettings-data-convert-fix-invalid-schema-path.patch b/gsettings-data-convert-fix-invalid-schema-path.patch
new file mode 100644
index 000000000000..9a141d354871
--- /dev/null
+++ b/gsettings-data-convert-fix-invalid-schema-path.patch
@@ -0,0 +1,44 @@
+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
+---
+ gsettings/gsettings-data-convert.c | 18 +++++++++++++++++-
+ 1 file changed, 17 insertions(+), 1 deletion(-)
+
+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.12
+