summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Faulhammer <opfer@gentoo.org>2008-06-11 06:55:50 +0000
committerChristian Faulhammer <opfer@gentoo.org>2008-06-11 06:55:50 +0000
commita70be2070b0bbf234b9eaf17a429f9ddfdaa970e (patch)
tree97511d9008b4be402334562e5fca7dddfaf930de /x11-misc/gaia/files
parentstable x86, bug 225835 (diff)
downloadgentoo-2-a70be2070b0bbf234b9eaf17a429f9ddfdaa970e.tar.gz
gentoo-2-a70be2070b0bbf234b9eaf17a429f9ddfdaa970e.tar.bz2
gentoo-2-a70be2070b0bbf234b9eaf17a429f9ddfdaa970e.zip
fix build errors with GCC 4.3 and curl 7.18, thanks to loki_val in bug 225265
(Portage version: 2.1.4.4)
Diffstat (limited to 'x11-misc/gaia/files')
-rw-r--r--x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch20
-rw-r--r--x11-misc/gaia/files/gaia-0.1.2-gcc43.patch21
2 files changed, 41 insertions, 0 deletions
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>
+