diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-24 11:28:39 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-07-24 11:28:39 +0000 |
| commit | b806816b480254a685ff6e0327ccac7ba3421475 (patch) | |
| tree | 4861ac842fec878347e3f3130ca7cee79d1e1013 /sci-geosciences | |
| parent | alpha/arm/ia64/s390/sh/sparc stable wrt #369501 (diff) | |
| download | gentoo-2-b806816b480254a685ff6e0327ccac7ba3421475.tar.gz gentoo-2-b806816b480254a685ff6e0327ccac7ba3421475.tar.bz2 gentoo-2-b806816b480254a685ff6e0327ccac7ba3421475.zip | |
Fix building with curl-7.21.7. Closes bug #376133.
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'sci-geosciences')
| -rw-r--r-- | sci-geosciences/foxtrotgps/ChangeLog | 6 | ||||
| -rw-r--r-- | sci-geosciences/foxtrotgps/files/foxtrotgps-curl-7.21.7.patch | 33 | ||||
| -rw-r--r-- | sci-geosciences/foxtrotgps/foxtrotgps-1.0.1.ebuild | 8 |
3 files changed, 44 insertions, 3 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/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 +) |