chinook-compat: make it more Maemo compatible

diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index 007b33e..f6029ee 100644 (file)
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -52,7 +52,9 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 
 PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header"
+PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 
 PREFERRED_VERSION_automake-native = "1.9.6"
 
@@ -84,6 +86,9 @@ PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
 PREFERRED_VERSION_atk              = "1.18.0"
 PREFERRED_VERSION_gtk+             = "2.10.14"
+PREFERRED_VERSION_libpng           = "1.2.8"
+PREFERRED_VERSION_dbus             = "1.0.3"
+PREFERRED_VERSION_expat            = "1.95.7"
 
 PREFERRED_VERSION_gnome-vfs        = "2.16.3"
 
@@ -138,7 +143,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  = "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  = "gtk+"
 
-PREFERRED_PROVIDER_gconf                  = "gconf"
+PREFERRED_PROVIDER_gconf                  = "gconf-dbus"
 
 PREFERRED_VERSION_pixman                  = "0.9.6"
 
@@ -193,6 +198,7 @@ PKG_glib-2.0 = "libglib2.0-0"
 PKG_gconf = "libgconf2-6"
 DEBIANNAME_dbus_pn-dbus = "dbus"
 PKG_libhildon = "libhildon1"
+DEBIANNAME_eds-dbus_pn-libedataserver-1.2 = "libedataserver"
 
 PKG_zlib = "zlib1g"
 PKG_libglade = "libglade2-0"