[Frugalware-darcs] frugalware-current: gconf-2.13.5-1-x86_64

[Christian Hamar alias krix]

[gconf-2.13.5-1-x86_64
Christian Hamar alias krix <krics at linuxforum.hu>**20060315151843
   * Version bump
   * Added two patch from fedora
   * Changed maintainer to myself
 
] {
hunk ./source/gnome/gconf/FrugalBuild 1
-# Last modified: Sat, 05 Nov 2005 01:41:11 +0100
+# Last modified: Wed, 15 Mar 2006 16:14:46 +0100
hunk ./source/gnome/gconf/FrugalBuild 3
-# Maintainer: Laszlo Dvornik <dvornik at gnome.hu>
+# Maintainer: Christian Hamar alias krix <krics at linuxforum.hu>
+# Old Maintainer: Laszlo Dvornik <dvornik at gnome.hu>
hunk ./source/gnome/gconf/FrugalBuild 8
-pkgver=2.12.1
+pkgver=2.13.5
hunk ./source/gnome/gconf/FrugalBuild 16
+options=('scriptlet')
+nondevel=1
hunk ./source/gnome/gconf/FrugalBuild 19
-source=(http://ftp.gnome.org/pub/gnome/sources/GConf/$preup2date/GConf-$pkgver.tar.bz2)
-sha1sums=('bfcb6283b32361df05b245ae2ff65a9ec79d4c6c')
+source=(http://ftp.gnome.org/pub/gnome/sources/GConf/$preup2date/GConf-$pkgver.tar.bz2 \
+	GConf2-2.13.5-sync-less.patch GConf2-2.8.1-reload.patch0)
+sha1sums=('58fc2ef1b3c571ff71267e9774dab1c1f2a4241c' \
+	  '0291df80744b7adde6e2b06ab1b00abf45fc39dd' \
+	  '25920fd9513c245ad008301960a4701b8f33923d')
hunk ./source/gnome/gconf/FrugalBuild 27
-	Fmake --enable-gtk-doc
+	Fpatchall
+	Fmake --enable-gtk-doc --enable-debug=no
addfile ./source/gnome/gconf/GConf2-2.13.5-sync-less.patch
hunk ./source/gnome/gconf/GConf2-2.13.5-sync-less.patch 1
+--- GConf2-2.13.5/gconf/gconftool.c	2006-03-03 14:30:01.000000000 +0100
++++ GConf2-2.13.5/gconf/gconftool.c	2006-03-03 14:38:46.000000000 +0100
+@@ -476,6 +476,7 @@
+ static int do_recursive_unset (GConfEngine* conf, const gchar** args);
+ static int do_all_subdirs(GConfEngine* conf, const gchar** args);
+ static int do_load_file(GConfEngine* conf, LoadType load_type, gboolean unload, const gchar* file, const gchar** base_dirs);
++static int do_sync(GConfEngine* conf);
+ static int do_short_docs (GConfEngine *conf, const gchar **args);
+ static int do_long_docs (GConfEngine *conf, const gchar **args);
+ static int do_get_schema_name (GConfEngine *conf, const gchar **args);
+@@ -841,6 +842,8 @@
+       gint retval;
+ 
+       retval = do_load_file(conf, LOAD_SCHEMA_FILE, FALSE, schema_file, NULL);
++      if (!retval)
++	retval = do_sync(conf);
+ 
+       gconf_engine_unref(conf);
+ 
+@@ -853,6 +856,8 @@
+       gint retval;
+ 
+       retval = do_load_file(conf, LOAD_ENTRY_FILE, FALSE, entry_file, args);
++      if (!retval)
++	retval = do_sync(conf);
+ 
+       gconf_engine_unref(conf);
+ 
+@@ -865,6 +870,8 @@
+       gint retval;
+ 
+       retval = do_load_file(conf, LOAD_ENTRY_FILE, TRUE, unload_entry_file, args);
++      if (!retval)
++	retval = do_sync(conf);
+ 
+       gconf_engine_unref(conf);
+ 
+@@ -3629,7 +3636,6 @@
+ 
+   xmlDocPtr doc;
+   xmlNodePtr iter;
+-  GError * err = NULL;
+   /* file comes from the command line, is thus in locale charset */
+   gchar *utf8_file = g_locale_to_utf8 (file, -1, NULL, NULL, NULL);;
+ 
+@@ -3691,7 +3697,17 @@
+           
+       iter = iter->next;
+     }
++  
++  return 0;
++#undef LOAD_TYPE_TO_LIST
++#undef LOAD_TYPE_TO_ROOT
++}
+ 
++static int
++do_sync(GConfEngine* conf)
++{
++  GError * err = NULL;
++  
+   gconf_engine_suggest_sync(conf, &err);
+ 
+   if (err != NULL)
+@@ -3703,9 +3719,6 @@
+     }
+   
+   return 0;
+-
+-#undef LOAD_TYPE_TO_LIST
+-#undef LOAD_TYPE_TO_ROOT
+ }
+ 
+ static int
+
addfile ./source/gnome/gconf/GConf2-2.8.1-reload.patch0
hunk ./source/gnome/gconf/GConf2-2.8.1-reload.patch0 1
+Index: gconf/gconf/gconftool.c
+===================================================================
+RCS file: /cvs/gnome/gconf/gconf/gconftool.c,v
+retrieving revision 1.102
+diff -d -u -p -U10 -r1.102 gconftool.c
+--- gconf/gconftool.c	3 Jan 2006 17:05:28 -0000	1.102
++++ gconf/gconftool.c	1 Feb 2006 18:34:36 -0000
+@@ -881,32 +881,36 @@ main (int argc, char** argv)
+   if (makefile_install_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval;
+ 
+       umask (022);
+       retval = do_makefile_install (conf, args, FALSE);
+       
+       gconf_engine_unref (conf);
+ 
++      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
++
+       return retval;
+     }
+ 
+   if (makefile_uninstall_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval;
+ 
+       umask (022);
+       retval = do_makefile_install (conf, args, TRUE);
+       
+       gconf_engine_unref (conf);
++
++      g_spawn_command_line_sync ("/usr/bin/killall -q -TERM " GCONF_SERVERDIR "/" GCONFD, NULL, NULL, NULL, NULL);
+ 
+       return retval;
+     }
+ 
+   if (break_key_mode)
+     {
+       const gchar** args = poptGetArgs(ctx);
+       gint retval = do_break_key(conf, args);
+ 
+       gconf_engine_unref(conf);
}