From 7bb6e2b9b70ed80ef84d07abe7d467cc88a9fd9c Mon Sep 17 00:00:00 2001 From: Junqian Gordon Xu Date: Sun, 13 Jan 2008 04:44:03 +0000 Subject: roadmap: fix zroadmap, unify with roadmap-gtk2. * roadmap_path.patch: fix hard coded default config/map path * not packing zroadgps icon/desktop as it can be launched in the roadmap (>1.1.0) program --- packages/roadmap/files/roadmap_path.patch | 57 +++++++++++++++++++++++++++++++ packages/roadmap/roadmap-gtk2.inc | 21 +++--------- packages/roadmap/roadmap-gtk2_1.1.0.bb | 3 +- packages/roadmap/roadmap-gtk2_cvs.bb | 3 +- packages/roadmap/roadmap.inc | 12 ++++++- packages/roadmap/zroadmap.inc | 10 ++++++ packages/roadmap/zroadmap_1.1.0.bb | 37 +++----------------- packages/roadmap/zroadmap_cvs.bb | 39 +++------------------ 8 files changed, 95 insertions(+), 87 deletions(-) create mode 100644 packages/roadmap/files/roadmap_path.patch (limited to 'packages') diff --git a/packages/roadmap/files/roadmap_path.patch b/packages/roadmap/files/roadmap_path.patch new file mode 100644 index 0000000000..7a7ab74261 --- /dev/null +++ b/packages/roadmap/files/roadmap_path.patch @@ -0,0 +1,57 @@ +--- src/unix/roadmap_path.c.old 2008-01-12 21:08:03.000000000 -0600 ++++ src/unix/roadmap_path.c 2008-01-12 21:29:40.000000000 -0600 +@@ -93,23 +93,18 @@ static const char *RoadMapPathConfig[] = + "/opt/QtPalmtop/share/roadmap", + "/mnt/cf/QtPalmtop/share/roadmap", + "/mnt/card/QtPalmtop/share/roadmap", +-#else ++#endif + /* This is for standard Unix configurations. */ + "/etc/roadmap", + "/usr/local/share/roadmap", + "/usr/share/roadmap", +-#endif + NULL + }; + static const char *RoadMapPathConfigPreferred = + #ifdef ROADMAP_CONFIG_DIR + ROADMAP_CONFIG_DIR; + #else +-#ifdef QWS +- "/mnt/cf/QtPalmtop/share/roadmap"; +-#else +- "/usr/local/share/roadmap"; +-#endif ++ "/usr/share/roadmap"; + #endif + + +@@ -123,7 +118,7 @@ static const char *RoadMapPathMaps[] = { + "/opt/QtPalmtop/share/roadmap/...", + "/mnt/cf/QtPalmtop/share/roadmap/...", + "/mnt/card/QtPalmtop/share/roadmap/...", +-#else ++#endif + /* This is for standard Unix configurations. */ + "&/maps/...", + "/var/lib/roadmap/...", +@@ -134,19 +129,14 @@ static const char *RoadMapPathMaps[] = { + */ + "/usr/local/share/roadmap/...", + "/usr/share/roadmap/...", +-#endif + NULL + }; + static const char *RoadMapPathMapsPreferred = + #ifdef ROADMAP_MAP_DIR + ROADMAP_MAP_DIR; + #else +-#ifdef QWS +- "/mnt/cf/QtPalmtop/share/roadmap"; +-#else + "/var/lib/roadmap"; + #endif +-#endif + + /* The default path for the icon files (the "icons" path): */ + static const char *RoadMapPathIcons[] = { diff --git a/packages/roadmap/roadmap-gtk2.inc b/packages/roadmap/roadmap-gtk2.inc index f64ad8dbfa..6d0db5099b 100644 --- a/packages/roadmap/roadmap-gtk2.inc +++ b/packages/roadmap/roadmap-gtk2.inc @@ -2,23 +2,10 @@ require roadmap.inc SECTION = "x11/applications" -DEPENDS = "agg expat gtk+" +DEPENDS += "agg gtk+" -EXTRA_OEMAKE= "DESKTOP=GTK2 AGG=rgb565 \ - POPT=NO SCRIPTS= BUILD= \ - INSTALLDIR=/usr DESTDIR=${D}" +EXTRA_OEMAKE = "DESKTOP=GTK2 AGG=rgb565 \ + POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \ + desktopdir=${D}${datadir}/applications" CFLAGS += " -I${STAGING_INCDIR}/agg2 " - -do_compile() { - oe_runmake runtime $(TOOLS) icons -} - -do_install() { - oe_runmake install - mv ${D}/usr/applications ${D}/usr/share/ - - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ -} - -FILES_${PN} += "${datadir}/roadmap" diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb index 5855413cbe..1e34238106 100644 --- a/packages/roadmap/roadmap-gtk2_1.1.0.bb +++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb @@ -1,10 +1,11 @@ require roadmap-gtk2.inc -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://cross.patch;patch=1;pnum=2 \ file://options.mk.patch;patch=1;pnum=2 \ + file://roadmap_path.patch;patch=1 \ file://roadmap.desktop.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz " diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index 2efa67821a..9d7adbaa3e 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,11 +1,12 @@ require roadmap-gtk2.inc PV = "0.0+cvs${SRCDATE}" -PR = "r0" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ file://options.mk.patch;patch=1;pnum=2 \ + file://roadmap_path.patch;patch=1 \ http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz " S = "${WORKDIR}/roadmap/src" diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc index e9598df178..43b4b1cd3d 100644 --- a/packages/roadmap/roadmap.inc +++ b/packages/roadmap/roadmap.inc @@ -4,5 +4,15 @@ AUTHOR = "Pascal Martin " HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" LICENSE = "GPL" RRECOMMENDS = "gpsd flite" +DEPENDS = "expat" -PARALLEL_MAKE = "" +FILES_${PN} += "${datadir}/roadmap" + +do_compile() { + oe_runmake runtime ${TOOLS} icons +} + +do_install() { + oe_runmake install + install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ +} diff --git a/packages/roadmap/zroadmap.inc b/packages/roadmap/zroadmap.inc index acee708837..3c99f9d234 100644 --- a/packages/roadmap/zroadmap.inc +++ b/packages/roadmap/zroadmap.inc @@ -1,5 +1,7 @@ require roadmap.inc +PARALLEL_MAKE = "" + SECTION = "opie/applications" inherit palmtop @@ -7,7 +9,15 @@ 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} \ + POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \ + icondir=${D}${palmtopdir}/pics \ + desktopdir=${D}${palmtopdir}/apps/Applications \ + CFLAGS="-DQWS -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}"" + do_configure() { echo removing pregenerated stuff find . -name "moc*"|xargs rm -f } + diff --git a/packages/roadmap/zroadmap_1.1.0.bb b/packages/roadmap/zroadmap_1.1.0.bb index bafcc7c27d..b06e4e7ad0 100644 --- a/packages/roadmap/zroadmap_1.1.0.bb +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -1,45 +1,16 @@ require zroadmap.inc -DEPENDS = "expat" -PR = "r1" +PR = "r2" SRC_URI = "${SOURCEFORGE_MIRROR}/roadmap/roadmap-${PV}-src.tar.gz \ file://cross.patch;patch=1;pnum=2 \ + file://options.mk.patch;patch=1;pnum=2 \ file://qt/qt2-fixes.patch;patch=1 \ file://qt/qt_canvas.patch;patch=1 \ file://qt/qt_main.patch;patch=1 \ file://qt/roadmap_main.patch;patch=1 \ + file://roadmap_path.patch;patch=1 \ file://roadmap.desktop.patch;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ - file://zroadgps.png" + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz" S = "${WORKDIR}/roadmap-${PV}/src" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} POPT=NO \ - CFLAGS="-DQWS -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}" ' - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a - oe_runmake -C gpx libgpx.a - oe_runmake -C unix libosroadmap.a - oe_runmake -C qt qtroadmap qtroadgps -} - -do_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -d ${D}${palmtopdir}/share/roadmap - - install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - - install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - - install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - - install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb index cb81756041..383ffe8f69 100644 --- a/packages/roadmap/zroadmap_cvs.bb +++ b/packages/roadmap/zroadmap_cvs.bb @@ -1,42 +1,13 @@ require zroadmap.inc -DEPENDS = "expat" -PV = "1.1.0+cvs${SRCDATE}" -PR = "r1" +PV = "0.0+cvs${SRCDATE}" +PR = "r0" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ + file://options.mk.patch;patch=1;pnum=2 \ file://qt/qt2-fixes.patch;patch=1 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz \ - file://zroadgps.png" + file://roadmap_path.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz" S = "${WORKDIR}/roadmap/src" - -EXTRA_OEMAKE = 'DESKTOP=QPE MOC=${OE_QMAKE_MOC} UIC=${OE_QMAKE_UIC} QTDIR=${QTDIR} \ - 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}" ' - -do_compile() { - oe_runmake libguiroadmap.a libguiroadgps.a libroadmap.a - oe_runmake -C gpx libgpx.a - oe_runmake -C unix libosroadmap.a - oe_runmake -C qt qtroadmap qtroadgps -} - -do_install() { - install -d ${D}${palmtopdir}/bin - install -d ${D}${palmtopdir}/apps/Applications - install -d ${D}${palmtopdir}/pics - install -d ${D}${palmtopdir}/share/roadmap - - install -m 0755 qt/qtroadmap ${D}${palmtopdir}/bin/roadmap - install -m 0755 qt/qtroadgps ${D}${palmtopdir}/bin/roadgps - - install -m 0644 icons/*.png ${D}${palmtopdir}/pics/ - install -m 0644 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png - - install -m 0644 *.desktop ${D}${palmtopdir}/apps/Applications/ - - install -m 0644 sprites preferences ${D}${palmtopdir}/share/roadmap/ - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${palmtopdir}/share/roadmap/ -} -- cgit v1.2.3