merge of '3ee7753352acbc0627f1b877b1ba96587f656224'

     and 'bc0b144ff867cb1e66b24d5ba91c183ee6d51cb6'

5 files changed, 16 insertions, 112 deletions

diff --git a/packages/gnome/gconf-dbus/gconf-dbus-update.patch b/packages/gnome/gconf-dbus/gconf-dbus-update.patch
deleted file mode 100644
index 9870078b86..0000000000
--- a/packages/gnome/gconf-dbus/gconf-dbus-update.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-? gconf/gconf.service
-Index: gconf/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v
-retrieving revision 1.78.4.8
-diff -u -r1.78.4.8 Makefile.am
---- gconf/Makefile.am	21 Dec 2003 14:21:15 -0000	1.78.4.8
-+++ gconf/Makefile.am	22 Jan 2005 00:30:13 -0000
-@@ -155,6 +155,7 @@
- 
- libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined
- libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) $(GCONF_IPC_LIBS)
-+libgconf_2_la_CFLAGS = $(AM_CFLAGS)
- 
- if HAVE_DBUS
- servicedir       = $(DBUS_SERVICE_DIR)
-Index: backends/Makefile.am
-===================================================================
-RCS file: /cvs/gnome/gconf/backends/Makefile.am,v
-retrieving revision 1.30
-diff -u -r1.30 Makefile.am
---- backends/Makefile.am	3 Nov 2003 00:19:33 -0000	1.30
-+++ backends/Makefile.am	22 Jan 2005 00:30:14 -0000
-@@ -17,6 +17,7 @@
- 
- libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
- libgconfbackend_oldxml_la_LIBADD  = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
-+libgconfbackend_oldxml_la_CFLAGS  = $(AM_CFLAGS)
- 
- libgconfbackend_xml_la_SOURCES = 	\
- 	markup-backend.c		\
diff --git a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch b/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
deleted file mode 100644
index c195aad639..0000000000
--- a/packages/gnome/gconf-dbus/xml-backend-locks-compile-fix.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- trunk/backends/xml-backend.c~	2006-01-18 09:57:39.000000000 -0800
-+++ trunk/backends/xml-backend.c	2006-01-19 11:38:37.000000000 -0800
-@@ -115,6 +115,13 @@
- 
- typedef struct _XMLSource XMLSource;
- 
-+extern GConfLock*
-+gconf_get_lock (const gchar *lock_directory,
-+                GError     **err);
-+extern gboolean
-+gconf_release_lock (GConfLock *lock,
-+                    GError   **err);
-+
- /* XMLSource **/
- 
- struct _XMLSource {
diff --git a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch b/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
deleted file mode 100644
index 312a356c84..0000000000
--- a/packages/gnome/gconf-dbus/xml-backend-oldxml-Makefile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- trunk/backends/Makefile~	2006-01-19 09:52:22.000000000 -0800
-+++ trunk/backends/Makefile	2006-01-19 13:13:23.000000000 -0800
-@@ -84,7 +84,7 @@
- xml_test_OBJECTS = $(am_xml_test_OBJECTS)
- xml_test_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
--	$(top_builddir)/backends/libgconfbackend-oldxml.la
-+	libgconfbackend-oldxml.la
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
diff --git a/packages/gnome/gconf-dbus_cvs.bb b/packages/gnome/gconf-dbus_cvs.bb
deleted file mode 100644
index 6128eac3e2..0000000000
--- a/packages/gnome/gconf-dbus_cvs.bb
+++ /dev/null
@@ -1,37 +0,0 @@
-SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus libxml2 popt"
-DESCRIPTION = "Settings daemon using DBUS for communication."
-LICENSE = "GPL"
-PROVIDES = "gconf"
-RPROVIDES_${PN} = "gconf"
-RPROVIDES_${PN}-dev = "gconf-dev"
-
-PV = "0.0+cvs${SRCDATE}"
-PR = "r8"
-
-SRC_URI = "cvs://anonymous@anoncvs.gnome.org/cvs/gnome;module=gconf;tag=gconf-dbus-2-6 \
-           file://gconf-dbus-update.patch;patch=1;pnum=0 \
-	   file://69gconfd-dbus"
-
-inherit pkgconfig autotools
-S = "${WORKDIR}/gconf"
-
-FILES_${PN} += " ${libdir}/GConf/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
-
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
-
-HEADERS = "gconf.h gconf-changeset.h gconf-listeners.h gconf-schema.h gconf-value.h gconf-error.h gconf-engine.h gconf-client.h gconf-enum-types.h"
-
-do_stage() {
-        oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR}
-        install -d ${STAGING_INCDIR}/gconf/2/gconf/
-        ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
-        install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
-}
-
-do_install_append () {
-	install -d ${D}/${sysconfdir}/X11/Xsession.d
-	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
-	install -d ${D}/${datadir}/dbus-1.0/services/
-	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
-}
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index e7875dc72e..074b3015c2 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -1,39 +1,38 @@
-SECTION = "x11/utils"
+DESCRIPTION = "The GNOME Settings daemon using DBUS for communication."
 DEPENDS = "intltool-native virtual/libintl glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
-DESCRIPTION = "Settings daemon using DBUS for communication."
 LICENSE = "GPL"
+SECTION = "x11/utils"
 PROVIDES = "gconf"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
-
 PV = "2.16.0+svnr${SRCREV}"
-PR = "r5"
+PR = "r0"
 
-SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
-	   file://69gconfd-dbus"
+inherit autotools pkgconfig
 
-inherit pkgconfig autotools 
+SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
+	file://69gconfd-dbus"
 S = "${WORKDIR}/trunk"
 
 PARALLEL_MAKE = ""
 
-FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
-FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
-FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
-
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-
+EXTRA_OECONF = "--with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
 
 do_configure_prepend() {
-        touch gtk-doc.make
+	touch gtk-doc.make
 }
 
 do_stage() {
-        autotools_stage_all
-        install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
+	autotools_stage_all
+	install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
 }
 
-do_install_append () {
+do_install_append() {
 	install -d ${D}/${sysconfdir}/X11/Xsession.d
 	install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
 }
+
+FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
+FILES_${PN}-dbg += " ${libdir}/GConf-dbus/2/.debug"
+FILES_${PN}-dev += "${libdir}/GConf-dbus/2/*.la ${datadir}/sgml/gconf/gconf-1.0.dtd"
+