From 8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 9 May 2006 16:10:18 +0000 Subject: Sync conf files with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@373 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/conf/distro/preferred-e-versions.inc | 52 +++++++++++----------- .../conf/distro/preferred-opie-versions.inc | 13 ++++-- 2 files changed, 34 insertions(+), 31 deletions(-) (limited to 'openembedded/conf/distro') diff --git a/openembedded/conf/distro/preferred-e-versions.inc b/openembedded/conf/distro/preferred-e-versions.inc index 53f363bf3..ca35c8379 100644 --- a/openembedded/conf/distro/preferred-e-versions.inc +++ b/openembedded/conf/distro/preferred-e-versions.inc @@ -2,34 +2,32 @@ # Specify which versions of E-related libraries and applications to build # -PREFERRED_VERSION_e = "0.16.999.023" -PREFERRED_VERSION_ecore-x11 = "0.9.9.023" -PREFERRED_VERSION_ecore-native = "0.9.9.023" -PREFERRED_VERSION_edb = "1.0.5.005" -PREFERRED_VERSION_edb-native = "1.0.5.005" -PREFERRED_VERSION_edje = "0.5.0.023" -PREFERRED_VERSION_edje-native = "0.5.0.023" -PREFERRED_VERSION_eet = "0.9.10.023" -PREFERRED_VERSION_eet-native = "0.9.10.023" -PREFERRED_VERSION_embryo = "0.9.1.023" -PREFERRED_VERSION_embryo-native = "0.9.1.023" +PREFERRED_VERSION_e = "0.16.999.025" +PREFERRED_VERSION_ecore-x11 = "0.9.9.025" +PREFERRED_VERSION_ecore-native = "0.9.9.025" +PREFERRED_VERSION_edb = "1.0.5.006" +PREFERRED_VERSION_edb-native = "1.0.5.006" +PREFERRED_VERSION_edje = "0.5.0.025" +PREFERRED_VERSION_edje-native = "0.5.0.025" +PREFERRED_VERSION_eet = "0.9.10.025" +PREFERRED_VERSION_eet-native = "0.9.10.025" +PREFERRED_VERSION_embryo = "0.9.1.025" +PREFERRED_VERSION_embryo-native = "0.9.1.025" PREFERRED_VERSION_emotion = "0.0.1.004" PREFERRED_VERSION_emotion-native = "0.0.1.004" -PREFERRED_VERSION_epeg = "0.9.0.005" -PREFERRED_VERSION_epsilon = "0.3.0.005" -PREFERRED_VERSION_esmart-x11 = "0.9.0.005" -PREFERRED_VERSION_evas-x11 = "0.9.9.023" -PREFERRED_VERSION_evas-native = "0.9.9.023" -PREFERRED_VERSION_ewl = "0.0.4.005" -PREFERRED_VERSION_imlib2-x11 = "1.2.1.010" -PREFERRED_VERSION_imlib2-native = "1.2.1.010" -PREFERRED_VERSION_e-wm = "0.16.999.023" -PREFERRED_VERSION_entrance = "0.9.0.005" +PREFERRED_VERSION_epeg = "0.9.0.006" +PREFERRED_VERSION_epsilon = "0.3.0.006" +PREFERRED_VERSION_esmart-x11 = "0.9.0.006" +PREFERRED_VERSION_evas-x11 = "0.9.9.025" +PREFERRED_VERSION_evas-native = "0.9.9.025" +PREFERRED_VERSION_ewl = "0.0.4.006" +PREFERRED_VERSION_imlib2-x11 = "1.2.1.011" +PREFERRED_VERSION_imlib2-native = "1.2.1.011" +PREFERRED_VERSION_e-wm = "0.16.999.025" +PREFERRED_VERSION_entrance = "0.9.0.006" -PREFERRED_PROVIDER_virtual/evas = "evas-x11" -PREFERRED_PROVIDER_virtual/ecore = "ecore-x11" -PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11" +PREFERRED_PROVIDER_virtual/evas ?= "evas-x11" +PREFERRED_PROVIDER_virtual/ecore ?= "ecore-x11" +PREFERRED_PROVIDER_virtual/imlib2 ?= "imlib2-x11" +PREFERRED_PROVIDER_virtual/esmart ?= "esmart-x11" -PREFERRED_VERSION_gnome-vfs-dbus = "svn" - -PREFERRED_VERSION_gcc = "3.4.4" diff --git a/openembedded/conf/distro/preferred-opie-versions.inc b/openembedded/conf/distro/preferred-opie-versions.inc index d9f65b383..5811856e5 100644 --- a/openembedded/conf/distro/preferred-opie-versions.inc +++ b/openembedded/conf/distro/preferred-opie-versions.inc @@ -1,14 +1,19 @@ # -# A list of applications. +# Opie libraries # - - +PREFERRED_PROVIDER_virtual/libqte2 = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}' +PREFERRED_PROVIDER_virtual/libqpe1 = "libqpe-opie" +PREFERRED_VERSION_qte-mt = "${QTE_VERSION}" +PREFERRED_VERSION_qte = "${QTE_VERSION}" PREFERRED_VERSION_libopie2 = "${OPIE_VERSION}" PREFERRED_VERSION_libopieobex0 = "${OPIE_VERSION}" PREFERRED_VERSION_libopietooth1 = "${OPIE_VERSION}" PREFERRED_VERSION_libqpe-opie = "${OPIE_VERSION}" PREFERRED_VERSION_libqtaux2 = "${OPIE_VERSION}" PREFERRED_VERSION_libmailwrapper = "${OPIE_VERSION}" +# +# Opie applications +# PREFERRED_VERSION_opie-aboutapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-addressbook = "${OPIE_VERSION}" PREFERRED_VERSION_opie-advancedfm = "${OPIE_VERSION}" @@ -191,4 +196,4 @@ PREFERRED_VERSION_opie-zkbapplet = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zlines = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zsafe = "${OPIE_VERSION}" PREFERRED_VERSION_opie-zsame = "${OPIE_VERSION}" -PREFERRED_VERSION_konqueror-embedded = "20030705" +PREFERRED_VERSION_konqueror-embedded = "20060404" -- cgit v1.2.3