diff options
| -rw-r--r-- | conf/distro/include/sane-srcdates.inc | 1 | ||||
| -rw-r--r-- | conf/distro/include/sane-srcrevs.inc | 2 | ||||
| -rw-r--r-- | packages/gnome/gconf-dbus_cvs.bb | 37 | ||||
| -rw-r--r-- | packages/gnome/gconf-dbus_svn.bb | 33 |
4 files changed, 17 insertions, 56 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index aaf7b02a09..43ffa1de9f 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -46,7 +46,6 @@ SRCDATE_rosetta ?= "20060804" SRCDATE_gpesyncd ?= "20070701" # GNOME -SRCDATE_gconf-dbus ?= "20070512" SRCDATE_gnome-vfs ?= "20060119" SRCDATE_gtkhtml2 ?= "20060323" diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index a585fdeca6..4d92f48928 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -23,7 +23,7 @@ SRCREV_pn-elf2flt ?= "1786" SRCREV_pn-epiphany ?= "7650" SRCREV_pn-fbgrab-viewer-native ?= "1943" SRCREV_pn-fstests ?= "204" -SRCREV_pn-gconf-dbus ?= "606" +SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-gnuradio ?= "6377" SRCREV_pn-gpe-contacts ?= "9312" SRCREV_pn-gsm0710muxd ?= "73" 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" + |