Fix building with curl-7.21.7. Closes bug #376133.

Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64

4 files changed, 50 insertions, 8 deletions

diff --git a/sci-geosciences/foxtrotgps/ChangeLog b/sci-geosciences/foxtrotgps/ChangeLog
index 7f2b90601fb4..9c0c2353f828 100644
--- a/sci-geosciences/foxtrotgps/ChangeLog
+++ b/sci-geosciences/foxtrotgps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-geosciences/foxtrotgps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/foxtrotgps/ChangeLog,v 1.4 2011/07/20 17:30:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/foxtrotgps/ChangeLog,v 1.5 2011/07/24 11:28:39 scarabeus Exp $
+
+  24 Jul 2011; Tomáš Chvátal <scarabeus@gentoo.org> foxtrotgps-1.0.1.ebuild,
+  +files/foxtrotgps-curl-7.21.7.patch:
+  Fix building with curl-7.21.7. Closes bug #376133.
 
   20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Drop maintainer due retirement, bug #118937
diff --git a/sci-geosciences/foxtrotgps/Manifest b/sci-geosciences/foxtrotgps/Manifest
index 867136f7a280..6e1215417483 100644
--- a/sci-geosciences/foxtrotgps/Manifest
+++ b/sci-geosciences/foxtrotgps/Manifest
@@ -1,14 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX foxtrotgps-curl-7.21.7.patch 1184 RMD160 11492fa9f337ed6173b5f635e3c77fc4017a5703 SHA1 dd2935028d2b210a2ac5856ea9b0592e3644a956 SHA256 f3d0bef8d7d55c17598e97791c64ed5c57e8bc9355e3c37180e587ef28ce5697
 DIST foxtrotgps-1.0.1.tar.gz 489427 RMD160 1a68bd666984ef5321b117a0ac5daa17c8f989d0 SHA1 81f76e7bf2c42466c8b7ed709e07d8c409a7e990 SHA256 059158fd8e61137e2e6d6e01685add7fb85cce8483faa99efb01187f2ba50841
-EBUILD foxtrotgps-1.0.1.ebuild 706 RMD160 996837b7ef40995f63a0ab3cf00c82297ac1283a SHA1 75e2ed2deafe2b1f04e9dfcef7c16532532bc087 SHA256 286005721a4d711abbc7e2081118c3395f8db359629347d3de738e2c2c54aad9
-MISC ChangeLog 803 RMD160 e43cda2802f1d894693fbe3eec5030eeb12749c4 SHA1 c7c93e97f992f7882b5e28a480d6299c4968151d SHA256 684bf61b40e0214f7f5aa8a8e80aad1bb952145288579d0298def0db4dffa9a2
+EBUILD foxtrotgps-1.0.1.ebuild 756 RMD160 16ac8e4c638d539c2e9f5ce7e1f3cea613a9d9f1 SHA1 e8c4e3353cfe5459c6181ec1c9088c207dd13f33 SHA256 73f0673e529300202c8fee8394d228e2b5c4a031ae14763cb6102f3f9d5ab3ce
+MISC ChangeLog 980 RMD160 002e58eb32e35b64f26ebc9eda8598a1a69baf85 SHA1 a6cd6dd511cc152adb6fa5e3ef75dd6f0273e6e4 SHA256 41f0d2fd5961ea2d1fd77e6c3719c6ba635a3bae043acb3a587ebd80e69fc4ae
 MISC metadata.xml 529 RMD160 9cdce61b3631e01f0b38de4a36aa4c65e5f30446 SHA1 63f78b9cd259d583373a6747b603a57ff153c2f5 SHA256 d8f82f6cda102a97f3a57800f46e76d1e147e0481e9812367012f0e7c39cc5c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk4nEMAACgkQCaWpQKGI+9Qu2gCfWaUGVn2NqR6bTI9XpQSEjcFs
-mr8AnRvYJib8OhQaxGxZW18h4uucLDCw
-=F/An
+iEYEARECAAYFAk4sAdoACgkQHB6c3gNBRYdImQCfQvdEl1K0hawPCyTY69xZsnGt
+098An0KEm0hLKC0SnKYPD83jzdTakPCA
+=PmGW
 -----END PGP SIGNATURE-----
diff --git a/sci-geosciences/foxtrotgps/files/foxtrotgps-curl-7.21.7.patch b/sci-geosciences/foxtrotgps/files/foxtrotgps-curl-7.21.7.patch
new file mode 100644
index 000000000000..118ece61c6b0
--- /dev/null
+++ b/sci-geosciences/foxtrotgps/files/foxtrotgps-curl-7.21.7.patch
@@ -0,0 +1,33 @@
+diff -urN foxtrotgps-1.0.1.old/src/friends.c foxtrotgps-1.0.1/src/friends.c
+--- foxtrotgps-1.0.1.old/src/friends.c	2011-07-24 13:23:55.000000000 +0200
++++ foxtrotgps-1.0.1/src/friends.c	2011-07-24 13:25:22.000000000 +0200
+@@ -17,7 +17,6 @@
+ #include <gtk/gtk.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ 
+diff -urN foxtrotgps-1.0.1.old/src/tile_management.c foxtrotgps-1.0.1/src/tile_management.c
+--- foxtrotgps-1.0.1.old/src/tile_management.c	2011-07-24 13:23:55.000000000 +0200
++++ foxtrotgps-1.0.1/src/tile_management.c	2011-07-24 13:25:37.000000000 +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 -urN foxtrotgps-1.0.1.old/src/util.h foxtrotgps-1.0.1/src/util.h
+--- foxtrotgps-1.0.1.old/src/util.h	2011-07-24 13:23:55.000000000 +0200
++++ foxtrotgps-1.0.1/src/util.h	2011-07-24 13:25:10.000000000 +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 --git a/sci-geosciences/foxtrotgps/foxtrotgps-1.0.1.ebuild b/sci-geosciences/foxtrotgps/foxtrotgps-1.0.1.ebuild
index 84309dc9cbaa..d3f84f035545 100644
--- a/sci-geosciences/foxtrotgps/foxtrotgps-1.0.1.ebuild
+++ b/sci-geosciences/foxtrotgps/foxtrotgps-1.0.1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/foxtrotgps/foxtrotgps-1.0.1.ebuild,v 1.1 2011/06/01 09:24:58 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/foxtrotgps/foxtrotgps-1.0.1.ebuild,v 1.2 2011/07/24 11:28:39 scarabeus Exp $
 
 EAPI=4
 
-inherit eutils
+inherit base
 
 DESCRIPTION="Foxtrotgps is an easy to use, fast and lightweight mapping application. (fork of tangogps)"
 HOMEPAGE="http://www.foxtrotgps.org/"
@@ -27,3 +27,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	sys-devel/gettext
 "
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-curl-7.21.7.patch
+)