[oe-commits] : Opie: fix citytime launch path (see bug 3669)

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.stable
Commit: 3c4e63b095f9222317ed3fcd515f91f426af1a77
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=3c4e63b095f9222317ed3fcd515f91f426af1a77

Author:  <bluelightning at openembedded.org>
Date:   Mon Jun  9 22:48:46 2008 +0000

Opie: fix citytime launch path (see bug 3669)
Applied revisions from dev:
 d0b5cd0a6db8e84d4644dfe5a4cfa9c01fc283e6

---

 classes/opie.bbclass                            |    1 -
 classes/palmtop.bbclass                         |    1 +
 packages/libqpe/libqpe-opie/citytime-path.patch |   11 +++++++++++
 packages/libqpe/libqpe-opie_1.2.3.bb            |    2 ++
 packages/libqpe/libqpe-opie_cvs.bb              |    1 +
 5 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index 6324dbf..bd1bbaf 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -22,7 +22,6 @@ DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2
 # to be consistent, put all targets into workdir
 # NOTE: leave one space at the end, other files are expecting that
 EXTRA_QMAKEVARS_POST += " DESTDIR=${S} "
-EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
 
 # Opie standard TAG value
 TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}"
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index fa25d59..b4ee62c 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -17,6 +17,7 @@ EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "ye
 EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte", d)}'
+EXTRA_QMAKEVARS_POST += " DEFINES+=OPIE_BINDIR='\"${bindir}\"' DEFINES+=OPIE_LIBDIR='\"${libdir}/opie/lib\"' DEFINES+=OPIE_QTDIR='\"${libdir}/opie\"' "
 
 PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
 FILES_${PN} += " ${palmtopdir} "
diff --git a/packages/libqpe/libqpe-opie/citytime-path.patch b/packages/libqpe/libqpe-opie/citytime-path.patch
new file mode 100644
index 0000000..0abaf14
--- /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 bd2e672..00f9819 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 10ad8d5..43b75c1 100644
--- a/packages/libqpe/libqpe-opie_cvs.bb
+++ b/packages/libqpe/libqpe-opie_cvs.bb
@@ -5,5 +5,6 @@ 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 \
           "