Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=db27484e3ac310a61ba7d397f34cc6926dd2c1a1
commit db27484e3ac310a61ba7d397f34cc6926dd2c1a1 Author: bouleetbil <bouleet...@frogdev.info> Date: Sun May 17 19:14:22 2009 +0200 gconf-2.26.2-1-i686 *version bump *added patch for fix crach when we close nautilus diff --git a/source/gnome/gconf/FrugalBuild b/source/gnome/gconf/FrugalBuild index ad48c30..7571057 100644 --- a/source/gnome/gconf/FrugalBuild +++ b/source/gnome/gconf/FrugalBuild @@ -3,7 +3,7 @@ pkgname=gconf _F_gnome_name=GConf -pkgver=2.26.1 +pkgver=2.26.2 pkgrel=1 pkgdesc="A configuration database system for GNOME" url="http://www.gnome.org/"; @@ -12,9 +12,10 @@ makedepends=('indent' 'gtk-doc>=1.11' 'openldap>=2.4.16' 'perl-xml-parser' 'intl groups=('gnome' 'gnome-minimal') archs=('i686' 'x86_64' 'ppc') Finclude gnome -source=(${sour...@]} gconf-2.16.0-reload.patch) -sha1sums=('d745b532c10ab301fa1c21890c064ba662aba6b7' \ - 'c51bd437b495af6b25aff143a45c0b93a4afc236') +source=(${sour...@]} gconf-2.16.0-reload.patch patch-gconf_gconf-client.c.diff) +sha1sums=('bf5323d974fa22165de2144100234647fd50ef17' \ + 'c51bd437b495af6b25aff143a45c0b93a4afc236' \ + '5a8505fbb91b97b6f6e091d25cb5d9fad7963f94') #for build without pam Fconfopts="${fconfop...@]} --enable-defaults-service=no" diff --git a/source/gnome/gconf/patch-gconf_gconf-client.c.diff b/source/gnome/gconf/patch-gconf_gconf-client.c.diff new file mode 100644 index 0000000..69f1956 --- /dev/null +++ b/source/gnome/gconf/patch-gconf_gconf-client.c.diff @@ -0,0 +1,29 @@ +--- gconf/gconf-client.c.orig 2009-05-10 15:54:11.000000000 -0400 ++++ gconf/gconf-client.c 2009-05-10 15:55:22.000000000 -0400 +@@ -1199,10 +1199,11 @@ gconf_client_key_is_writable (GConfClien + + if (gconf_client_lookup (client, key, &entry)) + { +- g_assert (entry != NULL); +- +- trace ("CACHED: Checking whether key '%s' is writable", key); +- return gconf_entry_get_is_writable (entry); ++ if (entry != NULL) ++ { ++ trace ("CACHED: Checking whether key '%s' is writable", key); ++ return gconf_entry_get_is_writable (entry); ++ } + } + + trace ("REMOTE: Checking whether key '%s' is writable", key); +@@ -1406,9 +1407,7 @@ gconf_client_get_default_from_schema (GC + */ + if (gconf_client_lookup (client, key, &entry)) + { +- g_assert (entry != NULL); +- +- if (gconf_entry_get_is_default (entry)) ++ if (entry != NULL && gconf_entry_get_is_default (entry)) + { + trace ("CACHED: Getting schema default for '%s'", key); + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
