diff options
author | Michael Lauer <mickey@vanille-media.de> | 2006-07-03 23:01:15 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-03 23:01:15 +0000 |
commit | 3fd6cbd2ee79c56c94ead0f370ac1c49e033c429 (patch) | |
tree | d65faa8f944ce73666eba8e096d2ed9c12e3eb11 /packages | |
parent | 0dd3fdbe060a948e8093487bc562da9c73a1b80b (diff) |
zroadmap: add cvs version. add patch to overcome questionable handcrafted Makefiles
Diffstat (limited to 'packages')
-rw-r--r-- | packages/zroadmap/files/qt2-fixes-r1.patch | 44 | ||||
-rw-r--r-- | packages/zroadmap/zroadmap_cvs.bb | 55 |
2 files changed, 99 insertions, 0 deletions
diff --git a/packages/zroadmap/files/qt2-fixes-r1.patch b/packages/zroadmap/files/qt2-fixes-r1.patch new file mode 100644 index 0000000000..a17fefe869 --- /dev/null +++ b/packages/zroadmap/files/qt2-fixes-r1.patch @@ -0,0 +1,44 @@ + +# +# Signed off by Michael 'Mickey' Lauer <mickey@Vanille.de> +# + +--- src/qt/qt_main.cc~qt2-fixes.patch ++++ src/qt/qt_main.cc +@@ -136,7 +136,7 @@ + switch (orientation[0]) { + case 't': + case 'T': break; +- ++#ifndef QWS + case 'b': + case 'B': moveDockWindow (toolBar, DockBottom); break; + +@@ -145,7 +145,7 @@ + + case 'r': + case 'R': moveDockWindow (toolBar, DockRight); break; +- ++#endif + default: roadmap_log (ROADMAP_FATAL, + "Invalid toolbar orientation %s", orientation); + } +--- src/qt/Makefile~qt2-fixes.patch ++++ src/qt/Makefile +@@ -11,14 +11,9 @@ + + # --- QT-specific options ------------------------------------------------ + +-CFLAGS += -I$(QTDIR)/include -I/usr/include/qt3 -I/usr/local/include/qt3 +-CFLAGS += -fno-rtti -fno-exceptions +-LIBS += -L$(QTDIR)/lib -lqt-mt +- +- + ifeq ($(DESKTOP),QPE) +- CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ CFLAGS += -I$(QTDIR)/include -DQWS ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif + diff --git a/packages/zroadmap/zroadmap_cvs.bb b/packages/zroadmap/zroadmap_cvs.bb new file mode 100644 index 0000000000..23bd5d15e5 --- /dev/null +++ b/packages/zroadmap/zroadmap_cvs.bb @@ -0,0 +1,55 @@ +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>" +MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>" +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +DEPENDS = "popt" +LICENSE = "GPL" +PV = "1.0.12+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://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 -I${S} ${OE_QMAKE_CXXFLAGS} -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 + 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 -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 ${WORKDIR}/zroadgps.png ${D}${palmtopdir}/pics/zroadgps.png + install -m 0644 qt/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/ +} |