Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=gnome228.git;a=commitdiff;h=4b277a891d8bc5dcf8d738b0f0212de3cf7141c5

commit 4b277a891d8bc5dcf8d738b0f0212de3cf7141c5
Author: bouleetbil <bouleet...@frogdev.info>
Date:   Tue Sep 22 15:08:35 2009 +0000

gconf-2.28.0-1-i686
*version bump

diff --git a/source/gnome/gconf/FrugalBuild b/source/gnome/gconf/FrugalBuild
index 70128d6..334efaa 100644
--- a/source/gnome/gconf/FrugalBuild
+++ b/source/gnome/gconf/FrugalBuild
@@ -4,8 +4,8 @@

pkgname=gconf
_F_gnome_name=GConf
-pkgver=2.26.2
-pkgrel=2
+pkgver=2.28.0
+pkgrel=1
pkgdesc="A configuration database system for GNOME"
url="http://www.gnome.org/";
depends=('orbit2>=2.14.17' 'gtk+2>=2.16.2-2' 'libxml2' 'dbus-glib')
@@ -13,10 +13,9 @@ 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 patch-gconf_gconf-client.c.diff)
-sha1sums=('bf5323d974fa22165de2144100234647fd50ef17' \
-          'c51bd437b495af6b25aff143a45c0b93a4afc236' \
-          '5a8505fbb91b97b6f6e091d25cb5d9fad7963f94')
+source=(${sour...@]} gconf-2.16.0-reload.patch)
+sha1sums=('8371d88cc84fd727dfd0f8d413fa20a8bfe814fd' \
+          'c51bd437b495af6b25aff143a45c0b93a4afc236')
#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
deleted file mode 100644
index 69f1956..0000000
--- a/source/gnome/gconf/patch-gconf_gconf-client.c.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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

Reply via email to