From: Paul Eggleton <bluelightning@bluelightning.org>
Date: Sat, 30 Aug 2008 15:54:59 +0000 (+0000)
Subject: libqpe-opie: fix error in do_patch compilation for cvs version
X-Git-Tag: Release-2010-05/1~6187
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=82f7cf8e771bfbfa840a039b0f0f5b432e073f30;p=openembedded.git

libqpe-opie: fix error in do_patch compilation for cvs version
 * Add citytime-path-2.patch which applies cleanly against current CVS
---

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_cvs.bb b/packages/libqpe/libqpe-opie_cvs.bb
index 0085003303..bbeac82431 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 = "r4"
 
 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 \
           "