diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2009-05-16 21:46:02 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2009-05-16 21:46:02 +0000 |
| commit | 1b0f47374d9c0e318cd64ccf953c375ca0c68fab (patch) | |
| tree | 9db3a570d45f874950d4b5d11e49cbc1673b4e27 /devel/gconf2 | |
| parent | 0af51e4f851bb0b8ac6653b774b3c1b3191f8de8 (diff) | |
| download | ports-1b0f47374d9c0e318cd64ccf953c375ca0c68fab.tar.gz ports-1b0f47374d9c0e318cd64ccf953c375ca0c68fab.zip | |
Notes
Diffstat (limited to 'devel/gconf2')
| -rw-r--r-- | devel/gconf2/Makefile | 4 | ||||
| -rw-r--r-- | devel/gconf2/distinfo | 6 | ||||
| -rw-r--r-- | devel/gconf2/files/patch-gconf_gconf-client.c | 29 |
3 files changed, 5 insertions, 34 deletions
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 5d936119dd5a..a304533819da 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -7,8 +7,8 @@ # PORTNAME= gconf2 -PORTVERSION= 2.26.1 -PORTREVISION?= 1 +PORTVERSION= 2.26.2 +PORTREVISION?= 0 CATEGORIES= devel gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/} diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index c94165e4f922..743208212228 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,3 +1,3 @@ -MD5 (gnome2/GConf-2.26.1.tar.bz2) = 1f35137836eec03fa7e901230200a34a -SHA256 (gnome2/GConf-2.26.1.tar.bz2) = d557da05cc2f3a45e711b9ca097db7f6214dfe6b1c8f5ee63145fc6100e703fd -SIZE (gnome2/GConf-2.26.1.tar.bz2) = 1474736 +MD5 (gnome2/GConf-2.26.2.tar.bz2) = 8b55d58dab13e821e048627aa4f92b8b +SHA256 (gnome2/GConf-2.26.2.tar.bz2) = 717af270db891088394d154e3e22acc01af382306624c83679a4f8d6ba8467ed +SIZE (gnome2/GConf-2.26.2.tar.bz2) = 1474738 diff --git a/devel/gconf2/files/patch-gconf_gconf-client.c b/devel/gconf2/files/patch-gconf_gconf-client.c deleted file mode 100644 index 69f1956da438..000000000000 --- a/devel/gconf2/files/patch-gconf_gconf-client.c +++ /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); - |