From f196475b2f47e2e13bde28862570d7d80df6b7ac Mon Sep 17 00:00:00 2001 From: jmmv Date: Mon, 3 May 2004 20:55:36 +0000 Subject: Update GConf2 and GConf2-ui to 2.6.1: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes: - add a --enable-gtk=yes/no/auto configure arg (Julio Merino, Mark) - fix basic example app to not crash (Elijah Newren) - don't try and create a dir if it already exists (Ryan Lovett, Mark) - only ever create the $(HOME)/.gconfd/ dir in the daemon (Colin Walters) - add quotes around AM_GCONF_SOURCE_2 (Frédéric L. W. Meunier) - handle with only correctly in --load (Mark) - fix the order in which local-defaults.path gets included (Mark) - fix minor inefficiency when not printing debugging messages (Mark) Translators: - Adam Weinberger (en_CA) - Robert Sedak (hr) - Samúel Jón Gunnarsson (is) - Alessio Frusciante (it) - Takeshi AIHANA (ja) - Amanpreet Singh Alam (pa) - Gurkan Aslan (tr) --- devel/GConf2-ui/Makefile | 4 +-- devel/GConf2/Makefile | 5 ++-- devel/GConf2/Makefile.common | 4 +-- devel/GConf2/PLIST | 5 +++- devel/GConf2/distinfo | 12 ++++----- devel/GConf2/patches/patch-aa | 39 ---------------------------- devel/GConf2/patches/patch-ac | 28 ++++++++++---------- devel/GConf2/patches/patch-ad | 19 ++++---------- devel/GConf2/patches/patch-ae | 59 +++++++++++++++++++++++++------------------ 9 files changed, 68 insertions(+), 107 deletions(-) delete mode 100644 devel/GConf2/patches/patch-aa (limited to 'devel') diff --git a/devel/GConf2-ui/Makefile b/devel/GConf2-ui/Makefile index c7e1d184cb2..f8238e434a4 100644 --- a/devel/GConf2-ui/Makefile +++ b/devel/GConf2-ui/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.13 2004/04/01 18:17:29 jmmv Exp $ +# $NetBSD: Makefile,v 1.14 2004/05/03 20:55:36 jmmv Exp $ # .include "../../devel/GConf2/Makefile.common" PKGNAME= ${DISTNAME:S/GConf/GConf2-ui/} -CONFIGURE_ENV+= PKG_USE_GTK=yes +CONFIGURE_ARGS+= --enable-gtk BUILD_DIRS= ${WRKSRC}/gconf ALL_TARGET= GConfX.h gconf-sanity-check-2 diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile index b93093137f4..5763546f182 100644 --- a/devel/GConf2/Makefile +++ b/devel/GConf2/Makefile @@ -1,14 +1,13 @@ -# $NetBSD: Makefile,v 1.28 2004/04/07 18:07:52 jmmv Exp $ +# $NetBSD: Makefile,v 1.29 2004/05/03 20:55:36 jmmv Exp $ # .include "../../devel/GConf2/Makefile.common" PKGNAME= ${DISTNAME:S/GConf/GConf2/} -PKGREVISION= 2 USE_PKGINSTALL= YES -CONFIGURE_ENV+= PKG_USE_GTK=no +CONFIGURE_ARGS+= --disable-gtk OWN_DIRS= ${PKG_SYSCONFDIR}/2 OWN_DIRS+= ${PKG_SYSCONFDIR}/gconf.xml.defaults diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common index ca15624c9c9..5aa4fbd0472 100644 --- a/devel/GConf2/Makefile.common +++ b/devel/GConf2/Makefile.common @@ -1,7 +1,7 @@ -# $NetBSD: Makefile.common,v 1.17 2004/04/01 18:17:29 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.18 2004/05/03 20:55:36 jmmv Exp $ # -DISTNAME= GConf-2.6.0 +DISTNAME= GConf-2.6.1 CATEGORIES= devel gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.6/} EXTRACT_SUFX= .tar.bz2 diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST index 3941b24a2d1..a1a6df00f2f 100644 --- a/devel/GConf2/PLIST +++ b/devel/GConf2/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2004/04/07 18:07:52 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.16 2004/05/03 20:55:36 jmmv Exp $ bin/gconf-merge-tree bin/gconftool-2 include/gconf/2/gconf/gconf-changeset.h @@ -73,6 +73,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/GConf2.mo @@ -81,6 +82,7 @@ ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/gu/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/GConf2.mo @@ -97,6 +99,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/GConf2.mo +${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/GConf2.mo ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/GConf2.mo diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo index 687c42cb8c0..7163e96cdf3 100644 --- a/devel/GConf2/distinfo +++ b/devel/GConf2/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.10 2004/04/01 18:17:29 jmmv Exp $ +$NetBSD: distinfo,v 1.11 2004/05/03 20:55:36 jmmv Exp $ -SHA1 (GConf-2.6.0.tar.bz2) = 1193855aee79f6d79ed7d373040caa9666237d00 -Size (GConf-2.6.0.tar.bz2) = 1428714 bytes +SHA1 (GConf-2.6.1.tar.bz2) = 807ad0852ce761f5c6ee7970c8a7f63b4e0fe531 +Size (GConf-2.6.1.tar.bz2) = 1483080 bytes SHA1 (patch-aa) = f45e30d562ade5e9d8e5bc71c9a3d3ce3fc40393 SHA1 (patch-ab) = eb9ffa0ec87fe21b0f754aef019221d619b37b11 -SHA1 (patch-ac) = de42b523072ff5eac020525c2ccb4ce93ed792c6 -SHA1 (patch-ad) = 85dc152912bd5fea68c159b7cc98817318c6e042 -SHA1 (patch-ae) = 292895b5a71e9b21963d258c6eeed976c9b01d30 +SHA1 (patch-ac) = 95fdcf832a0c1fb4744a0e12be08b1314c6a923b +SHA1 (patch-ad) = ef6172650190df26f0a829506e99b0c65c8d2385 +SHA1 (patch-ae) = 8a0329947185d2094e0c39a1c2f9b646a342f0d1 SHA1 (patch-af) = f9c0ecc8603ebab3d1ebf7ed8729148377c26349 diff --git a/devel/GConf2/patches/patch-aa b/devel/GConf2/patches/patch-aa deleted file mode 100644 index 1bc4d89a2e5..00000000000 --- a/devel/GConf2/patches/patch-aa +++ /dev/null @@ -1,39 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2004/04/01 18:17:29 jmmv Exp $ - -Disable GTK2 support. This is a workaround until bug #102825 gets fixed. -See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details. - ---- configure.orig 2004-02-24 16:50:54.000000000 +0100 -+++ configure -@@ -19672,6 +19672,7 @@ fi - - fi - -+if [ "$PKG_USE_GTK" = "yes" ]; then - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" -@@ -19715,6 +19716,7 @@ echo "${ECHO_T}$DEPENDENT_WITH_GTK_LIBS" - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi -+fi - - if test $succeeded = yes; then - HAVE_GTK=yes -@@ -19768,6 +19770,7 @@ fi - - fi - -+if [ "$PKG_USE_GTK" = "yes" ]; then - if test "$PKG_CONFIG" = "no" ; then - echo "*** The pkg-config script could not be found. Make sure it is" - echo "*** in your path, or set the PKG_CONFIG environment variable" -@@ -19811,6 +19814,7 @@ echo "${ECHO_T}$DEPENDENT_WITH_XML_AND_G - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi -+fi - - if test $succeeded = yes; then - : diff --git a/devel/GConf2/patches/patch-ac b/devel/GConf2/patches/patch-ac index ab3ef8cadfc..1ef31eec0d1 100644 --- a/devel/GConf2/patches/patch-ac +++ b/devel/GConf2/patches/patch-ac @@ -1,19 +1,17 @@ -$NetBSD: patch-ac,v 1.2 2003/12/14 19:44:38 jmmv Exp $ +$NetBSD: patch-ac,v 1.3 2004/05/03 20:55:36 jmmv Exp $ ---- gconf/Makefile.in.orig 2003-10-25 23:27:25.000000000 +0000 -+++ gconf/Makefile.in 2003-10-25 23:29:40.000000000 +0000 -@@ -148,8 +148,8 @@ - -DG_LOG_DOMAIN=\"GConf\" \ - -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" \ - -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \ -- -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" \ -- -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" \ -+ -DGCONF_CONFDIR=\""$(sysconfdir)/$(MAJOR_VERSION)"\" \ -+ -DGCONF_ETCDIR=\""$(sysconfdir)"\" \ - -DGCONF_BINDIR=\""$(bindir)"\" \ - -DGCONF_SERVERDIR=\""$(libexecdir)"\" \ - -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ -@@ -606,8 +606,8 @@ +--- gconf/Makefile.in.orig 2004-04-19 14:11:03.000000000 +0200 ++++ gconf/Makefile.in +@@ -144,7 +144,7 @@ NULL = + + GCONFD_BINARY_NAME = gconfd-2 + +-INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) -DG_LOG_DOMAIN=\"GConf\" -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\" -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\" -DGCONF_BINDIR=\""$(bindir)"\" -DGCONF_SERVERDIR=\""$(libexecdir)"\" -DGCONF_BUILDDIR=\""$(top_builddir)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" -DVERSION=\""$(VERSION)"\" -DGCONF_ENABLE_INTERNALS=1 -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" $(NULL) ++INCLUDES = -I$(top_srcdir) -I$(top_builddir) $(DEPENDENT_WITH_XML_AND_GTK_CFLAGS) -DG_LOG_DOMAIN=\"GConf\" -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\" -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_CONFDIR=\""$(sysconfdir)/$(MAJOR_VERSION)"\" -DGCONF_ETCDIR=\""$(sysconfdir)"\" -DGCONF_BINDIR=\""$(bindir)"\" -DGCONF_SERVERDIR=\""$(libexecdir)"\" -DGCONF_BUILDDIR=\""$(top_builddir)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" -DVERSION=\""$(VERSION)"\" -DGCONF_ENABLE_INTERNALS=1 -DGCONFD=\""$(GCONFD_BINARY_NAME)"\" $(NULL) + + + EFENCE = +@@ -620,8 +620,8 @@ $(CORBA_SOURCECODE): $(srcdir)/GConfX.id $(ORBIT_IDL) $(srcdir)/GConfX.idl install-data-local: diff --git a/devel/GConf2/patches/patch-ad b/devel/GConf2/patches/patch-ad index 740535451d9..cbc5faead03 100644 --- a/devel/GConf2/patches/patch-ad +++ b/devel/GConf2/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.2 2004/04/01 18:17:29 jmmv Exp $ +$NetBSD: patch-ad,v 1.3 2004/05/03 20:55:36 jmmv Exp $ ---- gconf/default.path.in.orig 2003-11-03 00:23:30.000000000 +0000 +--- gconf/default.path.in.orig 2004-04-01 15:39:41.000000000 +0200 +++ gconf/default.path.in -@@ -7,13 +7,13 @@ +@@ -7,12 +7,12 @@ # Look first in systemwide mandatory settings directory # (commented out until xml backend knows how to be read-only for users) @@ -12,27 +12,18 @@ $NetBSD: patch-ad,v 1.2 2004/04/01 18:17:29 jmmv Exp $ # To read in any mandatory settings that the Sys Admin may have created # prior to a desktop system upgrade. The SysAdmin can stick read-only system # wide sources in this file. - -include @EXPANDED_SYSCONFDIR@/gconf/2/local-mandatory.path +include @EXPANDED_SYSCONFDIR@/2/local-mandatory.path # Now see where users want us to look - basically the user can stick arbitrary # sources in a ~/.gconf.path file and they're inserted here -@@ -23,7 +23,7 @@ include "$(HOME)/.gconf.path" +@@ -24,7 +24,7 @@ xml:readwrite:$(HOME)/.gconf + # To read in any defaults settings that the Sys Admin may have created # prior to a desktop system upgrade. The SysAdmin can stick default values # system-wide in this file. - -include @EXPANDED_SYSCONFDIR@/gconf/2/local-defaults.path +include @EXPANDED_SYSCONFDIR@/2/local-defaults.path - # Give users a default storage location, ~/.gconf - -@@ -31,7 +31,7 @@ xml:readwrite:$(HOME)/.gconf - # Finally, look at the systemwide defaults - # (commented out for now) -xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults +xml:readonly:@EXPANDED_SYSCONFDIR@/gconf.xml.defaults - - - diff --git a/devel/GConf2/patches/patch-ae b/devel/GConf2/patches/patch-ae index 2835685fa17..f89dbaf1d03 100644 --- a/devel/GConf2/patches/patch-ae +++ b/devel/GConf2/patches/patch-ae @@ -1,6 +1,6 @@ -$NetBSD: patch-ae,v 1.3 2003/12/28 14:24:49 jmmv Exp $ +$NetBSD: patch-ae,v 1.4 2004/05/03 20:55:36 jmmv Exp $ ---- gconf/gconftool.c.orig 2003-08-18 20:13:20.000000000 +0200 +--- gconf/gconftool.c.orig 2004-04-05 21:07:34.000000000 +0200 +++ gconf/gconftool.c @@ -59,6 +59,7 @@ static char* long_desc = NULL; static char* owner = NULL; @@ -45,47 +45,56 @@ $NetBSD: patch-ae,v 1.3 2003/12/28 14:24:49 jmmv Exp $ if (spawn_gconfd) { do_spawn_daemon(conf); -@@ -2760,15 +2782,14 @@ set_values(GConfEngine* conf, const gcha +@@ -2769,30 +2791,29 @@ set_values(GConfEngine* conf, const gcha else full_key = g_strdup(key); - if (schema_key) -+ full_schema_key = NULL; -+ if (unload_entry_file == NULL && schema_key) ++ if (unload_entry_file != NULL || schema_key) { - if (base_dir && *schema_key != '/') - full_schema_key = gconf_concat_dir_and_key(base_dir, schema_key); - else - full_schema_key = g_strdup(schema_key); - } -- else -- full_schema_key = NULL; +- gchar* full_schema_key; ++ gchar* full_schema_key = NULL; ++ GError* error = NULL; - tmp = values; - while (tmp) -@@ -2776,21 +2797,21 @@ set_values(GConfEngine* conf, const gcha - GConfValue* value = tmp->data; - GError* error; +- if (base_dir && *schema_key != '/') +- full_schema_key = gconf_concat_dir_and_key(base_dir, schema_key); +- else +- full_schema_key = g_strdup(schema_key); ++ if (unload_entry_file == NULL) ++ { ++ if (base_dir && *schema_key != '/') ++ full_schema_key = gconf_concat_dir_and_key(base_dir, schema_key); ++ else ++ full_schema_key = g_strdup(schema_key); ++ } - if (full_schema_key) -+ error = NULL; + if (!gconf_engine_associate_schema(conf, full_key, full_schema_key, &error)) { -- error = NULL; +- GError* error = NULL; +- - if (!gconf_engine_associate_schema(conf, full_key, full_schema_key, &error)) - { - g_assert(error != NULL); -- ++ g_assert(error != NULL); + - g_printerr (_("WARNING: failed to associate schema `%s' with key `%s': %s\n"), - full_schema_key, full_key, error->message); - g_error_free(error); - } -+ g_assert(error != NULL); -+ + g_printerr (_("WARNING: failed to associate schema `%s' with key `%s': %s\n"), + full_schema_key, full_key, error->message); + g_error_free(error); - } ++ } + +- g_free(full_schema_key); +- } ++ g_free(full_schema_key); + } + + tmp = values; +@@ -2802,7 +2823,10 @@ set_values(GConfEngine* conf, const gcha + GError* error; error = NULL; - gconf_engine_set(conf, full_key, value, &error); @@ -96,7 +105,7 @@ $NetBSD: patch-ae,v 1.3 2003/12/28 14:24:49 jmmv Exp $ if (error != NULL) { g_printerr (_("Error setting value: %s\n"), error->message); -@@ -3307,7 +3328,7 @@ process_key_list(GConfEngine* conf, cons +@@ -3318,7 +3342,7 @@ process_key_list(GConfEngine* conf, cons GSList* tmp; GError* error = NULL; @@ -105,7 +114,7 @@ $NetBSD: patch-ae,v 1.3 2003/12/28 14:24:49 jmmv Exp $ { schema_name = NULL; } -@@ -3504,7 +3525,7 @@ process_schema(GConfEngine* conf, xmlNod +@@ -3515,7 +3539,7 @@ process_schema(GConfEngine* conf, xmlNod hash_foreach_info.conf = conf; hash_foreach_info.key = schema_key; -- cgit v1.2.3