diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2012-06-23 21:15:33 +0000 |
|---|---|---|
| committer |   Koen Kooi <koen@dominion.thruhere.net> | 2012-06-25 09:06:42 +0200 |
| commit | ba3173c5abeedb57409c0448b450d4bc30690188 (patch) | |
| tree | 2fd186448c90eec8d6ef55b56f031b13a65b3311 /meta-oe/recipes-navigation | |
| parent | b1352f93b8acbd46d6a8e0bec08736c0b25cfdcb (diff) | |
| download | meta-openembedded-ba3173c5abeedb57409c0448b450d4bc30690188.tar.gz | |
navit: bump SRCREV and add patch from debian to fix build with gcc-4.7.1
* COPYING was updated in
http://navit.svn.sourceforge.net/viewvc/navit/trunk/navit/COPYING?r1=5023&r2=5022&pathrev=5023
just 2 more files listed in GPLv2, rest is in LGPL
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-oe/recipes-navigation')
3 files changed, 81 insertions, 3 deletions
diff --git a/meta-oe/recipes-navigation/navit/navit.inc b/meta-oe/recipes-navigation/navit/navit.inc index b2b89e52dd..dc2370b63f 100644 --- a/meta-oe/recipes-navigation/navit/navit.inc +++ b/meta-oe/recipes-navigation/navit/navit.inc @@ -1,6 +1,6 @@ DESCRIPTION = "Navit is a car navigation system with routing engine." LICENSE = "GPLv2 LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=a4c51733b63d82df87995454bdc4b654 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=ed539d099d6ce08de6ea0dfed9ecb333 \ file://LGPL-2;md5=3214f080875748938ba060314b4f727d \ file://GPL-2;md5=751419260aa954499f7abaabaa882bbe \ " diff --git a/meta-oe/recipes-navigation/navit/navit/taking-address-of-temporary-array.patch b/meta-oe/recipes-navigation/navit/navit/taking-address-of-temporary-array.patch new file mode 100644 index 0000000000..8d3a4161a9 --- /dev/null +++ b/meta-oe/recipes-navigation/navit/navit/taking-address-of-temporary-array.patch @@ -0,0 +1,76 @@ +Upstream-Status: Pending + +Description: Fix g++ error "taking address of temporary array" +Author: Gilles Filippini <pini@debian.org> +Forwarded: no +Bug-Debian: http://bugs.debian.org/676006 +Last-Update: 2012-06-05 +Index: navit/navit/graphics/qt_qpainter/RenderArea.cpp +=================================================================== +--- navit.orig/navit/graphics/qt_qpainter/RenderArea.cpp 2012-06-05 23:16:42.000000000 +0200 ++++ navit/navit/graphics/qt_qpainter/RenderArea.cpp 2012-06-05 23:15:47.000000000 +0200 +@@ -239,13 +239,14 @@ + #else + const char *text=str.toUtf8().constData(); + #endif ++ char text1[2] = { '\0', '\0' }; + dbg(0,"enter text='%s' 0x%x (%d) key=%d\n", text, text[0], strlen(text), event->key()); + if (!text || !text[0] || text[0] == 0x7f) { + dbg(0,"special key\n"); + switch (event->key()) { + case 4099: + { +- text=(char []){NAVIT_KEY_BACKSPACE,'\0'}; ++ text1[0] = NAVIT_KEY_BACKSPACE; + } + break; + case 4101: +@@ -253,7 +254,7 @@ + QT_QPAINTER_CUSTOM_RETURN + #endif + { +- text=(char []){NAVIT_KEY_RETURN,'\0'}; ++ text1[0] = NAVIT_KEY_RETURN; + } + break; + case 4114: +@@ -261,7 +262,7 @@ + QT_QPAINTER_CUSTOM_LEFT + #endif + { +- text=(char []){NAVIT_KEY_LEFT,'\0'}; ++ text1[0] = NAVIT_KEY_LEFT; + } + break; + case 4115: +@@ -269,7 +270,7 @@ + QT_QPAINTER_CUSTOM_UP + #endif + { +- text=(char []){NAVIT_KEY_UP,'\0'}; ++ text1[0] = NAVIT_KEY_UP; + } + break; + case 4116: +@@ -277,7 +278,7 @@ + QT_QPAINTER_CUSTOM_RIGHT + #endif + { +- text=(char []){NAVIT_KEY_RIGHT,'\0'}; ++ text1[0] = NAVIT_KEY_RIGHT; + } + break; + case 4117: +@@ -285,10 +286,11 @@ + QT_QPAINTER_CUSTOM_DOWN + #endif + { +- text=(char []){NAVIT_KEY_DOWN,'\0'}; ++ text1[0] = NAVIT_KEY_DOWN; + } + break; + } ++ if (text1[0]) text = text1; + } + callback_list_call_attr_1(this->cbl, attr_keypress, (void *)text); + event->accept(); diff --git a/meta-oe/recipes-navigation/navit/navit_svn.bb b/meta-oe/recipes-navigation/navit/navit_svn.bb index 6d0b152cc2..b3057b53eb 100644 --- a/meta-oe/recipes-navigation/navit/navit_svn.bb +++ b/meta-oe/recipes-navigation/navit/navit_svn.bb @@ -1,8 +1,10 @@ require navit.inc -SRCREV = "4841" +SRCREV = "5159" PV = "0.2.0+svnr${SRCPV}" PR = "${INC_PR}.2" S = "${WORKDIR}/${PN}" -SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=http " +SRC_URI += "svn://anonymous@navit.svn.sourceforge.net/svnroot/navit/trunk;module=navit;proto=http \ + file://taking-address-of-temporary-array.patch \ +" |