diff options
| -rw-r--r-- | classes/opie.bbclass | 3 | ||||
| -rw-r--r-- | classes/palmtop.bbclass | 4 | ||||
| -rw-r--r-- | conf/distro/angstrom-2006.9.conf | 2 | ||||
| -rw-r--r-- | conf/distro/openzaurus-unstable.conf | 1 | ||||
| -rw-r--r-- | conf/distro/preferred-opie-versions.inc | 3 | ||||
| -rw-r--r-- | packages/libopie/libopie2.inc | 4 | ||||
| -rw-r--r-- | packages/libqpe/libqpe-opie.inc | 10 |
7 files changed, 17 insertions, 10 deletions
diff --git a/classes/opie.bbclass b/classes/opie.bbclass index c00f7e19a9..47f364a644 100644 --- a/classes/opie.bbclass +++ b/classes/opie.bbclass @@ -23,7 +23,8 @@ OPIE_CVS_PV = "1.2.1+cvs-${SRCDATE}" DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}" # to be consistent, put all targets into workdir -EXTRA_QMAKEVARS_POST_append = " DESTDIR=${S}" +# NOTE: leave one space at the end, other files are expecting that +EXTRA_QMAKEVARS_POST += "DESTDIR=${S} " # Opie standard TAG value TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass index fb2f539589..083f5148a1 100644 --- a/classes/palmtop.bbclass +++ b/classes/palmtop.bbclass @@ -9,8 +9,8 @@ inherit qmake EXTRA_QMAKEVARS_POST += "DEFINES+=QWS LIBS+=-lqpe CONFIG+=qt LIBS-=-lstdc++ LIBS+=-lsupc++" -EXTRA_QMAKEVARS_POST += "${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", "",d)}' +EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "CONFIG+=thread", " ",d)}' -DEPENDS_prepend = "virtual/libqpe1 uicmoc-native " +DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}" FILES_${PN} = "${palmtopdir}" diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf index c91437f54f..5d77335a86 100644 --- a/conf/distro/angstrom-2006.9.conf +++ b/conf/distro/angstrom-2006.9.conf @@ -18,6 +18,8 @@ FEED_URIS += " \ # Opie +QTE_VERSION = "2.3.10" +OPIE_VERSION = "1.2.2" include conf/distro/preferred-opie-versions.inc # GPE diff --git a/conf/distro/openzaurus-unstable.conf b/conf/distro/openzaurus-unstable.conf index fd392b84e5..cc87380494 100644 --- a/conf/distro/openzaurus-unstable.conf +++ b/conf/distro/openzaurus-unstable.conf @@ -42,6 +42,7 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross" # # Opie # +QTE_VERSION = "2.3.10" OPIE_VERSION = "1.2.2" PALMTOP_USE_MULTITHREADED_QT = "no" #PALMTOP_USE_MULTITHREADED_QT = "yes" diff --git a/conf/distro/preferred-opie-versions.inc b/conf/distro/preferred-opie-versions.inc index 8b6f7d06b2..5811856e55 100644 --- a/conf/distro/preferred-opie-versions.inc +++ b/conf/distro/preferred-opie-versions.inc @@ -3,7 +3,8 @@ # 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 = "2.3.10" +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}" diff --git a/packages/libopie/libopie2.inc b/packages/libopie/libopie2.inc index 4a05010dea..390de9c9ad 100644 --- a/packages/libopie/libopie2.inc +++ b/packages/libopie/libopie2.inc @@ -15,13 +15,13 @@ PARALLEL_MAKE = "" #FIXME: Add machine specific bits here. Best use oe_machinstall and read from a given file -EXTRA_QMAKEVARS_POST = 'DEFINES+=OPIE_NEW_MALLOC \ +EXTRA_QMAKEVARS_POST += 'DEFINES+=OPIE_NEW_MALLOC \ DEFINES+="OPIE_SOUND_FRAGMENT_SHIFT=16" \ DEFINES+=OPIE_NO_ERASE_RECT_HACKFIX \ LIBS+=-L${S} LIBS+="-Wl,-rpath-link,${S}"' #NOTE: We no longer enable the sqlite PIM backend here, since a) using it means no sync and b) it's too large for 16MB images -EXTRA_QMAKEVARS_PRE = 'ENABLE_SQL_PIM_BACKEND=n' +EXTRA_QMAKEVARS_PRE += 'ENABLE_SQL_PIM_BACKEND=n' MODULES = "opiecore opiedb opiemm opienet opiepim opiesecurity opieui opiebluez" LIBS = "core2 db2 mm2 net2 pim2 security2 ui2 bluez2" diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc index 5f114c094b..57759a1681 100644 --- a/packages/libqpe/libqpe-opie.inc +++ b/packages/libqpe/libqpe-opie.inc @@ -1,4 +1,6 @@ DESCRIPTION = "Base library for the Qt/Embedded based palmtop environments" +HOMEPAGE = "http://www.trolltech.com" +AUTHOR = "The Trolls" SECTION = "opie/libs" PRIORITY = "optional" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" @@ -8,13 +10,13 @@ PROVIDES = "virtual/libqpe1" S = "${WORKDIR}/library" -inherit qmake +inherit palmtop QMAKE_PROFILES = "library.pro" -EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK CONFIG+=thread" -EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" +EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK" +EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES" -CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" +CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC" CXXFLAGS_append_c7x0 = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_tosa = " -DOPIE_NO_WINDOWED " CXXFLAGS_append_spitz = " -DOPIE_NO_WINDOWED " |