coin3d: fix build with newer gcc

This commit is contained in:
Vladimír Čunát 2013-08-27 11:38:20 +02:00
parent 8f3b31464b
commit b78df59fde
2 changed files with 47 additions and 0 deletions

View File

@ -9,6 +9,15 @@ stdenv.mkDerivation rec {
sha256 = "05ylhrcglm81dajbk132l1w892634z2i97x10fm64y1ih72phd2q";
};
patches = [
(fetchurl {
url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-libs/coin/files/coin-3.1.3-gcc-4.7.patch;
name = "gcc-4.7.patch";
sha256 = "076dyc52swk8qc7ylps53fg6iqmd52x8s7m18i80x49dd109yw20";
})
./gcc-4.8.patch # taken from FC-17 source rpm
];
buildInputs = [ mesa ];
meta = {

View File

@ -0,0 +1,38 @@
From 9f5d96a2b9a71ab539237d2dab4c54fc46fc5c5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= <corsepiu@corsepiu.home>
Date: Thu, 18 Apr 2013 19:17:06 +0200
Subject: [PATCH 10/10] GCC-4.8.0 fixes
---
src/fonts/freetype.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/fonts/freetype.cpp b/src/fonts/freetype.cpp
index 760b88b..e705d3a 100644
--- a/src/fonts/freetype.cpp
+++ b/src/fonts/freetype.cpp
@@ -32,18 +32,18 @@
20050613 mortene. */
-#include "fonts/freetype.h"
-
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif /* HAVE_CONFIG_H */
-#include <stdlib.h>
+#include <cstdlib>
#include <assert.h>
#include "glue/freetype.h"
#include "glue/GLUWrapper.h"
+#include "fonts/freetype.h"
+
/* ************************************************************************* */
#ifdef __cplusplus
--
1.8.1.4