[arch-commits] CVS update of extra/gnome/gconf (PKGBUILD bgo432923.patch)

[Jan de Groot]

    Date: Wednesday, May 16, 2007 @ 16:16:25
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/gconf

   Added: bgo432923.patch (1.1)
Modified: PKGBUILD (1.27 -> 1.28)

upgpkg: gconf 2.18.0.1-3
Initialize threads early, fixes scaring messages from glib 2.13 about wrong thread initialization


-----------------+
 PKGBUILD        |   10 ++++++----
 bgo432923.patch |   29 +++++++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 4 deletions(-)


Index: extra/gnome/gconf/PKGBUILD
diff -u extra/gnome/gconf/PKGBUILD:1.27 extra/gnome/gconf/PKGBUILD:1.28
--- extra/gnome/gconf/PKGBUILD:1.27	Sun Apr 22 09:53:18 2007
+++ extra/gnome/gconf/PKGBUILD	Wed May 16 16:16:24 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.27 2007/04/22 13:53:18 jgc Exp $
+# $Id: PKGBUILD,v 1.28 2007/05/16 20:16:24 jgc Exp $
 # Maintainer:  Jan de Groot <jan at archlinux.org>
 
 pkgname=gconf
 pkgver=2.18.0.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A configuration database system"
 arch=(i686 x86_64)
 depends=('orbit2>=2.14.7-2' 'gtk2>=2.10.11')
@@ -14,13 +14,15 @@
 license=(GPL)
 source=(http://ftp.gnome.org/pub/gnome/sources/GConf/2.18/GConf-${pkgver}.tar.bz2
 	gconf-merge-schema
-	gconf-reload.patch)
+	gconf-reload.patch
+	bgo432923.patch)
 md5sums=('aa0e0a0729fb021bab72b4166fd392f9' '1412bafb06f7d8a9601c8f1c4d72cc06'
-	 'cfcc8e15be7b8a48de4aa34336ff6090')
+	 'cfcc8e15be7b8a48de4aa34336ff6090' 'd41249c1cdb190bded33addbc701ad94')
 
 build() {
   cd ${startdir}/src/GConf-${pkgver}
   patch -Np1 -i ${startdir}/src/gconf-reload.patch || return 1
+  patch -Np0 -i ${startdir}/src/bgo432923.patch || return 1
   aclocal || return 1
   autoconf || return 1
   automake || return 1
Index: extra/gnome/gconf/bgo432923.patch
diff -u /dev/null extra/gnome/gconf/bgo432923.patch:1.1
--- /dev/null	Wed May 16 16:16:24 2007
+++ extra/gnome/gconf/bgo432923.patch	Wed May 16 16:16:24 2007
@@ -0,0 +1,29 @@
+Index: gconf/gconftool.c
+===================================================================
+--- gconf/gconftool.c	(révision 2396)
++++ gconf/gconftool.c	(copie de travail)
+@@ -543,6 +543,9 @@ main (int argc, char** argv)
+   setlocale (LC_ALL, "");
+   bindtextdomain (GETTEXT_PACKAGE,GCONF_LOCALE_DIR);
+   textdomain (GETTEXT_PACKAGE);
++
++  g_thread_init (NULL);
++
+   _gconf_init_i18n ();
+   
+   context = g_option_context_new (_("- Tool to manipulate a GConf configuration"));
+Index: gconf/gconf-sanity-check.c
+===================================================================
+--- gconf/gconf-sanity-check.c	(révision 2396)
++++ gconf/gconf-sanity-check.c	(copie de travail)
+@@ -42,7 +42,9 @@ main (int argc, char** argv)
+ {
+   GOptionContext *context;
+   GError *error;
+-  
++
++  g_thread_init (NULL);
++
+   context = g_option_context_new (_("- Sanity checks for GConf"));
+   g_option_context_add_group (context, gtk_get_option_group (TRUE));
+