summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2008-01-03 15:24:40 +0000
committerMarcin Juszkiewicz <hrw@openembedded.org>2008-01-03 15:24:40 +0000
commit23f2decbe62225e537aa4b8b72daf0f307340bbf (patch)
treea676fa63b1bee47bda076259582eeb9f2e643fd7
parent7377bcfa7701f0d9b88d5d312b40d356b0f0e018 (diff)
parente084786aed2d73221570ea9f0199a85890ac231f (diff)
merge of '0d7f35f44f5002f7df5f605bc373d3feecb8602d'
and '40bac439643c75e92f89252f0b5dfe329b2b8119'
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc2
-rw-r--r--packages/qpegps/files/qpegps.desktop3
-rw-r--r--packages/qpegps/qpegps.inc8
-rw-r--r--packages/qpegps/qpegps_0.9.3.1.bb6
-rw-r--r--packages/qpegps/qpegps_0.9.3.bb1
5 files changed, 13 insertions, 7 deletions
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 97fed90f21..82c31cb64a 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -1594,7 +1594,7 @@ PREFERRED_VERSION_qpe-inputhelper-applet ?= "1.0.0"
PREFERRED_VERSION_qpe-libgaim ?= "1.5.0"
PREFERRED_VERSION_qpealarmclock ?= "1.0.9"
PREFERRED_VERSION_qpealarmclockapplet ?= "1.0.9"
-PREFERRED_VERSION_qpegps ?= "0.9.3"
+PREFERRED_VERSION_qpegps ?= "0.9.3.1"
PREFERRED_VERSION_qpenmapfe ?= "1.0.0"
PREFERRED_VERSION_qpf-arabic ?= "1.0"
PREFERRED_VERSION_qpf-bitstream-vera ?= "1.10"
diff --git a/packages/qpegps/files/qpegps.desktop b/packages/qpegps/files/qpegps.desktop
index 16e222b00b..de5a93ccea 100644
--- a/packages/qpegps/files/qpegps.desktop
+++ b/packages/qpegps/files/qpegps.desktop
@@ -1,7 +1,6 @@
[Desktop Entry]
Comment=Moving Map
Exec=qpegps
-Icon=qpegps/qpegps.png
+Icon=qpegps
Type=Application
Name=qpeGPS
-
diff --git a/packages/qpegps/qpegps.inc b/packages/qpegps/qpegps.inc
index 2e10bf40a6..b763be896d 100644
--- a/packages/qpegps/qpegps.inc
+++ b/packages/qpegps/qpegps.inc
@@ -4,7 +4,8 @@ PRIORITY = "optional"
LICENSE = "GPL"
HOMEPAGE = "http://qpegps.sourceforge.net/"
-RRECOMMENDS = "gpsd"
+DEPENDS = "gpsd"
+RDEPENDS = "gpsd"
SRC_URI = "${SOURCEFORGE_MIRROR}/qpegps/qpegps_${PV}_src.zip \
file://qpegps.desktop \
@@ -16,18 +17,19 @@ inherit palmtop
QMAKE_PROFILES = "qpegps.pro"
EXTRA_QMAKEVARS_POST = "LIBS=-lqpe LIBS+=-lgps"
OE_QMAKE_CFLAGS += " -DQWS "
+OE_QMAKE_LIBS_QT = ${QT_LIBRARY}
do_install() {
install -d ${D}${palmtopdir}/bin \
${D}${palmtopdir}/apps/Applications \
- ${D}${palmtopdir}/pics/qpegps \
+ ${D}${palmtopdir}/pics \
${D}${palmtopdir}/help/html/qpegps_icons \
${D}${palmtopdir}/qpegps/maps \
${D}${palmtopdir}/qpegps/icons \
${D}${palmtopdir}/qpegps/tracks
install -m 0755 qpegps ${D}${palmtopdir}/bin/
install -m 0644 ${WORKDIR}/qpegps.desktop ${D}${palmtopdir}/apps/Applications/
- install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/qpegps/
+ install -m 0644 ${WORKDIR}/qpegps.png ${D}${palmtopdir}/pics/
install -m 0644 doc/qpegps.html ${D}${palmtopdir}/help/html/
install -m 0644 doc/qpegps_icons/*.png ${D}${palmtopdir}/help/html/qpegps_icons/
install -m 0644 icons/*.xpm ${D}${palmtopdir}/qpegps/icons/
diff --git a/packages/qpegps/qpegps_0.9.3.1.bb b/packages/qpegps/qpegps_0.9.3.1.bb
new file mode 100644
index 0000000000..e43e6a353f
--- /dev/null
+++ b/packages/qpegps/qpegps_0.9.3.1.bb
@@ -0,0 +1,6 @@
+require qpegps.inc
+
+do_configure_prepend() {
+ mv ${S}/Place.cpp ${S}/place.cpp
+ mv ${S}/Place.h ${S}/place.h
+}
diff --git a/packages/qpegps/qpegps_0.9.3.bb b/packages/qpegps/qpegps_0.9.3.bb
deleted file mode 100644
index 4cdb945321..0000000000
--- a/packages/qpegps/qpegps_0.9.3.bb
+++ /dev/null
@@ -1 +0,0 @@
-require qpegps.inc