fix build errors with GCC 4.3 and curl 7.18, thanks to loki_val in bug 225265

(Portage version: 2.1.4.4)

4 files changed, 50 insertions, 2 deletions

diff --git a/x11-misc/gaia/ChangeLog b/x11-misc/gaia/ChangeLog
index 505d76114f70..5b4b143309bb 100644
--- a/x11-misc/gaia/ChangeLog
+++ b/x11-misc/gaia/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/gaia
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.19 2008/05/29 12:06:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/ChangeLog,v 1.20 2008/06/11 06:55:50 opfer Exp $
+
+  11 Jun 2008; Christian Faulhammer <opfer@gentoo.org>
+  +files/gaia-0.1.2-curl-7.18.patch, +files/gaia-0.1.2-gcc43.patch,
+  gaia-0.1.2.ebuild:
+  fix build errors with GCC 4.3 and curl 7.18, thanks to loki_val in bug 225265
 
   29 May 2008; Christian Faulhammer <opfer@gentoo.org>
   +files/gaia-0.1.2-scons-0.98.patch, gaia-0.1.2.ebuild:
diff --git a/x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch b/x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch
new file mode 100644
index 000000000000..49e138a90116
--- /dev/null
+++ b/x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch
@@ -0,0 +1,20 @@
+--- gaia-0.1.2.orig/lib/wwfetch/wwfetch_http.c
++++ gaia-0.1.2/lib/wwfetch/wwfetch_http.c
+@@ -19,6 +19,8 @@
+ 
+ #include "wwfetch_internal.h"
+ 
++#define GAIA_USERAGENT "gaia/" GAIA_VERSION
++
+ /**
+  * Internal function used in curl
+  *
+@@ -96,7 +98,7 @@
+ 	if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_HTTPHEADER, handle->curlheaders)) != CURLE_OK)
+ 		return WWFETCH_CURL_ERROR;
+ 
+-	if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, "gaia/%s", GAIA_VERSION)) != CURLE_OK)
++	if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, GAIA_USERAGENT)) != CURLE_OK)
+ 		return WWFETCH_CURL_ERROR;
+ 
+ 	if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_URL, url)) != CURLE_OK)
diff --git a/x11-misc/gaia/files/gaia-0.1.2-gcc43.patch b/x11-misc/gaia/files/gaia-0.1.2-gcc43.patch
new file mode 100644
index 000000000000..e52eaf11f407
--- /dev/null
+++ b/x11-misc/gaia/files/gaia-0.1.2-gcc43.patch
@@ -0,0 +1,21 @@
+--- gaia-0.1.2.orig/programs/gaia/GPSSourceNMEA.h
++++ gaia-0.1.2/programs/gaia/GPSSourceNMEA.h
+@@ -20,6 +20,8 @@
+ #ifndef __GAIA__GPSSOURCENMEA_H__
+ #define __GAIA__GPSSOURCENMEA_H__
+ 
++#include <cstdio>
++#include <cctype>
+ #include <vector>
+ #include <string.h>
+ #include <fcntl.h>
+--- gaia-0.1.2.orig/programs/gaia/Hud.h
++++ gaia-0.1.2/programs/gaia/Hud.h
+@@ -20,6 +20,7 @@
+ #ifndef __GAIA__HUD_H__
+ #define __GAIA__HUD_H__
+ 
++#include <algorithm>
+ #include <vector>
+ #include <GL/gl.h>
+ 
diff --git a/x11-misc/gaia/gaia-0.1.2.ebuild b/x11-misc/gaia/gaia-0.1.2.ebuild
index ea8929a261fd..a8dbba429a1e 100644
--- a/x11-misc/gaia/gaia-0.1.2.ebuild
+++ b/x11-misc/gaia/gaia-0.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/gaia-0.1.2.ebuild,v 1.9 2008/05/29 12:06:18 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/gaia/gaia-0.1.2.ebuild,v 1.10 2008/06/11 06:55:50 opfer Exp $
 
 inherit eutils
 
@@ -29,6 +29,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}/${P}-scons-0.98.patch"
+	epatch "${FILESDIR}/${P}-gcc43.patch"
+	epatch "${FILESDIR}/${P}-curl-7.18.patch"
 
 	# the binary would fail with a wrong hard coded path for font.png
 	cd "${S}/programs/gaia/"