summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-navigation
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-07-21 14:42:42 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2011-07-21 21:10:46 +0200
commit017cb732d873c1c10eba5cd7d116522198f4b69b (patch)
treee642d0e6a15d3eea2b3d267b5f40e53787197fc2 /meta-oe/recipes-navigation
parent6d30a1f529038189a2f6e228066050d6b203baac (diff)
downloadmeta-openembedded-017cb732d873c1c10eba5cd7d116522198f4b69b.tar.gz
tangogps: fix build with curl-7.21.8 and newer
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-navigation')
-rw-r--r--meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch37
-rw-r--r--meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb4
2 files changed, 40 insertions, 1 deletions
diff --git a/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch
new file mode 100644
index 000000000..db8af841f
--- /dev/null
+++ b/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch
@@ -0,0 +1,37 @@
1curl/types.h was removed in
2https://github.com/bagder/curl/commit/2ef7a28a71f819343afefa721e5497119fb2cee0#include/curl
3and is not available in curl-7.21.8 and newer
4
5diff -uNr tangogps-0.99.4.orig//src/util.h tangogps-0.99.4/src/util.h
6--- tangogps-0.99.4.orig//src/util.h 2009-11-06 13:16:05.000000000 +0100
7+++ tangogps-0.99.4/src/util.h 2011-07-21 14:36:59.208792227 +0200
8@@ -2,7 +2,6 @@
9 #include <gtk/gtk.h>
10
11 #include <curl/curl.h>
12-#include <curl/types.h>
13 #include <curl/easy.h>
14 int
15 sql_execute(char *db_name, char *sql, int (*cb_func)(void*,int,char**,char**));
16diff -uNr tangogps-0.99.4.orig//src/friends.c tangogps-0.99.4/src/friends.c
17--- tangogps-0.99.4.orig//src/friends.c 2010-06-25 11:40:04.000000000 +0200
18+++ tangogps-0.99.4/src/friends.c 2011-07-21 14:39:14.711789408 +0200
19@@ -17,7 +17,6 @@
20 #include <gtk/gtk.h>
21
22 #include <curl/curl.h>
23-#include <curl/types.h>
24 #include <curl/easy.h>
25
26
27diff -uNr tangogps-0.99.4.orig//src/tile_management.c tangogps-0.99.4/src/tile_management.c
28--- tangogps-0.99.4.orig//src/tile_management.c 2010-06-25 11:40:05.000000000 +0200
29+++ tangogps-0.99.4/src/tile_management.c 2011-07-21 14:38:45.030790011 +0200
30@@ -5,7 +5,6 @@
31 #include <glib/gprintf.h>
32 #include <string.h>
33 #include <curl/curl.h>
34-#include <curl/types.h>
35 #include <curl/easy.h>
36 #include <math.h>
37 #include "globals.h"
diff --git a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
index e04f0a50d..3a1ea3df2 100644
--- a/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
+++ b/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
@@ -5,8 +5,10 @@ SECTION = "x11/applications"
5LICENSE = "GPLv2" 5LICENSE = "GPLv2"
6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" 6LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
7DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4 bluez4" 7DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4 bluez4"
8PR = "r1"
8 9
9SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz" 10SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \
11 file://remove.unused.header.patch"
10SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d" 12SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d"
11SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a" 13SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a"
12 14