[oe-commits] org.oe.dev chinook-compat: make it more Maemo compatible

[hrw commit]

chinook-compat: make it more Maemo compatible

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 77f81ea18669b5c79145faa5f0a96df1d7db3232
ViewMTN: http://monotone.openembedded.org/revision/info/77f81ea18669b5c79145faa5f0a96df1d7db3232
Files:
1
conf/distro/chinook-compat.conf
Diffs:

#
# mt diff -rd5ba783500e0736d5feddf225ab7a4f005edaeda -r77f81ea18669b5c79145faa5f0a96df1d7db3232
#
#
#
# patch "conf/distro/chinook-compat.conf"
#  from [63ae68a2e963c080047694c97099564d469ce9e0]
#    to [82f061f680e83ac8f98ea7c468da6ace94ccba60]
#
============================================================
--- conf/distro/chinook-compat.conf	63ae68a2e963c080047694c97099564d469ce9e0
+++ conf/distro/chinook-compat.conf	82f061f680e83ac8f98ea7c468da6ace94ccba60
@@ -52,7 +52,9 @@ PREFERRED_PROVIDER_virtual/arm-linux-gnu
 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_gtk+             = "2.
 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-xpm
 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_libhildon = "libhildon1"
 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"