diff options
| -rw-r--r-- | packages/zroadmap/files/qt2-fixes.patch | 25 | ||||
| -rw-r--r-- | packages/zroadmap/zroadmap_1.0.12.bb (renamed from packages/zroadmap/zroadmap_1.0.8.bb) | 25 |
2 files changed, 43 insertions, 7 deletions
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.8.bb b/packages/zroadmap/zroadmap_1.0.12.bb index 9c041b2f2d..727a41664b 100644 --- a/packages/zroadmap/zroadmap_1.0.8.bb +++ b/packages/zroadmap/zroadmap_1.0.12.bb @@ -7,28 +7,39 @@ direction, speed, etc..). Voice messages are generated that duplicate some of th SECTION = "opie/applications" PRIORITY = "optional" AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" LICENSE = "GPL" -PR = "r2" +PR = "r0" -SRC_URI = "http://roadmap.digitalomaha.net/roadmap/roadmap_1_0_8_src.tar.gz \ +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/qt" +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} \ - GUILDFLAGS="-lz -lpng -ljpeg -lts -lqte -lqpe -Wl,-rpath-link,${STAGING_LIBDIR} -L${STAGING_LIBDIR} -L${QTDIR}/lib"' + 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() { - rm -rf moc* + 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 |