8 files changed, 15 insertions, 0 deletions
diff --git a/packages/libqpe/libqpe-opie/citytime-path.patch b/packages/libqpe/libqpe-opie/citytime-path.patch
new file mode 100644
index 0000000000..0abaf146d7
--- /dev/null
+++ b/packages/libqpe/libqpe-opie/citytime-path.patch
@@ -0,0 +1,11 @@
+--- library/tzselect.cpp.orig	2008-01-12 21:05:49.000000000 +1300
++++ library/tzselect.cpp	2008-01-12 21:06:01.000000000 +1300
+@@ -273,7 +273,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 bd2e672fff..00f9819f6e 100644
--- a/packages/libqpe/libqpe-opie_1.2.3.bb
+++ b/packages/libqpe/libqpe-opie_1.2.3.bb
@@ -1,9 +1,11 @@
 require ${PN}.inc
 
+PR = "r1"
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/library \
            file://fix-titleheight.patch;patch=1 \
            file://unbreak-logging.patch;patch=1 \
+           file://citytime-path.patch;patch=1 \
           "
 
diff --git a/packages/libqpe/libqpe-opie_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 10ad8d56ea..df26d65cbc 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -1,9 +1,11 @@
 require ${PN}.inc
 
+PR = "r1"
 PV = "1.2.3+cvs${SRCDATE}"
 
 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 \
           "
 
diff --git a/packages/opie-dasher/.mtn2git_empty b/packages/nonworking/opie-dasher/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/opie-dasher/.mtn2git_empty
+++ b/packages/nonworking/opie-dasher/.mtn2git_empty
diff --git a/packages/opie-dasher/opie-dasher.inc b/packages/nonworking/opie-dasher/opie-dasher.inc
index 9903dd9a56..9903dd9a56 100644
--- a/packages/opie-dasher/opie-dasher.inc
+++ b/packages/nonworking/opie-dasher/opie-dasher.inc
diff --git a/packages/opie-dasher/opie-dasher_1.2.2.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb
index 88c009d775..88c009d775 100644
--- a/packages/opie-dasher/opie-dasher_1.2.2.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.2.bb
diff --git a/packages/opie-dasher/opie-dasher_1.2.3.bb b/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb
index e7774e33df..e7774e33df 100644
--- a/packages/opie-dasher/opie-dasher_1.2.3.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_1.2.3.bb
diff --git a/packages/opie-dasher/opie-dasher_cvs.bb b/packages/nonworking/opie-dasher/opie-dasher_cvs.bb
index 10cca07fd6..10cca07fd6 100644
--- a/packages/opie-dasher/opie-dasher_cvs.bb
+++ b/packages/nonworking/opie-dasher/opie-dasher_cvs.bb