diff options
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
| -rw-r--r-- | meta/packages/gnome/gconf-dbus_svn.bb | 28 |
2 files changed, 10 insertions, 20 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 4c726a5ac2..6c849cdf77 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -64,7 +64,7 @@ PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2" # # CVS Dates to use: # -SRCDATE_gconf-dbus ?= "20061219" +SRCDATE_gconf-dbus ?= "20070628" SRCDATE_contacts ?= "20070614" SRCDATE_dates ?= "20070706" SRCDATE_gtkhtml2 ?= "20060323" 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" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "2.10.0+svn${SRCDATE}" -PR = "r4" +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://no-deprecation.patch;patch=1 \ - file://remove-old-translations.patch;patch=1 \ - file://xml-backend-oldxml-Makefile.patch \ file://69gconfd-dbus" -inherit pkgconfig autotools +inherit pkgconfig autotools 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} = "${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 --enable-gtk --host=${HOST_SYS} --enable-shared --disable-static" +EXTRA_OECONF = " --with-ipc=dbus --disable-gtk-doc --disable-gtk --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() { + gtkdocize --copy } 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 + 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/ } |