| 1 |
opfer 08/06/11 06:55:51 |
| 2 |
|
| 3 |
Added: gaia-0.1.2-curl-7.18.patch gaia-0.1.2-gcc43.patch |
| 4 |
Log: |
| 5 |
fix build errors with GCC 4.3 and curl 7.18, thanks to loki_val in bug 225265 |
| 6 |
(Portage version: 2.1.4.4) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/gaia/files/gaia-0.1.2-curl-7.18.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: gaia-0.1.2-curl-7.18.patch |
| 15 |
=================================================================== |
| 16 |
--- gaia-0.1.2.orig/lib/wwfetch/wwfetch_http.c |
| 17 |
+++ gaia-0.1.2/lib/wwfetch/wwfetch_http.c |
| 18 |
@@ -19,6 +19,8 @@ |
| 19 |
|
| 20 |
#include "wwfetch_internal.h" |
| 21 |
|
| 22 |
+#define GAIA_USERAGENT "gaia/" GAIA_VERSION |
| 23 |
+ |
| 24 |
/** |
| 25 |
* Internal function used in curl |
| 26 |
* |
| 27 |
@@ -96,7 +98,7 @@ |
| 28 |
if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_HTTPHEADER, handle->curlheaders)) != CURLE_OK) |
| 29 |
return WWFETCH_CURL_ERROR; |
| 30 |
|
| 31 |
- if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, "gaia/%s", GAIA_VERSION)) != CURLE_OK) |
| 32 |
+ if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_USERAGENT, GAIA_USERAGENT)) != CURLE_OK) |
| 33 |
return WWFETCH_CURL_ERROR; |
| 34 |
|
| 35 |
if ((handle->lastcurlerror = curl_easy_setopt(handle->curl, CURLOPT_URL, url)) != CURLE_OK) |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.1 x11-misc/gaia/files/gaia-0.1.2-gcc43.patch |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/gaia/files/gaia-0.1.2-gcc43.patch?rev=1.1&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/x11-misc/gaia/files/gaia-0.1.2-gcc43.patch?rev=1.1&content-type=text/plain |
| 43 |
|
| 44 |
Index: gaia-0.1.2-gcc43.patch |
| 45 |
=================================================================== |
| 46 |
--- gaia-0.1.2.orig/programs/gaia/GPSSourceNMEA.h |
| 47 |
+++ gaia-0.1.2/programs/gaia/GPSSourceNMEA.h |
| 48 |
@@ -20,6 +20,8 @@ |
| 49 |
#ifndef __GAIA__GPSSOURCENMEA_H__ |
| 50 |
#define __GAIA__GPSSOURCENMEA_H__ |
| 51 |
|
| 52 |
+#include <cstdio> |
| 53 |
+#include <cctype> |
| 54 |
#include <vector> |
| 55 |
#include <string.h> |
| 56 |
#include <fcntl.h> |
| 57 |
--- gaia-0.1.2.orig/programs/gaia/Hud.h |
| 58 |
+++ gaia-0.1.2/programs/gaia/Hud.h |
| 59 |
@@ -20,6 +20,7 @@ |
| 60 |
#ifndef __GAIA__HUD_H__ |
| 61 |
#define __GAIA__HUD_H__ |
| 62 |
|
| 63 |
+#include <algorithm> |
| 64 |
#include <vector> |
| 65 |
#include <GL/gl.h> |
| 66 |
|
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
-- |
| 71 |
gentoo-commits@l.g.o mailing list |
Archives