From 709c4d66e0b107ca606941b988bad717c0b45d9b Mon Sep 17 00:00:00 2001 From: Denys Dmytriyenko Date: Tue, 17 Mar 2009 14:32:59 -0400 Subject: rename packages/ to recipes/ per earlier agreement See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko Acked-by: Mike Westerhof Acked-by: Philip Balister Acked-by: Khem Raj Acked-by: Marcin Juszkiewicz Acked-by: Koen Kooi Acked-by: Frans Meulenbroeks --- recipes/roadmap/files/cross.patch | 17 ++++++++ recipes/roadmap/files/options.mk.patch | 34 ++++++++++++++++ recipes/roadmap/files/qt/qt2-fixes.patch | 10 +++++ recipes/roadmap/files/qt/qt_canvas.patch | 20 +++++++++ recipes/roadmap/files/qt/qt_main.patch | 61 ++++++++++++++++++++++++++++ recipes/roadmap/files/qt/roadmap_main.patch | 16 ++++++++ recipes/roadmap/files/roadmap.desktop.patch | 16 ++++++++ recipes/roadmap/files/roadmap_path.patch | 57 ++++++++++++++++++++++++++ recipes/roadmap/files/zroadgps.png | Bin 0 -> 1949 bytes 9 files changed, 231 insertions(+) create mode 100644 recipes/roadmap/files/cross.patch create mode 100644 recipes/roadmap/files/options.mk.patch create mode 100644 recipes/roadmap/files/qt/qt2-fixes.patch create mode 100644 recipes/roadmap/files/qt/qt_canvas.patch create mode 100644 recipes/roadmap/files/qt/qt_main.patch create mode 100644 recipes/roadmap/files/qt/roadmap_main.patch create mode 100644 recipes/roadmap/files/roadmap.desktop.patch create mode 100644 recipes/roadmap/files/roadmap_path.patch create mode 100644 recipes/roadmap/files/zroadgps.png (limited to 'recipes/roadmap/files') diff --git a/recipes/roadmap/files/cross.patch b/recipes/roadmap/files/cross.patch new file mode 100644 index 0000000000..87c8d7894b --- /dev/null +++ b/recipes/roadmap/files/cross.patch @@ -0,0 +1,17 @@ +--- /tmp/options.mk 2007-08-08 12:14:11.000000000 +0200 ++++ roadmap/src/options.mk 2007-08-08 12:14:35.688400000 +0200 +@@ -26,13 +26,7 @@ + + # if you want to cross-compile, define CROSS in config.mk. you + # may also have to add paths to libraries (with -L) in LDFLAGS. +-CC = $(CROSS)gcc +-CXX = $(CROSS)g++ +-AS = $(CROSS)as +-AR = $(CROSS)ar +-LD = $(CROSS)ld +-STRIP = $(CROSS)strip +-RANLIB = $(CROSS)ranlib ++STRIP = echo + + + # --- Build options ------------------------------------------------ diff --git a/recipes/roadmap/files/options.mk.patch b/recipes/roadmap/files/options.mk.patch new file mode 100644 index 0000000000..196f16e31d --- /dev/null +++ b/recipes/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/recipes/roadmap/files/qt/qt2-fixes.patch b/recipes/roadmap/files/qt/qt2-fixes.patch new file mode 100644 index 0000000000..63c1c96e53 --- /dev/null +++ b/recipes/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/recipes/roadmap/files/qt/qt_canvas.patch b/recipes/roadmap/files/qt/qt_canvas.patch new file mode 100644 index 0000000000..13c775c8cb --- /dev/null +++ b/recipes/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/recipes/roadmap/files/qt/qt_main.patch b/recipes/roadmap/files/qt/qt_main.patch new file mode 100644 index 0000000000..2f81128b34 --- /dev/null +++ b/recipes/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 + #include + #include ++#include + #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/recipes/roadmap/files/qt/roadmap_main.patch b/recipes/roadmap/files/qt/roadmap_main.patch new file mode 100644 index 0000000000..7b16ce28fc --- /dev/null +++ b/recipes/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/recipes/roadmap/files/roadmap.desktop.patch b/recipes/roadmap/files/roadmap.desktop.patch new file mode 100644 index 0000000000..98d5b06130 --- /dev/null +++ b/recipes/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/recipes/roadmap/files/roadmap_path.patch b/recipes/roadmap/files/roadmap_path.patch new file mode 100644 index 0000000000..7a7ab74261 --- /dev/null +++ b/recipes/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/recipes/roadmap/files/zroadgps.png b/recipes/roadmap/files/zroadgps.png new file mode 100644 index 0000000000..a77b3729b7 Binary files /dev/null and b/recipes/roadmap/files/zroadgps.png differ -- cgit 1.2.3-korg