summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenning Heinold <heinold@inf.fu-berlin.de>2008-07-18 12:47:56 +0000
committerHenning Heinold <heinold@inf.fu-berlin.de>2008-07-18 12:47:56 +0000
commit987a1cc1478c2455224169f320766f42d0dc890e (patch)
treef7c66f7f89d00b1cc5f1764e841b8f38517e722a
parentcd581f86f4bc7f633f62d288ba7d42a3252a8c18 (diff)
parent0cb061f79a6fc248b13d44aa96d59b99b4736547 (diff)
merge of '7ddcf7aeb14743db7aec16e7be026e81dd7d1b38'
and '833293633b1a1f924ee4ba4f8e442c032d9cd133'
-rw-r--r--conf/distro/chinook-compat.conf7
1 files changed, 5 insertions, 2 deletions
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index 0fb2dd4511..0d7e1b3f75 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -89,9 +89,9 @@ PREFERRED_VERSION_gtk+ = "2.10.14"
PREFERRED_VERSION_libpng = "1.2.8"
PREFERRED_VERSION_expat = "1.95.7"
-# only dbus-glib 0.7.4 works with older dbus 1.0.x
+# only dbus-glib 0.74 works with older dbus 1.0.x
PREFERRED_VERSION_dbus = "1.0.3"
-PREFERRED_VERSION_dbus-glib = "0.7.4"
+PREFERRED_VERSION_dbus-glib = "0.74"
PREFERRED_VERSION_gnome-vfs = "2.16.3"
@@ -175,6 +175,9 @@ PREFERRED_VERSION_osso-gnome-vfs2 = "2.16.3"
PREFERRED_PROVIDER_midpath = "midpath-maemo"
PREFERRED_PROVIDER_midpath-backend-gtk = "midpath-backend-gtk-hildon"
+# Need jamvm-initial since cacao 0.98 seems to get miscompiled with newer GCCs.
+PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
+
PREFERRED_PROVIDER_virtual/javac-native = "ecj-bootstrap-native"
PREFERRED_PROVIDER_classpath = "classpath"