From 6a9ed80e27237c49b27ca5b63ae985a42e4d8b0f Mon Sep 17 00:00:00 2001
From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Mon, 26 May 2008 11:52:30 +0000
Subject: opie: move OPIE_BINDIR out of opie.bbclass into palmtop.bbclass. 
 Closes 3669. * commit by Laibsch

---
 packages/libqpe/libqpe-opie/citytime-path.patch | 11 +++++++++++
 packages/libqpe/libqpe-opie_1.2.3.bb            |  2 ++
 packages/libqpe/libqpe-opie_cvs.bb              |  2 ++
 3 files changed, 15 insertions(+)
 create mode 100644 packages/libqpe/libqpe-opie/citytime-path.patch

(limited to 'packages/libqpe')

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 \
           "
 
-- 
cgit v1.2.3