pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel Update GConf2 and GConf2-ui to 2.8.0.1. This ve...
details: https://anonhg.NetBSD.org/pkgsrc/rev/a47c580fbfbc
branches: trunk
changeset: 480855:a47c580fbfbc
user: jmmv <jmmv%pkgsrc.org@localhost>
date: Tue Sep 21 16:44:50 2004 +0000
description:
Update GConf2 and GConf2-ui to 2.8.0.1. This version corresponds to
GNOME 2.8.0.
2.8.0.1
=======
Fixes
- Use automake 1.7 (Mark)
- Always ship the API docs html in the tarball (Mark)
2.8.0
=====
Translators
- Ayman Hourieh (ar)
- Kenan Hadžiavdić (bs)
- Miloslav Trmac (cs)
- Dafydd Harries (cy)
- Kostas Papadimas (el)
- Francisco Javier F. Serrador (es)
- Alessio Frusciante (it)
- Hasbullah Bin Pit (ms)
- Evandro Fernandes Giovanini (pt_BR)
- Mişu Moldovan (ro)
- Gurkan Aslan (tr)
2.7.92
======
Fixes
- Fix crash caused by dropping the default database early (Mark)
- Fix issue with SIGHUP causing listeners to be dropped (Josselin Mouette)
- Only install the global schema default in the C locale (Mark)
- Don't crash if there's no schema for the locale (Mark)
Translators
- Jordi Mallach (ca)
- Laszlo Dvornik (hu)
- Pawan Chitrakar (ne)
- Tino Meinen (nl)
- Laurent Dhima (sq)
- Maxim Dziumanenko (uk)
2.7.91.1
========
Features
- Switch off the "subtree-in-a-file" thing again (Mark)
See: http://mail.gnome.org/archives/desktop-devel-list/2004-August/msg00393.html
Translators
- Kenan Hadžiavdić (bs)
- Martin Willemoes Hansen (da)
- Pauli Virtanen (fi)
- Takeshi AIHANA (ja)
- Laurent Dhima (sq)
2.7.91
======
Fixes
- Fix a bunch of coding errors (Kjartan Maraas)
- Always install schemas with the correct permissions (Mark)
- Fix various strings to use better terminology (Danilo Šegan)
Translators
- Miloslav Trmac (cs)
- Christian Neumair (de)
- Adam Weinberger (en_CA)
- David Lodge (en_GB)
- Francisco Javier F. Serrador (es)
- Pauli Virtanen (fi)
- Ankit Patel (gu)
- Changwoo Ryu (ko)
- Sanlig Badral (mn)
- Kjartan Maraas (nb)
- Åsmund Skjæveland (nn)
- Kjartan Maraas (no)
- Amanpreet Singh Alam (pa)
- Gnome PL Team (pl)
- Duarte Loreto (pt)
- Dmitry G. Mastrukov (ru)
- Laurent Dhima (sq)
- Данило Шеган (sr)
- Christian Rose (sv)
- Funda Wang (zh_CN)
2.7.90
======
Fixes
- Remove unused internal function (Carlos Daniel Ruvalcaba Valenzuela)
- Bring docs up to date with GObject (rather than GtkObject) usage (Kai Willadsen)
Translators
- Rostislav Raykov (bg)
- Adam Weinberger (en_CA)
- Francisco Javier F. Serrador (es)
- Ravishankar Shrivastava (hi)
- Laszlo Dvornik (hu)
- Takeshi AIHANA (ja)
- Changwoo Ryu (ko)
- Žygimantas Beručka (lt)
- Sanlig Badral (mn)
- Tino Meinen (nl)
- Kjartan Maraas (no)
- Gnome PL Team (pl)
- Duarte Loreto (pt)
- Laurent Dhima (sq)
- Christian Rose (sv)
- Maxim Dziumanenko (uk)
2.7.3.1
=======
Fixes
- Make --makefile-install-rule worky again (Mark)
- Remove an outdated comment from the path file (Fernando Herrera)
Translators
- Alexander Shopov (bg)
- Miloslav Trmac (cs)
- Gareth Owen (en_GB)
- Laurent Dhima (sq)
2.7.3
=====
Features
- Switch on "subtree-in-a-file" at certain points in the tree (Mark)
o See http://mail.gnome.org/archives/desktop-devel-list/2004-June/msg00424.html
- Add --unload to gconftool which complements --load (Julio M. Merino Vidal, Mark)
- Add --sysgconfsubdir configure argument (Julio M. Merino Vidal)
- Make gconfd reload all databases on SIGHUP (Josselin Mouette)
Fixes
- Fix gconfd segfault from freeing the default database twice (Mark)
- Warn in docs to call g_type_init() before using GConfCient (Leonardo Quijano Vincenzi)
- Don't create a dir during docs build if not needed (Julio M. Merino Vidal)
- Encode non-ascii GConf keys using a more compact encoding (Mariano Suárez-Alvare)
- 64-bit fix (Joe Marcus Clarke)
- Plug a leak (Kjartan Maraas)
2.7.1
=====
Features:
- Add a --ignore-schema-defaults argument for use with gconftool-2 --dump (Mark)
- Add API to construct databases from arbitrary stacks of sources (Mark)
- Allow backends to notify the daemon of changes (Cyrille Moureaux, Mark)
- Add vtable size mismatch detection (Mark)
Fixes:
- Fix accidental use of a C99ism (Morten Welinder)
- Fix random crashes when unsetting keys (Richard Hult)
- Fix .gconfd/saved_state growing to a huge size (Gustavo Giráldez)
Translators:
- Gisela Carbonell (ca)
- Miloslav Trmac (cs)
- Adam Weinberger (en_CA)
- Gareth Owen (en_GB)
- Francisco Javier F. Serrador (es)
- Hizkuntza Politikarako Sailburuordetza (eu)
- Christophe Merlet (RedFox) (fr)
- Nirav, Ankit, Ankur, Atit, Bhavin, Kartik, Khushbu, Sweta. (gu)
- helgi (is)
- Alessio Frusciante (it)
- Kjartan Maraas (no)
- Laurent Dhima (sq)
- Данило Шеган (sr)
- Yuri Syrota (uk)
- Funda Wang (zh_CN)
diffstat:
devel/GConf2-ui/Makefile | 4 +-
devel/GConf2-ui/buildlink3.mk | 4 +-
devel/GConf2/Makefile.common | 7 +-
devel/GConf2/PLIST | 20 +-----
devel/GConf2/buildlink3.mk | 4 +-
devel/GConf2/distinfo | 12 +--
devel/GConf2/patches/patch-ab | 18 ++--
devel/GConf2/patches/patch-ac | 25 ++-----
devel/GConf2/patches/patch-ad | 29 ---------
devel/GConf2/patches/patch-ae | 127 ------------------------------------------
10 files changed, 36 insertions(+), 214 deletions(-)
diffs (truncated from 380 to 300 lines):
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2-ui/Makefile
--- a/devel/GConf2-ui/Makefile Tue Sep 21 16:44:14 2004 +0000
+++ b/devel/GConf2-ui/Makefile Tue Sep 21 16:44:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/05/03 20:55:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/09/21 16:44:50 jmmv Exp $
#
.include "../../devel/GConf2/Makefile.common"
@@ -8,7 +8,7 @@
CONFIGURE_ARGS+= --enable-gtk
BUILD_DIRS= ${WRKSRC}/gconf
-ALL_TARGET= GConfX.h gconf-sanity-check-2
+ALL_TARGET= gconfmarshal.h gconfmarshal.c GConfX.h gconf-sanity-check-2
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/gconf/.libs/gconf-sanity-check-2 \
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2-ui/buildlink3.mk
--- a/devel/GConf2-ui/buildlink3.mk Tue Sep 21 16:44:14 2004 +0000
+++ b/devel/GConf2-ui/buildlink3.mk Tue Sep 21 16:44:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:17:29 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 16:44:50 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF2_UI_BUILDLINK3_MK:= ${GCONF2_UI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
BUILDLINK_PACKAGES+= GConf2-ui
.if !empty(GCONF2_UI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2-ui+= GConf2-ui>=2.6.0
+BUILDLINK_DEPENDS.GConf2-ui+= GConf2-ui>=2.8.0.1
BUILDLINK_PKGSRCDIR.GConf2-ui?= ../../devel/GConf2-ui
.endif # GCONF2_UI_BUILDLINK3_MK
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2/Makefile.common
--- a/devel/GConf2/Makefile.common Tue Sep 21 16:44:14 2004 +0000
+++ b/devel/GConf2/Makefile.common Tue Sep 21 16:44:50 2004 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.23 2004/07/02 21:41:44 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.24 2004/09/21 16:44:50 jmmv Exp $
#
-DISTNAME= GConf-2.6.3
+DISTNAME= GConf-2.8.0.1
CATEGORIES= devel gnome
-MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.6/}
+MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/2.8/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= jmmv%NetBSD.org@localhost
@@ -31,6 +31,7 @@
PKG_SYSCONFSUBDIR= gconf
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+= --with-sysconfsubdir=
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
CONFIGURE_ARGS+= --disable-gtk-doc
CONFIGURE_ARGS+= --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2/PLIST
--- a/devel/GConf2/PLIST Tue Sep 21 16:44:14 2004 +0000
+++ b/devel/GConf2/PLIST Tue Sep 21 16:44:50 2004 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2004/06/28 13:02:21 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.19 2004/09/21 16:44:50 jmmv Exp $
bin/gconf-merge-tree
bin/gconftool-2
include/gconf/2/gconf/gconf-changeset.h
@@ -26,19 +26,7 @@
man/man1/gconftool-2.1
share/aclocal/gconf-2.m4
share/doc/gconf/ch01.html
-share/doc/gconf/ch01s02.html
-share/doc/gconf/ch02.html
-share/doc/gconf/ch02s02.html
-share/doc/gconf/ch02s03.html
-share/doc/gconf/ch02s04.html
-share/doc/gconf/ch06.html
-share/doc/gconf/ch06s02.html
-share/doc/gconf/ch06s03.html
-share/doc/gconf/ch07.html
-share/doc/gconf/conventions.html
share/doc/gconf/gconf-GConfClient.html
-share/doc/gconf/gconf-client-reference.html
-share/doc/gconf/gconf-client.html
share/doc/gconf/gconf-gconf-backend.html
share/doc/gconf/gconf-gconf-changeset.html
share/doc/gconf/gconf-gconf-engine.html
@@ -50,10 +38,7 @@
share/doc/gconf/gconf-gconf-sources.html
share/doc/gconf/gconf-gconf-value.html
share/doc/gconf/gconf-gconf.html
-share/doc/gconf/gconf-internals-reference.html
-share/doc/gconf/gconf-reference.html
share/doc/gconf/gconf.devhelp
-share/doc/gconf/gconftool.html
share/doc/gconf/home.png
share/doc/gconf/index.html
share/doc/gconf/index.sgml
@@ -68,6 +53,7 @@
${PKGLOCALEDIR}/locale/be/LC_MESSAGES/GConf2.mo
${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/GConf2.mo
${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/GConf2.mo
${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/GConf2.mo
${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/GConf2.mo
${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/GConf2.mo
@@ -97,6 +83,8 @@
${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/GConf2.mo
${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/GConf2.mo
${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/GConf2.mo
+${PKGLOCALEDIR}/locale/ne/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
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2/buildlink3.mk
--- a/devel/GConf2/buildlink3.mk Tue Sep 21 16:44:14 2004 +0000
+++ b/devel/GConf2/buildlink3.mk Tue Sep 21 16:44:50 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:17:29 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 16:44:50 jmmv Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
GCONF2_BUILDLINK3_MK:= ${GCONF2_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@
BUILDLINK_PACKAGES+= GConf2
.if !empty(GCONF2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.GConf2+= GConf2>=2.6.0
+BUILDLINK_DEPENDS.GConf2+= GConf2>=2.8.0.1
BUILDLINK_PKGSRCDIR.GConf2?= ../../devel/GConf2
.endif # GCONF2_BUILDLINK3_MK
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2/distinfo
--- a/devel/GConf2/distinfo Tue Sep 21 16:44:14 2004 +0000
+++ b/devel/GConf2/distinfo Tue Sep 21 16:44:50 2004 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.15 2004/07/02 21:41:44 jmmv Exp $
+$NetBSD: distinfo,v 1.16 2004/09/21 16:44:50 jmmv Exp $
-SHA1 (GConf-2.6.3.tar.bz2) = de426dd820caba3517285f9b7d9eac208bdbdc7c
-Size (GConf-2.6.3.tar.bz2) = 1522330 bytes
-SHA1 (patch-ab) = eb9ffa0ec87fe21b0f754aef019221d619b37b11
-SHA1 (patch-ac) = 95fdcf832a0c1fb4744a0e12be08b1314c6a923b
-SHA1 (patch-ad) = ef6172650190df26f0a829506e99b0c65c8d2385
-SHA1 (patch-ae) = 6ddf36cc1df4c72c4d3b48e389b0fb2df20dc87a
+SHA1 (GConf-2.8.0.1.tar.bz2) = 44ec6c17fb569d2467e6efc0bc025c4686907d77
+Size (GConf-2.8.0.1.tar.bz2) = 1729487 bytes
+SHA1 (patch-ab) = 67044ae449164931949f8a67d9f14db15d59365d
+SHA1 (patch-ac) = 03045811c13261088f291e2fbad24e2965c592dc
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2/patches/patch-ab
--- a/devel/GConf2/patches/patch-ab Tue Sep 21 16:44:14 2004 +0000
+++ b/devel/GConf2/patches/patch-ab Tue Sep 21 16:44:50 2004 +0000
@@ -1,15 +1,15 @@
-$NetBSD: patch-ab,v 1.1 2003/02/14 20:04:09 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2004/09/21 16:44:50 jmmv Exp $
---- Makefile.in.orig Mon Jan 27 11:12:15 2003
+--- Makefile.in.orig 2004-09-14 21:36:45.000000000 +0200
+++ Makefile.in
-@@ -455,10 +455,6 @@ mostlyclean distclean maintainer-clean
+@@ -675,10 +675,6 @@ uninstall-info: uninstall-info-recursive
+
+
install-data-local:
- -mkdir -p $(DESTDIR)$(datadir)/aclocal
- $(INSTALL_DATA) gconf.m4 $(DESTDIR)$(datadir)/aclocal/gconf-$(MAJOR_VERSION).m4
-- -mkdir -p $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.defaults
-- -chmod 755 $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.defaults
-- -mkdir -p $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.mandatory
-- -chmod 755 $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.mandatory
+- -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
+- -chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
+- -mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory
+- -chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory
install-schemas:
(cd standard-schemas && $(MAKE) $(AM_MAKEFLAGS) install-schemas)
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2/patches/patch-ac
--- a/devel/GConf2/patches/patch-ac Tue Sep 21 16:44:14 2004 +0000
+++ b/devel/GConf2/patches/patch-ac Tue Sep 21 16:44:50 2004 +0000
@@ -1,24 +1,15 @@
-$NetBSD: patch-ac,v 1.3 2004/05/03 20:55:36 jmmv Exp $
+$NetBSD: patch-ac,v 1.4 2004/09/21 16:44:50 jmmv Exp $
---- gconf/Makefile.in.orig 2004-04-19 14:11:03.000000000 +0200
+--- gconf/Makefile.in.orig 2004-09-14 21:36:47.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
+@@ -767,8 +767,8 @@ $(CORBA_SOURCECODE): $(srcdir)/GConfX.id
$(ORBIT_IDL) $(srcdir)/GConfX.idl
install-data-local:
-- -mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)
-- $(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path
-+ -mkdir -p $(DESTDIR)$(datadir)/examples/GConf2
+- $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
+- $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
++ $(mkinstalldirs) $(DESTDIR)$(datadir)/examples/GConf2
+ $(INSTALL_DATA) default.path $(DESTDIR)$(datadir)/examples/GConf2/path
- gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h
- @true
+ uninstall-local:
+ rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2/patches/patch-ad
--- a/devel/GConf2/patches/patch-ad Tue Sep 21 16:44:14 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2004/05/03 20:55:36 jmmv Exp $
-
---- gconf/default.path.in.orig 2004-04-01 15:39:41.000000000 +0200
-+++ gconf/default.path.in
-@@ -7,12 +7,12 @@
-
- # Look first in systemwide mandatory settings directory
- # (commented out until xml backend knows how to be read-only for users)
--xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.mandatory
-+xml:readonly:@EXPANDED_SYSCONFDIR@/gconf.xml.mandatory
-
- # 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
-@@ -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
-
- # Finally, look at the systemwide defaults
--xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults
-+xml:readonly:@EXPANDED_SYSCONFDIR@/gconf.xml.defaults
diff -r 86042cf0c415 -r a47c580fbfbc devel/GConf2/patches/patch-ae
--- a/devel/GConf2/patches/patch-ae Tue Sep 21 16:44:14 2004 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,127 +0,0 @@
-$NetBSD: patch-ae,v 1.5 2004/05/03 21:01:56 jmmv Exp $
-
-http://bugzilla.gnome.org/show_bug.cgi?id=130129
-
---- 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;
- static char* schema_file = NULL;
- static char* entry_file = NULL;
-+static char* unload_entry_file = NULL;
- static const char* config_source = NULL;
- static int use_local_source = FALSE;
- static int makefile_install_mode = FALSE;
-@@ -167,6 +168,15 @@ struct poptOption options[] = {
- NULL
- },
- {
-+ "unload",
-+ '\0',
-+ POPT_ARG_STRING,
-+ &unload_entry_file,
-+ 0,
-+ N_("Unload a set of values described in an XML file."),
-+ NULL
-+ },
-+ {
- "recursive-list",
- 'R',
- POPT_ARG_NONE,
-@@ -838,6 +848,18 @@ main (int argc, char** argv)
- return retval;
- }
-
-+ if (unload_entry_file != NULL)
-+ {
-+ const gchar** args = poptGetArgs(ctx);
-+ gint retval;
-+
-+ retval = do_load_file(conf, LOAD_ENTRY_FILE, unload_entry_file, args);
-+
-+ gconf_engine_unref(conf);
-+
-+ return retval;
-+ }
-+
- if (spawn_gconfd)
Home |
Main Index |
Thread Index |
Old Index