tangogps: fix build with curl-7.21.8 and newer

(From meta-openembedded rev: 017cb732d873c1c10eba5cd7d116522198f4b69b)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>

diff --git a/meta-openembedded/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch b/meta-openembedded/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch
new file mode 100644 (file)
index 0000000..db8af84
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-navigation/tangogps/tangogps-0.99.4/remove.unused.header.patch
@@ -0,0 +1,37 @@
+curl/types.h was removed in 
+https://github.com/bagder/curl/commit/2ef7a28a71f819343afefa721e5497119fb2cee0#include/curl
+and is not available in curl-7.21.8 and newer
+
+diff -uNr tangogps-0.99.4.orig//src/util.h tangogps-0.99.4/src/util.h
+--- tangogps-0.99.4.orig//src/util.h   2009-11-06 13:16:05.000000000 +0100
++++ tangogps-0.99.4/src/util.h 2011-07-21 14:36:59.208792227 +0200
+@@ -2,7 +2,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ int
+ sql_execute(char *db_name, char *sql, int (*cb_func)(void*,int,char**,char**));
+diff -uNr tangogps-0.99.4.orig//src/friends.c tangogps-0.99.4/src/friends.c
+--- tangogps-0.99.4.orig//src/friends.c        2010-06-25 11:40:04.000000000 +0200
++++ tangogps-0.99.4/src/friends.c      2011-07-21 14:39:14.711789408 +0200
+@@ -17,7 +17,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ 
+diff -uNr tangogps-0.99.4.orig//src/tile_management.c tangogps-0.99.4/src/tile_management.c
+--- tangogps-0.99.4.orig//src/tile_management.c        2010-06-25 11:40:05.000000000 +0200
++++ tangogps-0.99.4/src/tile_management.c      2011-07-21 14:38:45.030790011 +0200
+@@ -5,7 +5,6 @@
+ #include <glib/gprintf.h>
+ #include <string.h>
+ #include <curl/curl.h>
+-#include <curl/types.h> 
+ #include <curl/easy.h> 
+ #include <math.h>
+ #include "globals.h"

diff --git a/meta-openembedded/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb b/meta-openembedded/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
index e04f0a5..3a1ea3d 100644 (file)
--- a/meta-openembedded/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
+++ b/meta-openembedded/meta-oe/recipes-navigation/tangogps/tangogps_0.99.4.bb
@@ -5,8 +5,10 @@ SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "curl gtk+ gconf sqlite3 libexif libsoup-2.4 bluez4"
+PR = "r1"
 
-SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz"
+SRC_URI = "http://www.tangogps.org/downloads/${P}.tar.gz \
+           file://remove.unused.header.patch"
 SRC_URI[md5sum] = "0f07ede94a21eb84f5e017fa88a1fc3d"
 SRC_URI[sha256sum] = "660fdf89ef3c379f2fc0c2a9d0c9d3bfa5345835786b72bf9f513ba9ec2c812a"