From 6a329bdfcc1989bc3c4e78683a67fd3198cb4bea Mon Sep 17 00:00:00 2001 From: Michael Lauer Date: Tue, 20 Jun 2006 22:30:58 +0000 Subject: zroadmap: upgrade 1.0.8 -> 1.0.12, take optional qte multithreading into account --- packages/zroadmap/files/qt2-fixes.patch | 25 +++++++++++++++ packages/zroadmap/zroadmap_1.0.12.bb | 54 +++++++++++++++++++++++++++++++++ packages/zroadmap/zroadmap_1.0.8.bb | 43 -------------------------- 3 files changed, 79 insertions(+), 43 deletions(-) create mode 100644 packages/zroadmap/files/qt2-fixes.patch create mode 100644 packages/zroadmap/zroadmap_1.0.12.bb delete mode 100644 packages/zroadmap/zroadmap_1.0.8.bb diff --git a/packages/zroadmap/files/qt2-fixes.patch b/packages/zroadmap/files/qt2-fixes.patch new file mode 100644 index 0000000000..46b17b8cfb --- /dev/null +++ b/packages/zroadmap/files/qt2-fixes.patch @@ -0,0 +1,25 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- roadmap-1.0.12/src/qt/qt_main.cc~qt2-fixes ++++ roadmap-1.0.12/src/qt/qt_main.cc +@@ -123,7 +123,7 @@ + switch (orientation[0]) { + case 't': + case 'T': break; +- ++#ifndef QWS + case 'b': + case 'B': moveDockWindow (toolBar, DockBottom); break; + +@@ -132,7 +132,7 @@ + + case 'r': + case 'R': moveDockWindow (toolBar, DockRight); break; +- ++#endif + default: roadmap_log (ROADMAP_FATAL, + "Invalid toolbar orientation %s", orientation); + } diff --git a/packages/zroadmap/zroadmap_1.0.12.bb b/packages/zroadmap/zroadmap_1.0.12.bb new file mode 100644 index 0000000000..727a41664b --- /dev/null +++ b/packages/zroadmap/zroadmap_1.0.12.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ +It displays a map of the streets, tracks the position provided by a NMEA-compliant \ +GPS receiver, identifies the street matching this GPS position and announces the name \ +of the crossing street at the next intersection. A rudimentary trip feature allows \ +RoadMap to display some basic navigation information (distance to the destination, \ +direction, speed, etc..). Voice messages are generated that duplicate some of the screen information." +SECTION = "opie/applications" +PRIORITY = "optional" +AUTHOR = "Pascal Martin " +MAINTAINER = "Michael 'Mickey' Lauer " +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +LICENSE = "GPL" +PR = "r0" + +SRC_URI = "http://www.roadmap.digitalomaha.net/roadmap/roadmap_1_0_12p2_src.tar.gz \ + file://qt2-fixes.patch;pnum=2;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://zroadgps.png" +S = "${WORKDIR}/roadmap-${PV}/src" + +inherit palmtop + +QT_LIBRARY = '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "yes", "qte-mt", "qte",d)}' +QT_LIBRARY_append_c7x0 = " -laticore" + +EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ + GUICFLAGS="-I${OE_QMAKE_INCDIR_QT} -I${S} -DQWS" \ + GUILDFLAGS="-lz -lpng -ljpeg -lts -l${QT_LIBRARY} -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' +PARALLEL_MAKE = "" + +do_configure() { + echo removing pregenerated stuff + find . -name "moc*"|xargs rm -f +} + +do_compile() { + oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a unix/libosroadmap.a + cd qt && oe_runmake +} + +do_install() { + cd qt + install -d ${D}${palmtopdir}/bin + install -d ${D}${palmtopdir}/apps/Applications + install -d ${D}${palmtopdir}/pics + install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap + install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps + install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/ + install -d ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ +} diff --git a/packages/zroadmap/zroadmap_1.0.8.bb b/packages/zroadmap/zroadmap_1.0.8.bb deleted file mode 100644 index 9c041b2f2d..0000000000 --- a/packages/zroadmap/zroadmap_1.0.8.bb +++ /dev/null @@ -1,43 +0,0 @@ -DESCRIPTION = "RoadMap is a program that provides a car navigation for Linux and UNIX. \ -It displays a map of the streets, tracks the position provided by a NMEA-compliant \ -GPS receiver, identifies the street matching this GPS position and announces the name \ -of the crossing street at the next intersection. A rudimentary trip feature allows \ -RoadMap to display some basic navigation information (distance to the destination, \ -direction, speed, etc..). Voice messages are generated that duplicate some of the screen information." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin " -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -MAINTAINER = "Michael 'Mickey' Lauer " -LICENSE = "GPL" -PR = "r2" - -SRC_URI = "http://roadmap.digitalomaha.net/roadmap/roadmap_1_0_8_src.tar.gz \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - file://zroadgps.png" - -S = "${WORKDIR}/roadmap-${PV}/src/qt" - -inherit palmtop - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} \ - GUILDFLAGS="-lz -lpng -ljpeg -lts -lqte -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' -PARALLEL_MAKE = "" - -do_configure() { - rm -rf moc* -} - -do_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -m 0755 qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 ../roadmap.png ${D}${palmtopdir}/pics/zroadmap.png - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 ipkg/*.desktop ${D}${palmtopdir}/apps/ - install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ../sprites ../schema ../preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} -- cgit v1.2.3