From 324de1646ac31c8a9f01c0004db85350b517224e Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Thu, 21 Jul 2011 17:39:44 +0200
Subject: foxtrotgps: fix build with curl-7.21.8 and newer

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 .../foxtrotgps-1.0.1/remove.unused.header.patch    | 40 ++++++++++++++++++++++
 .../foxtrotgps/foxtrotgps_1.0.1.bb                 |  6 ++--
 2 files changed, 44 insertions(+), 2 deletions(-)
 create mode 100644 meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch

(limited to 'meta-oe/recipes-navigation/foxtrotgps')

diff --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
new file mode 100644
index 0000000000..d80d321ca6
--- /dev/null
+++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps-1.0.1/remove.unused.header.patch
@@ -0,0 +1,40 @@
+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
+
+=== modified file 'foxtrotgps-1.0.1/src/friends.c'
+--- foxtrotgps-1.0.1.orig/src/friends.c	2011-05-01 20:51:37 +0000
++++ foxtrotgps-1.0.1/src/friends.c	2011-07-21 15:34:03 +0000
+@@ -17,7 +17,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ 
+
+=== modified file 'foxtrotgps-1.0.1/src/tile_management.c'
+--- foxtrotgps-1.0.1.orig/src/tile_management.c	2011-06-02 11:25:49 +0000
++++ foxtrotgps-1.0.1/src/tile_management.c	2011-07-21 15:34:06 +0000
+@@ -8,7 +8,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"
+
+=== modified file 'foxtrotgps-1.0.1/src/util.h'
+--- foxtrotgps-1.0.1.orig/src/util.h	2010-04-13 02:20:30 +0000
++++ foxtrotgps-1.0.1/src/util.h	2011-07-21 15:34:05 +0000
+@@ -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 --git a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb
index c517f08c47..2a8293e222 100644
--- a/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb
+++ b/meta-oe/recipes-navigation/foxtrotgps/foxtrotgps_1.0.1.bb
@@ -5,11 +5,13 @@ SECTION = "x11/applications"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 DEPENDS = "curl gtk+ gconf libglade sqlite3 libexif gpsd"
+PR = "r1"
 
-SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz"
+SRC_URI = "http://www.foxtrotgps.org/releases/${P}.tar.gz \
+           file://remove.unused.header.patch"
 SRC_URI[md5sum] = "982d14cdb0439cc4d6aa6cefc232124d"
 SRC_URI[sha256sum] = "059158fd8e61137e2e6d6e01685add7fb85cce8483faa99efb01187f2ba50841"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig perlnative
 
 RRECOMMENDS_${PN} = "gpsd"
-- 
cgit 1.2.3-korg