summaryrefslogtreecommitdiffstats
path: root/meta/packages/gnome/gconf-dbus_svn.bb
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-01 13:22:38 +0000
committerRoss Burton <ross@openedhand.com>2007-08-01 13:22:38 +0000
commitd5d3fa46eb15034dc758d1859651c5ef3408e349 (patch)
treeb83ebbbd66e0594c2d4b4247abe02b8c60a0ced1 /meta/packages/gnome/gconf-dbus_svn.bb
parent100d164cb3b73f487acd0521528e5c00c2d15b62 (diff)
downloadpoky-d5d3fa46eb15034dc758d1859651c5ef3408e349.tar.gz
Upgrade gconf-dbus version
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2283 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages/gnome/gconf-dbus_svn.bb')
-rw-r--r--meta/packages/gnome/gconf-dbus_svn.bb28
1 files changed, 9 insertions, 19 deletions
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb
index 4fec0fd3fa..3007453198 100644
--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -6,44 +6,34 @@ PROVIDES = "gconf"
6RPROVIDES_${PN} = "gconf" 6RPROVIDES_${PN} = "gconf"
7RPROVIDES_${PN}-dev = "gconf-dev" 7RPROVIDES_${PN}-dev = "gconf-dev"
8 8
9PV = "2.10.0+svn${SRCDATE}" 9PV = "2.16.0+svn${SRCDATE}"
10PR = "r4" 10PR = "r0"
11 11
12SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ 12SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
13 file://gconf-dbus-update.patch;patch=1;pnum=0 \
14 file://xml-backend-locks-compile-fix.patch;patch=1 \
15 file://no-deprecation.patch;patch=1 \
16 file://remove-old-translations.patch;patch=1 \
17 file://xml-backend-oldxml-Makefile.patch \
18 file://69gconfd-dbus" 13 file://69gconfd-dbus"
19 14
20inherit pkgconfig autotools 15inherit pkgconfig autotools
21S = "${WORKDIR}/trunk" 16S = "${WORKDIR}/trunk"
22 17
23PARALLEL_MAKE = "" 18PARALLEL_MAKE = ""
24 19
25FILES_${PN} = "${libdir}/gconf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*" 20FILES_${PN} = "${libdir}/GConf-dbus/2/*.so ${libdir}/dbus-1.0 ${sysconfdir} ${datadir}/dbus* ${libdir}/*.so.* ${bindir}/* ${libexecdir}/*"
26FILES_${PN}-dbg += " ${libdir}/gconf-dbus/2/.debug" 21FILES_${PN}-dbg += " ${libdir}/gconf-dbus/2/.debug"
27 22
28EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" 23EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --enable-shared --disable-static"
29 24
30HEADERS = "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" 25HEADERS = "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"
31 26
32do_compile_prepend() { 27do_configure_prepend() {
33 cd ${S} 28 gtkdocize --copy
34 patch -p1 < ../xml-backend-oldxml-Makefile.patch
35} 29}
36 30
37do_stage() { 31do_stage() {
38 oe_libinstall -so -C gconf libgconf-2 ${STAGING_LIBDIR} 32 autotools_stage_all
39 install -d ${STAGING_INCDIR}/gconf/2/gconf/ 33 install -m 0644 gconf-2.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
40 ( cd gconf; for i in ${HEADERS}; do install -m 0644 $i ${STAGING_INCDIR}/gconf/2/gconf/$i; done )
41 install -m 0644 gconf.m4 ${STAGING_DATADIR}/aclocal/gconf-2.m4
42} 34}
43 35
44do_install_append () { 36do_install_append () {
45 install -d ${D}/${sysconfdir}/X11/Xsession.d 37 install -d ${D}/${sysconfdir}/X11/Xsession.d
46 install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/ 38 install -m 755 ${WORKDIR}/69gconfd-dbus ${D}/${sysconfdir}/X11/Xsession.d/
47 install -d ${D}/${datadir}/dbus-1.0/services/
48 install -m 644 gconf/gconf.service ${D}${datadir}/dbus-1.0/services/
49} 39}