diff options
author | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-31 21:24:36 +0000 |
---|---|---|
committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2008-01-31 21:24:36 +0000 |
commit | b20edcd38445574cbdd667d5e82fb59572e4cab2 (patch) | |
tree | 5a52d1265144694e035f2087d0495c83b69f5c9a /packages/roadmap | |
parent | 64529f883fb70f97a28cb8fe082fb7b357d509d9 (diff) | |
parent | d8918d114e1286ff97435a543b65d270e79a0f92 (diff) |
merge of '4ea5971c2dd26e9c357b906128f0e339d80e3d50'
and 'e651c4fa9a5d1fc6120cc2309e9cba1388cecc52'
Diffstat (limited to 'packages/roadmap')
-rw-r--r-- | packages/roadmap/files/options.mk.patch | 34 | ||||
-rw-r--r-- | packages/roadmap/files/qt/.mtn2git_empty | 0 | ||||
-rw-r--r-- | packages/roadmap/files/qt/qt2-fixes.patch | 10 | ||||
-rw-r--r-- | packages/roadmap/files/qt/qt_canvas.patch | 20 | ||||
-rw-r--r-- | packages/roadmap/files/qt/qt_main.patch | 61 | ||||
-rw-r--r-- | packages/roadmap/files/qt/roadmap_main.patch | 16 | ||||
-rw-r--r-- | packages/roadmap/files/roadmap.desktop.patch | 16 | ||||
-rw-r--r-- | packages/roadmap/files/roadmap_path.patch | 57 | ||||
-rw-r--r-- | packages/roadmap/files/zroadgps.png | bin | 0 -> 1949 bytes | |||
-rw-r--r-- | packages/roadmap/roadmap-gtk2.inc | 11 | ||||
-rw-r--r-- | packages/roadmap/roadmap-gtk2_1.1.0.bb | 12 | ||||
-rw-r--r-- | packages/roadmap/roadmap-gtk2_cvs.bb | 45 | ||||
-rw-r--r-- | packages/roadmap/roadmap.inc | 18 | ||||
-rw-r--r-- | packages/roadmap/zroadmap.inc | 23 | ||||
-rw-r--r-- | packages/roadmap/zroadmap_1.1.0.bb | 16 | ||||
-rw-r--r-- | packages/roadmap/zroadmap_cvs.bb | 13 |
16 files changed, 314 insertions, 38 deletions
diff --git a/packages/roadmap/files/options.mk.patch b/packages/roadmap/files/options.mk.patch new file mode 100644 index 0000000000..196f16e31d --- /dev/null +++ b/packages/roadmap/files/options.mk.patch @@ -0,0 +1,34 @@ +--- roadmap-1.1.0/src/options.mk.old 2008-01-09 22:08:00.000000000 -0600 ++++ roadmap-1.1.0/src/options.mk 2008-01-09 23:06:29.000000000 -0600 +@@ -177,10 +177,7 @@ ifeq ($(strip $(AGG)),NO) + else + LIBS += -laggfontfreetype -lagg -lfreetype + CFLAGS += -DAGG_PIXFMT=pixfmt_$(AGG) \ +- -I$(TOP)/agg_support \ +- -I/usr/include/agg2 \ +- -I/usr/local/include/agg2 \ +- -I/usr/include/freetype2 ++ -I$(TOP)/agg_support + CANVAS_OBJS = roadmap_canvas_agg.o \ + $(TOP)/agg_support/roadmap_canvas.o + endif +@@ -188,7 +185,7 @@ endif + # bidirectional text lib + ifneq ($(strip $(BIDI)),NO) + LIBS += -lfribidi +- CFLAGS += -DUSE_FRIBIDI -I/usr/include/fribidi ++ CFLAGS += -DUSE_FRIBIDI + endif + + # RoadMap internal profiling +@@ -205,8 +202,8 @@ else + endif + + +-CFLAGS += -I$(TOP) -I/usr/local/include -DNDEBUG ++CFLAGS += -I$(TOP) -DNDEBUG + +-LIBS := -L/usr/local/lib $(LIBS) -lm ++LIBS := $(LIBS) -lm + + CXXFLAGS = $(CFLAGS) diff --git a/packages/roadmap/files/qt/.mtn2git_empty b/packages/roadmap/files/qt/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/roadmap/files/qt/.mtn2git_empty diff --git a/packages/roadmap/files/qt/qt2-fixes.patch b/packages/roadmap/files/qt/qt2-fixes.patch new file mode 100644 index 0000000000..63c1c96e53 --- /dev/null +++ b/packages/roadmap/files/qt/qt2-fixes.patch @@ -0,0 +1,10 @@ +--- src/qt/Makefile~qt2-fixes.patch ++++ src/qt/Makefile +@@ -19,7 +19,7 @@ + + ifeq ($(DESKTOP),QPE) + CFLAGS += -I$(QTDIR)/include -DQWS +- LIBS += -lqte -lqpe ++ LIBS += -lqpe + INSTALLDIR=$(QTDIR) + endif diff --git a/packages/roadmap/files/qt/qt_canvas.patch b/packages/roadmap/files/qt/qt_canvas.patch new file mode 100644 index 0000000000..13c775c8cb --- /dev/null +++ b/packages/roadmap/files/qt/qt_canvas.patch @@ -0,0 +1,20 @@ +--- src/qt/qt_canvas.cc.old 2007-12-08 20:29:52.000000000 -0600 ++++ src/qt/qt_canvas.cc 2007-12-13 02:34:22.000000000 -0600 +@@ -122,7 +122,7 @@ void RMapCanvas::getTextExtents(const ch + *w = r.width(); + *ascent = fm.ascent(); + *descent = fm.descent(); +-#ifdef QT_NO_ROTATE ++#ifdef QT_NO_TRANSFORMATIONS + if (can_tilt) *can_tilt = 0; + #else + if (can_tilt) *can_tilt = 1; +@@ -169,7 +169,7 @@ void RMapCanvas::drawString(RoadMapGuiPo + + void RMapCanvas::drawStringAngle(RoadMapGuiPoint* position, + int center, const char* text, int angle) { +-#ifndef QT_NO_ROTATE ++#ifndef QT_NO_TRANSFORMATIONS + if (!pixmap) { + return; + } diff --git a/packages/roadmap/files/qt/qt_main.patch b/packages/roadmap/files/qt/qt_main.patch new file mode 100644 index 0000000000..2f81128b34 --- /dev/null +++ b/packages/roadmap/files/qt/qt_main.patch @@ -0,0 +1,61 @@ +--- src/qt/qt_main.cc.old 2007-12-08 20:32:34.000000000 -0600 ++++ src/qt/qt_main.cc 2007-12-08 20:34:38.000000000 -0600 +@@ -27,6 +27,7 @@ + #include <signal.h> + #include <sys/types.h> + #include <sys/socket.h> ++#include <unistd.h> + #include "qt_main.h" + + static int signalFd[2]; +@@ -168,12 +169,6 @@ void RMapMainWindow::addTool(const char* + const char* tip, + RoadMapCallback callback) { + +-#ifndef QWS +- // For some unknown reason, this toolbar crashes RoadMap +- // on the Sharp Zaurus. +- // This should be fixed and the ifndef removed. +- // Pascal: I believe this has been fixed now. +- + if (toolBar == 0) { + addToolbar(""); + } +@@ -193,20 +188,13 @@ void RMapMainWindow::addTool(const char* + + connect(b, SIGNAL(clicked()), cb, SLOT(fire())); + } +-#endif + } + + void RMapMainWindow::addToolSpace(void) { + +-#ifndef QWS +- // For some unknown reason, this toolbar crashes RoadMap +- // on the Sharp Zaurus. This should be fixed and the ifndef +- // removed. +- + addTool (NULL, NULL, NULL, NULL); + + toolBar->addSeparator(); +-#endif + } + + +@@ -299,14 +287,14 @@ void RMapMainWindow::closeEvent(QCloseEv + + void RMapMainWindow::signalHandler(int sig) + { +- ::write(signalFd[0], &sig, sizeof(sig)); ++ write(signalFd[0], &sig, sizeof(sig)); + } + + void RMapMainWindow::handleSignal() + { + snSignal->setEnabled(false); + int tmp; +- ::read(signalFd[1], &tmp, sizeof(tmp)); ++ read(signalFd[1], &tmp, sizeof(tmp)); + QString action; + switch (tmp) { + case SIGTERM: action="SIGTERM"; break; diff --git a/packages/roadmap/files/qt/roadmap_main.patch b/packages/roadmap/files/qt/roadmap_main.patch new file mode 100644 index 0000000000..7b16ce28fc --- /dev/null +++ b/packages/roadmap/files/qt/roadmap_main.patch @@ -0,0 +1,16 @@ +--- src/qt/roadmap_main.cc.old 2007-12-08 15:47:05.000000000 -0600 ++++ src/qt/roadmap_main.cc 2007-12-07 20:39:15.000000000 -0600 +@@ -195,11 +195,11 @@ void roadmap_main_set_cursor (int newcur + break; + + case ROADMAP_CURSOR_WAIT: +- mainWindow->setCursor (QCursor(Qt::WaitCursor)); ++ mainWindow->setCursor (QCursor(Qt::waitCursor)); + break; + + case ROADMAP_CURSOR_CROSS: +- mainWindow->setCursor (QCursor(Qt::CrossCursor)); ++ mainWindow->setCursor (QCursor(Qt::crossCursor)); + break; + } + } diff --git a/packages/roadmap/files/roadmap.desktop.patch b/packages/roadmap/files/roadmap.desktop.patch new file mode 100644 index 0000000000..98d5b06130 --- /dev/null +++ b/packages/roadmap/files/roadmap.desktop.patch @@ -0,0 +1,16 @@ +--- src/roadmap.desktop.old 2007-12-08 23:15:45.000000000 -0600 ++++ src/roadmap.desktop 2007-12-08 23:17:48.000000000 -0600 +@@ -1,11 +1,8 @@ + [Desktop Entry] +-Comment=RoadMap + Comment=Car Navigation System + Exec=roadmap +-Icon=roadmap.png ++Icon=roadmap + Type=Application + Name=RoadMap + GenericName=Map Viewer +-Categories=Application;Other;VectorGraphics;Graphics;Viewer;GTK; +-FilePattern=*roadmap;*.rdm +- ++Categories=VectorGraphics;Graphics;Viewer;GTK; 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/files/zroadgps.png b/packages/roadmap/files/zroadgps.png Binary files differnew file mode 100644 index 0000000000..a77b3729b7 --- /dev/null +++ b/packages/roadmap/files/zroadgps.png diff --git a/packages/roadmap/roadmap-gtk2.inc b/packages/roadmap/roadmap-gtk2.inc new file mode 100644 index 0000000000..6d0db5099b --- /dev/null +++ b/packages/roadmap/roadmap-gtk2.inc @@ -0,0 +1,11 @@ +require roadmap.inc + +SECTION = "x11/applications" + +DEPENDS += "agg gtk+" + +EXTRA_OEMAKE = "DESKTOP=GTK2 AGG=rgb565 \ + POPT=NO SCRIPTS= BUILD= INSTALLDIR=/usr DESTDIR=${D} \ + desktopdir=${D}${datadir}/applications" + +CFLAGS += " -I${STAGING_INCDIR}/agg2 " diff --git a/packages/roadmap/roadmap-gtk2_1.1.0.bb b/packages/roadmap/roadmap-gtk2_1.1.0.bb new file mode 100644 index 0000000000..1e34238106 --- /dev/null +++ b/packages/roadmap/roadmap-gtk2_1.1.0.bb @@ -0,0 +1,12 @@ +require roadmap-gtk2.inc + +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 " + +S = "${WORKDIR}/roadmap-${PV}/src" diff --git a/packages/roadmap/roadmap-gtk2_cvs.bb b/packages/roadmap/roadmap-gtk2_cvs.bb index cb81a44ae8..9d7adbaa3e 100644 --- a/packages/roadmap/roadmap-gtk2_cvs.bb +++ b/packages/roadmap/roadmap-gtk2_cvs.bb @@ -1,44 +1,13 @@ -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." -AUTHOR = "Pascal Martin <pascal.martin@iname.com>" -HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" -DEPENDS = "popt expat gtk+" -LICENSE = "GPL" -PV = "1.0.12+cvs${SRCDATE}" -PR = "r0" +require roadmap-gtk2.inc + +PV = "0.0+cvs${SRCDATE}" +PR = "r1" SRC_URI = "cvs://anonymous:@roadmap.cvs.sf.net/cvsroot/roadmap;module=roadmap \ file://cross.patch;patch=1;pnum=2 \ - http://roadmap.digitalomaha.net/maps/usdir.rdm.tgz \ - " + 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" -PARALLEL_MAKE = "" -CFLAGS += " -I${S} " - - -do_compile() { - oe_runmake - oe_runmake gtk2 -} - -do_install() { - install -d ${D}${bindir} - install -d ${D}${datadir}/applications - install -d ${D}${datadir}/pixmaps - install -d ${D}${datadir}/roadmap - - install -m 0755 gtk2/gtkroad* ${D}${bindir} - - install -m 0644 icons/*png ${D}${datadir}/pixmaps - - install -m 0644 sprites preferences ${D}${datadir}/roadmap - install -m 0644 ${WORKDIR}/usdir.rdm ${D}${datadir}/roadmap/ -} - - -FILES_${PN} += "${datadir}/roadmap" - diff --git a/packages/roadmap/roadmap.inc b/packages/roadmap/roadmap.inc new file mode 100644 index 0000000000..43b4b1cd3d --- /dev/null +++ b/packages/roadmap/roadmap.inc @@ -0,0 +1,18 @@ +DESCRIPTION = "RoadMap is a program that provides car navigation for Linux and UNIX." +PRIORITY = "optional" +AUTHOR = "Pascal Martin <pascal.martin@iname.com>" +HOMEPAGE = "http://roadmap.digitalomaha.net/maps.html" +LICENSE = "GPL" +RRECOMMENDS = "gpsd flite" +DEPENDS = "expat" + +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 new file mode 100644 index 0000000000..3c99f9d234 --- /dev/null +++ b/packages/roadmap/zroadmap.inc @@ -0,0 +1,23 @@ +require roadmap.inc + +PARALLEL_MAKE = "" + +SECTION = "opie/applications" + +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 new file mode 100644 index 0000000000..b06e4e7ad0 --- /dev/null +++ b/packages/roadmap/zroadmap_1.1.0.bb @@ -0,0 +1,16 @@ +require zroadmap.inc + +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" + +S = "${WORKDIR}/roadmap-${PV}/src" diff --git a/packages/roadmap/zroadmap_cvs.bb b/packages/roadmap/zroadmap_cvs.bb new file mode 100644 index 0000000000..383ffe8f69 --- /dev/null +++ b/packages/roadmap/zroadmap_cvs.bb @@ -0,0 +1,13 @@ +require zroadmap.inc + +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 \ + file://roadmap_path.patch;patch=1 \ + http://roadmap.digitalomaha.net/maps/usdir.rdm.tar.gz" + +S = "${WORKDIR}/roadmap/src" |