diff options
| author | Junqian Gordon Xu <xjqian@gmail.com> | 2007-12-13 09:58:00 +0000 |
|---|---|---|
| committer | Junqian Gordon Xu <xjqian@gmail.com> | 2007-12-13 09:58:00 +0000 |
| commit | ec163abdb68da4938ee7ee153995fc680100a2b5 (patch) | |
| tree | df72b225feeb6e1635a29d1818bb36391e3f8173 /packages/roadmap/zroadmap_cvs.bb | |
| parent | f637b5e883b11a5c5ab68758f8f75437ac8d5780 (diff) | |
roadmap: 1st round of updating roadmap recipies after moving zroadmap over to roadmap
* refactor, unify. roadmap.inc (global), zroadmap.in (qt global)
* add common qt patches >= 1.1.0 to files/qt
* add zroadmap_1.1.0.bb, update zroadmap_cvs.bb (set temp local SRCDATE)
* config: remove popt (used for building maps) from DEPEND in *.bb
* config: s/OE_QMAKE_CXXFLAG/OE_QMAKE_CFLAG in zroadmap 1.1.0 and cvs
* install: add missing icons to *.bb
* many small changes
** next round of updates will make gtk2 version of roadmap kosher
Diffstat (limited to 'packages/roadmap/zroadmap_cvs.bb')
| -rw-r--r-- | packages/roadmap/zroadmap_cvs.bb | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb index fd9cc5e95f..5b39faf071 100644 --- a/packages/roadmap/zroadmap_cvs.bb +++ b/packages/roadmap/zroadmap_cvs.bb @@ -1,36 +1,24 @@ -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." -SECTION = "opie/applications" -PRIORITY = "optional" -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat" -LICENSE = "GPL" -PV = "1.0.12+cvs-${SRCDATE}" +require zroadmap.inc + +DEPENDS += "expat" +SRCDATE = "20071212" +PV = "1.1.0+cvs-${SRCDATE}" PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ - file://qt2-fixes-r1.patch;pnum=1;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ + file://cross.patch;patch=1;pnum=2 \ + file://qt/qt2-fixes.patch;patch=1 \ + file://qt/qt_canvas.patch;patch=1 \ +#upstream file://qt/qt_main.patch;patch=1 \ + file://qt/roadmap_main.patch;patch=1 \ +#upstream file://qt/roadmap.desktop.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ file://zroadgps.png" S = "${WORKDIR}/roadmap/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} QTDIR=${QTDIR} \ - CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CXXFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ + CFLAGS="-DQWS -DQT_NO_ROTATE -I${S} ${OE_QMAKE_CFLAGS} -I${OE_QMAKE_INCDIR_QT}" \ LDFLAGS="${OE_QMAKE_LDFLAGS} -L${OE_QMAKE_LIBDIR_QT} -Wl,-rpath-link,${OE_QMAKE_LIBDIR_QT}" ' -PARALLEL_MAKE = "" - -do_configure() { - echo removing pregenerated stuff - find . -name "moc*"|xargs rm -f -} do_compile() { oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a @@ -45,10 +33,10 @@ do_install() { install -d ${D}${palmtopdir}/pics install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - install -m 0644 roadmap.png ${D}${palmtopdir}/pics/zroadmap.png + install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - install -m 0644 qt/ipkg/*.desktop ${D}${palmtopdir}/apps/Applications/ + install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ install -d ${D}${palmtopdir}/share/roadmap/ - install -m 0644 sprites schema preferences ${D}${palmtopdir}/share/roadmap/ + install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ } |