diff options
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gconf2/Makefile | 3 | ||||
-rw-r--r-- | devel/gconf2/distinfo | 4 | ||||
-rw-r--r-- | devel/gconf2/files/patch-gconf_gconftool.c | 89 |
3 files changed, 3 insertions, 93 deletions
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile index 3597b6cd2..079ba3526 100644 --- a/devel/gconf2/Makefile +++ b/devel/gconf2/Makefile @@ -6,8 +6,7 @@ # PORTNAME= gconf2 -PORTVERSION= 2.7.3 -PORTREVISION= 1 +PORTVERSION= 2.7.3.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME} MASTER_SITE_SUBDIR= sources/GConf/2.7 diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo index 6c4eb660d..9b93725f0 100644 --- a/devel/gconf2/distinfo +++ b/devel/gconf2/distinfo @@ -1,2 +1,2 @@ -MD5 (gnome2/GConf-2.7.3.tar.bz2) = ad0f282ded8152c17b71d3f7d75517e2 -SIZE (gnome2/GConf-2.7.3.tar.bz2) = 1659205 +MD5 (gnome2/GConf-2.7.3.1.tar.bz2) = 71b321e00019e27de80b85d2d8592146 +SIZE (gnome2/GConf-2.7.3.1.tar.bz2) = 1661384 diff --git a/devel/gconf2/files/patch-gconf_gconftool.c b/devel/gconf2/files/patch-gconf_gconftool.c deleted file mode 100644 index aca7c9e02..000000000 --- a/devel/gconf2/files/patch-gconf_gconftool.c +++ /dev/null @@ -1,89 +0,0 @@ ---- gconf/gconftool.c.orig Sun Jul 4 11:15:23 2004 -+++ gconf/gconftool.c Thu Jul 8 17:23:03 2004 -@@ -460,8 +460,7 @@ - - static int do_break_key(GConfEngine* conf, const gchar** args); - static int do_break_directory(GConfEngine* conf, const gchar** args); --static int do_makefile_install(GConfEngine* conf, const gchar** args); --static int do_makefile_uninstall(GConfEngine* conf, const gchar** args); -+static int do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload); - static int do_recursive_list(GConfEngine* conf, const gchar** args); - static int do_dump_values(GConfEngine* conf, const gchar** args); - static int do_all_pairs(GConfEngine* conf, const gchar** args); -@@ -888,7 +887,7 @@ - if (makefile_install_mode) - { - const gchar** args = poptGetArgs(ctx); -- gint retval = do_makefile_install (conf, args); -+ gint retval = do_makefile_install (conf, args, FALSE); - - gconf_engine_unref (conf); - -@@ -898,7 +897,7 @@ - if (makefile_uninstall_mode) - { - const gchar** args = poptGetArgs(ctx); -- gint retval = do_makefile_uninstall (conf, args); -+ gint retval = do_makefile_install (conf, args, TRUE); - - gconf_engine_unref (conf); - -@@ -3381,7 +3380,7 @@ - { - GError* error = NULL; - -- if (!gconf_engine_associate_schema(conf, tmp->data, unload ? schema_name : NULL, &error)) -+ if (!gconf_engine_associate_schema(conf, tmp->data, !unload ? schema_name : NULL, &error)) - { - g_assert(error != NULL); - -@@ -3708,7 +3707,7 @@ - } - - static int --do_makefile_install(GConfEngine* conf, const gchar** args) -+do_makefile_install(GConfEngine* conf, const gchar** args, gboolean unload) - { - GError* err = NULL; - -@@ -3720,39 +3719,7 @@ - - while (*args) - { -- if (do_load_file(conf, LOAD_SCHEMA_FILE, FALSE, *args, NULL) != 0) -- return 1; -- -- ++args; -- } -- -- gconf_engine_suggest_sync(conf, &err); -- -- if (err != NULL) -- { -- g_printerr (_("Error syncing config data: %s"), -- err->message); -- g_error_free(err); -- return 1; -- } -- -- return 0; --} -- --static int --do_makefile_uninstall(GConfEngine* conf, const gchar** args) --{ -- GError* err = NULL; -- -- if (args == NULL) -- { -- g_printerr (_("Must specify some schema files to uninstall\n")); -- return 1; -- } -- -- while (*args) -- { -- if (do_load_file(conf, LOAD_SCHEMA_FILE, TRUE, *args, NULL) != 0) -+ if (do_load_file(conf, LOAD_SCHEMA_FILE, unload, *args, NULL) != 0) - return 1; - - ++args; |