summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2007-09-14 07:20:28 +0000
committerKoen Kooi <koen@openembedded.org>2007-09-14 07:20:28 +0000
commitb7841258a3edecfe7a4283ef69aa78d320d18d81 (patch)
tree3d48565ab593635cf6048ad0ddedaadac835ca42 /packages
parent341893d0892241a950af029dc61f2685eb63b426 (diff)
gconf-dbus: sync with poky, drops dependency on gtk+
Diffstat (limited to 'packages')
-rw-r--r--packages/gnome/gconf-dbus_svn.bb30
1 files changed, 13 insertions, 17 deletions
diff --git a/packages/gnome/gconf-dbus_svn.bb b/packages/gnome/gconf-dbus_svn.bb
index 3647059de1..5a5e78a207 100644
--- a/packages/gnome/gconf-dbus_svn.bb
+++ b/packages/gnome/gconf-dbus_svn.bb
@@ -1,44 +1,40 @@
SECTION = "x11/utils"
-DEPENDS = "gtk+ glib-2.0 dbus dbus-glib libxml2 popt intltool-native"
+DEPENDS = "intltool-native glib-2.0 dbus dbus-glib libxml2 popt gtk-doc-native"
DESCRIPTION = "Settings daemon using DBUS for communication."
LICENSE = "GPL"
PROVIDES = "gconf"
RPROVIDES_${PN} = "gconf"
RPROVIDES_${PN}-dev = "gconf-dev"
-PV = "2.16.0+svn${SRCDATE}"
-PR = "r0"
+PV = "2.16.0+svnr${SRCREV}"
+PR = "r3"
SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
file://69gconfd-dbus"
-inherit pkgconfig autotools
+inherit pkgconfig autotools
S = "${WORKDIR}/trunk"
PARALLEL_MAKE = ""
-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 ""
+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"
+
+EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
-EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static"
do_configure_prepend() {
- touch ${S}/gtk-doc.make
+ touch gtk-doc.make
}
do_stage() {
- autotools_stage_all
+ autotools_stage_all
+ install -m 0644 gconf-2.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/
+ install -d ${D}/${datadir}/dbus-1.0/services/
+ install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
}
-