summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/libqpe/libqpe-opie.inc11
-rw-r--r--packages/libqpe/libqpe-opie_1.2.1.bb1
-rw-r--r--packages/libqpe/libqpe-opie_cvs.bb1
3 files changed, 7 insertions, 6 deletions
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 3e7c74e7ef..5f114c094b 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -1,21 +1,20 @@
-DESCRIPTION = "Base library for the Qt Palmtop Environment"
+DESCRIPTION = "Base library for the Qt/Embedded based palmtop environments"
SECTION = "opie/libs"
PRIORITY = "optional"
MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-DEPENDS = "uicmoc-native qte"
-PROVIDES = "virtual/libqpe"
+DEPENDS = "uicmoc-native virtual/libqte2"
+PROVIDES = "virtual/libqpe1"
S = "${WORKDIR}/library"
inherit qmake
QMAKE_PROFILES = "library.pro"
-EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK"
+EXTRA_QMAKEVARS_PRE = "CONFIG+=LIBQPE_WITHROHFEEDBACK CONFIG+=thread"
EXTRA_QMAKEVARS_POST = "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
-# EXTRA_QMAKEVARS_POST = "DESTDIR="
-CXXFLAGS_append = " -DQWS -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC -fno-rtti -fno-exceptions"
+CXXFLAGS_append = " -DQWS -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 "
diff --git a/packages/libqpe/libqpe-opie_1.2.1.bb b/packages/libqpe/libqpe-opie_1.2.1.bb
index 6cd4368187..fd806b8ca6 100644
--- a/packages/libqpe/libqpe-opie_1.2.1.bb
+++ b/packages/libqpe/libqpe-opie_1.2.1.bb
@@ -1,6 +1,7 @@
include ${PN}.inc
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
file://0905_datebookmonth.patch;patch=1;pnum=0 \
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 8e0278daa1..9657868b0f 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -2,6 +2,7 @@ include ${PN}.inc
# Remove the dash below when 1.2.1 changes
PV = "1.2.1+cvs-${SRCDATE}"
+PR = "r1"
SRC_URI = "${HANDHELDS_CVS};module=opie/library \
file://fix-titleheight.patch;patch=1"