4 files changed, 16 insertions, 4 deletions
diff --git a/packages/libqpe/libqpe-opie.inc b/packages/libqpe/libqpe-opie.inc
index 2218734fea..ebb49c0658 100644
--- a/packages/libqpe/libqpe-opie.inc
+++ b/packages/libqpe/libqpe-opie.inc
@@ -11,11 +11,12 @@ S = "${WORKDIR}/library"
 
 inherit palmtop
 
+OE_QMAKE_CXXFLAGS := "${@oe_filter_out('-fno-rtti', '${OE_QMAKE_CXXFLAGS}', d)}"
 QMAKE_PROFILES = "library.pro"
 EXTRA_QMAKEVARS_PRE += "CONFIG+=LIBQPE_WITHROHFEEDBACK"
 EXTRA_QMAKEVARS_POST += "DESTDIR= DEFINES+=LIBQPE_NO_INLINE_IMAGES"
 
-CXXFLAGS_append = " -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
+CXXFLAGS_append = " -frtti -DOPIE_NO_ERASE_RECT_HACKFIX -DOPIE_NEW_MALLOC"
 
 do_compile() {
         mkdir -p ${STAGING_INCDIR}/qpe \
diff --git a/packages/libqpe/libqpe-opie/citytime-path-2.patch b/packages/libqpe/libqpe-opie/citytime-path-2.patch
new file mode 100644
index 0000000000..27cb9634c9
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/citytime-path-2.patch
@@ -0,0 +1,11 @@
+--- library/tzselect.cpp	12 Jan 2008 10:14:42 -0000	1.13
++++ library/tzselect.cpp	30 Aug 2008 15:32:13 -0000
+@@ -270,7 +270,7 @@
+ void TimeZoneSelector::slotExecute( void )
+ {
+   // execute the world time application...
+-    if (QFile::exists(QPEApplication::qpeDir()+"bin/citytime"))
++    if (QFile::exists(OPIE_BINDIR "/citytime"))
+         Global::execute( "citytime" );
+     else
+         QMessageBox::warning(this,tr("citytime executable not found"),
diff --git a/packages/libqpe/libqpe-opie_1.2.3.bb b/packages/libqpe/libqpe-opie_1.2.3.bb
index a51d6a9225..0822385b9d 100644
--- a/packages/libqpe/libqpe-opie_1.2.3.bb
+++ b/packages/libqpe/libqpe-opie_1.2.3.bb
@@ -1,6 +1,6 @@
 require ${PN}.inc
 
-PR = "r2"
+PR = "r3"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 0085003303..7c69904cd2 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,12 +1,12 @@
 require ${PN}.inc
 
 PV = "${OPIE_CVS_PV}"
-PR = "r3"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
            file://unbreak-logging.patch;patch=1 \
-           file://citytime-path.patch;patch=1 \
+           file://citytime-path-2.patch;patch=1 \
 	   file://argv.patch;patch=1 \
           "