[oe-commits] org.oe.dev gconf-dbus: update svn to 2.16

[koen commit]

gconf-dbus: update svn to 2.16

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: a1c14f5ed3aa4310fcbbae2ab8eaf084e777f6b4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a1c14f5ed3aa4310fcbbae2ab8eaf084e777f6b4
Files:
1
packages/gnome/gconf-dbus_svn.bb
Diffs:

#
# mt diff -rab1c65e442dcbe9e036b59579274e15e21fed660 -ra1c14f5ed3aa4310fcbbae2ab8eaf084e777f6b4
#
# 
# 
# patch "packages/gnome/gconf-dbus_svn.bb"
#  from [fd192947478272fda3d0af603d79fe07b878748a]
#    to [36e8c426d8b36b70492c7954c217f4a743f64621]
# 
============================================================
--- packages/gnome/gconf-dbus_svn.bb	fd192947478272fda3d0af603d79fe07b878748a
+++ packages/gnome/gconf-dbus_svn.bb	36e8c426d8b36b70492c7954c217f4a743f64621
@@ -6,13 +6,10 @@ RPROVIDES_${PN}-dev = "gconf-dev"
 RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
-PV = "2.10.0+svn${SRCDATE}"
+PV = "2.16.0+svn${SRCDATE}"
 PR = "r0"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
-           file://gconf-dbus-update.patch;patch=1;pnum=0 \
-           file://xml-backend-locks-compile-fix.patch;patch=1 \
-           file://xml-backend-oldxml-Makefile.patch \
 	   file://69gconfd-dbus"
 
 inherit pkgconfig autotools
@@ -20,23 +17,22 @@ PARALLEL_MAKE = ""
 
 PARALLEL_MAKE = ""
 
-FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus*"
-FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug"
+FILES_${PN} += " ${libdir}/gconf-dbus/2/*.so \
+                 ${libdir}/GConf-dbus/2/*.so \
+                 ${libdir}/dbus-1.0 \
+		 ${sysconfdir} \
+		 ${datadir}/dbus*"
+FILES_${PN}-dbg += "${libdir}/gconf-dbus/2/.debug \
+                    ${libdir}/GConf-dbus/2/.debug ""
 
 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_compile_prepend() {
-	cd ${S}
-	patch -p1 < ../xml-backend-oldxml-Makefile.patch
+do_configure_prepend() {
+	touch ${S}/gtk-doc.make
 }
 
 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
+	autotools_stage_all
 }
 
 do_install_append () {
@@ -45,3 +41,4 @@ do_install_append () {
 	install -d ${D}/${datadir}/dbus-1.0/services/
 	install -m 644  gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
 }
+