- Use gtk 2.6.7 as opposed to 2.8.3

- Use dbus 0.50 as opposed to 0.36
- Use svn versions of matchbox apps
- Update matchbox svn packages
- Add matchbox-common svn package
- Build gtk tools with gconf


git-svn-id: https://svn.o-hand.com/repos/poky@33 311d38ba-8fff-0310-9ca6-ca027cbcb966

7 files changed, 34 insertions, 16 deletions

diff --git a/openembedded/conf/distro/poky-additions.inc b/openembedded/conf/distro/poky-additions.inc
index c72d959d0c..0fc2f5072f 100644
--- a/openembedded/conf/distro/poky-additions.inc
+++ b/openembedded/conf/distro/poky-additions.inc
@@ -9,18 +9,18 @@ DISTRO_TYPE = "debug"
 
 #PREFERRED_PROVIDER_gconf=gconf-dbus
 
-PREFERRED_VERSION_libmatchbox = "1.7"
+PREFERRED_VERSION_libmatchbox = "1.7cvs${CVSDATE}"
 PREFERRED_VERSION_matchbox = "0.9.1"
-PREFERRED_VERSION_matchbox-common = "0.9.1"
-PREFERRED_VERSION_matchbox-desktop = "0.9.1"
-PREFERRED_VERSION_matchbox-wm = "svn"
-PREFERRED_VERSION_matchbox-panel = "0.9.2"
+PREFERRED_VERSION_matchbox-common = "0.9.1cvs${CVSDATE}"
+PREFERRED_VERSION_matchbox-desktop = "0.9.1cvs${CVSDATE}"
+PREFERRED_VERSION_matchbox-wm = "0.9.5cvs${CVSDATE}"
+PREFERRED_VERSION_matchbox-panel = "0.9.2cvs${CVSDATE}"
 PREFERRED_VERSION_matchbox-applet-inputmanager = "0.6"
 
 PREFERRED_VERSION_atk = "1.10.0"
 PREFERRED_VERSION_cairo = "1.0.0"
 PREFERRED_VERSION_glib-2.0 = "2.8.1"
-PREFERRED_VERSION_gtk+ = "2.8.3"
+PREFERRED_VERSION_gtk+ = "2.6.7"
 PREFERRED_VERSION_pango = "1.10.0"
 
-PREFERRED_VERSION_dbus = "0.36"
+PREFERRED_VERSION_dbus = "0.50"
diff --git a/openembedded/packages/gnome/gconf_2.6.1.bb b/openembedded/packages/gnome/gconf_2.6.1.bb
index cacd461a17..b54109580d 100644
--- a/openembedded/packages/gnome/gconf_2.6.1.bb
+++ b/openembedded/packages/gnome/gconf_2.6.1.bb
@@ -3,14 +3,15 @@ SECTION = "x11/gnome"
 DESCRIPTION = "GNOME configuration database system"
 SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/GConf/2.6/GConf-${PV}.tar.bz2 \
 	   file://backends.patch;patch=1"
-DEPENDS = "orbit2 glib-2.0  libxml2"
+DEPENDS = "orbit2 glib-2.0  libxml2 gtk+"
 ORBIT_IDL_SRC = "${STAGING_BINDIR}/orbit-idl-2"
 
 FILES_${PN} += " ${libdir}/GConf/*"
+PR = "r1"
 
 S = "${WORKDIR}/GConf-${PV}"
 
-EXTRA_OECONF = "--disable-gtk-doc"
+EXTRA_OECONF = "--disable-gtk-doc --enable-gtk"
 
 inherit autotools pkgconfig gettext
 
diff --git a/openembedded/packages/libmatchbox/libmatchbox_svn.bb b/openembedded/packages/libmatchbox/libmatchbox_svn.bb
index dbd4edc860..6b8704e4d9 100644
--- a/openembedded/packages/libmatchbox/libmatchbox_svn.bb
+++ b/openembedded/packages/libmatchbox/libmatchbox_svn.bb
@@ -1,6 +1,6 @@
 include libmatchbox.inc
 
-PV = "1.6cvs${CVSDATE}"
+PV = "1.7cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http\
diff --git a/openembedded/packages/matchbox-common/matchbox-common_svn.bb b/openembedded/packages/matchbox-common/matchbox-common_svn.bb
new file mode 100644
index 0000000000..de1e20b87a
--- /dev/null
+++ b/openembedded/packages/matchbox-common/matchbox-common_svn.bb
@@ -0,0 +1,17 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager common files"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox"
+PV = "0.9.1cvs${CVSDATE}"
+S = "${WORKDIR}/matchbox-common"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-common;proto=http"
+
+inherit autotools  pkgconfig
+
+EXTRA_OECONF = "--enable-pda-folders"
+
+FILES_${PN} = "${bindir} \
+	       ${datadir}/matchbox/vfolders \
+	       ${datadir}/pixmaps"
diff --git a/openembedded/packages/matchbox-desktop/matchbox-desktop_svn.bb b/openembedded/packages/matchbox-desktop/matchbox-desktop_svn.bb
index 9634c4960c..ca193d42c1 100644
--- a/openembedded/packages/matchbox-desktop/matchbox-desktop_svn.bb
+++ b/openembedded/packages/matchbox-desktop/matchbox-desktop_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Desktop"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox startup-notification"
 SECTION = "x11/wm"
-PV = "0.9cvs${CVSDATE}"
+PV = "0.9.1cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
diff --git a/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb b/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
index 9d18c90aae..c109084806 100644
--- a/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
+++ b/openembedded/packages/matchbox-panel/matchbox-panel_svn.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Window Manager Panel"
 LICENSE = "GPL"
 DEPENDS = "libmatchbox x11 xext xpm apmd startup-notification virtual/kernel"
 SECTION = "x11/wm"
-PV = "0.9cvs${CVSDATE}"
+PV = "0.9.2cvs${CVSDATE}"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
diff --git a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
index d747243740..5ac11d212d 100644
--- a/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
+++ b/openembedded/packages/matchbox-wm/matchbox-wm_svn.bb
@@ -1,10 +1,10 @@
 SECTION = "x11/wm"
 DESCRIPTION = "Matchbox window manager"
 LICENSE = "GPL"
-DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat matchbox-common"
 RDEPENDS = "matchbox-common"
-PV = "0.9.5+cvs-${CVSDATE}"
-PR = "r1"
+PV = "0.9.5cvs${CVSDATE}"
+PR = "r2"
 DEFAULT_PREFERENCE = "-1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager;proto=http \
@@ -26,7 +26,7 @@ FILES_${PN} = "${bindir} \
                ${datadir}/themes/Default/matchbox \
                ${datadir}/themes/MBOpus/matchbox"
 
-EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm"
+EXTRA_OECONF = "--enable-composite --enable-startup-notification --disable-xrm --enable-expat"
 
 do_install_prepend() {
 	install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig