Pull in GLU headers for "gluProject" wrt #402361 by Helmut Jarausch. This is required for compability with x11-libs/qt-opengl >= 4.8.0.

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 36 insertions, 10 deletions

diff --git a/sci-mathematics/freemat/ChangeLog b/sci-mathematics/freemat/ChangeLog
index 6625d5617017..3e757fedfe28 100644
--- a/sci-mathematics/freemat/ChangeLog
+++ b/sci-mathematics/freemat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-mathematics/freemat
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.23 2011/11/25 21:03:56 bicatali Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/ChangeLog,v 1.24 2012/03/10 10:33:04 ssuominen Exp $
+
+  10 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> freemat-4.0.ebuild,
+  +files/freemat-4.0-no_implicit_GLU.patch:
+  Pull in GLU headers for "gluProject" wrt #402361 by Helmut Jarausch. This is
+  required for compability with x11-libs/qt-opengl >= 4.8.0.
 
   25 Nov 2011; Sébastien Fabbro <bicatali@gentoo.org> -freemat-3.6.ebuild,
   -files/freemat-3.6-gcc44.patch, -files/freemat-3.6-includes.patch,
diff --git a/sci-mathematics/freemat/Manifest b/sci-mathematics/freemat/Manifest
index dcd06563835c..2d809b496008 100644
--- a/sci-mathematics/freemat/Manifest
+++ b/sci-mathematics/freemat/Manifest
@@ -2,14 +2,19 @@
 Hash: SHA1
 
 AUX freemat-4.0-gcc45.patch 8460 RMD160 aaf5d080e0ab9417538778e36f1da4caf2f32040 SHA1 966565ae170233f42056d0f59b48a7c3e4754b2f SHA256 bf5699f75995583e984a858a013e5566288332eebe5d9979a60d03c527ac1275
+AUX freemat-4.0-no_implicit_GLU.patch 311 RMD160 09c5326a87932b29f8d5180847ea9e0a218fb94c SHA1 545b60f5768b56dbed1fbc31b597f74429d31a56 SHA256 22bfbc1d08bd91475130f13969d6104ca3eaec9df8517f736a2417858429ab0b
 DIST FreeMat-4.0-Source.tar.gz 38038903 RMD160 6978890a0e4b55bb4815bee9cc5c027b6da3c1e2 SHA1 4446af7f393bc33d7e6017f78cff4bf680c411a7 SHA256 6df1707c1f9e08b34e15eca8fa58bf3cf0ec8c121f64f58ca1d34a6eafd1066b
-EBUILD freemat-4.0.ebuild 1748 RMD160 5a9a55242dc40c8e29fd32b67c6604806c6ecb5b SHA1 dfc2db7a73a920b50ac51ea5370ecbdcb318ab64 SHA256 2af41c171d958aca601fe40d5448e7ed538af7c8a9f2fdf643b06f0514c7e85f
-MISC ChangeLog 4156 RMD160 339dcc09eb3f70bb60271e2a1513cb48827e5511 SHA1 092f19e7311c29ef74ac24a395b3e0dbd052497c SHA256 16ff7b790f9306803395d1894d6364e3f326b5263c6abc5b5e3737665c59b963
+EBUILD freemat-4.0.ebuild 1798 RMD160 b5e2d3e408a80defded9f7097d439b1beacbd3d2 SHA1 8feab34be23cc6df5842f1eac4618ec0a65ed229 SHA256 a5014cd57038d7e42e72e8b9dc944ea81925d4b69dcd50fa73dedda09f8771b0
+MISC ChangeLog 4416 RMD160 b9c56ef6d65b58a9e39ede84981863eaf5f9a76a SHA1 48f3d5e58e8ba0f5a2a8158b1ba0961fc8d65de7 SHA256 a18c74e2407fa2e49a8ea2c45f9c7bf46d2dc86da6074e88697cafad2deca740
 MISC metadata.xml 923 RMD160 b91a893dc540c52252fd68642f012051a05cb24c SHA1 05e4960fc83389804056ffcfec31b69b38929e38 SHA256 4025d2670fe55671ba64ec0ae29971f437c89641e0f08c96c6207f6907ab4016
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk7QAsUACgkQ1ycZbhPLE2B9CACgjZ+Fpwd1W0m0YHZnfi6VgTRY
-Tw0AoKfvEfd3r05RjdJUxuXncieUheWp
-=F2q8
+iQEcBAEBAgAGBQJPWy3hAAoJEEdUh39IaPFNl7UH+QEVZPFXw00sNde5XXkqoomm
+rgCnrumWdQMYkRgA0qPqHgL6W4TQLreouKF0bT/dEV/GqvBlohErpDEU9ok9b0Ix
+mN1XW8NxIZQ9dOxrxuishnWW2YLoVlgG8kG51l0ERjAEBIB8QR0LbRZOMq3P9NEM
+Ihjqsr/R3d4T3gbkbH76QJz67UqzZSWTO97Ap/8Xq1KgVcjMb+U2p3+d3XnkpWkw
+JVyLOOBGS7IqzbHbQzzuQKGpA2H8VZGui5ILoz9Tcy0ENcPnqxm+2n4+l4HACYoz
+iuJaOCbW9IrLt2vNwhp27LApGMivZ4NKfvm9l+LNNCk6btr5x/x2h6FS/UkK3Pw=
+=SUoE
 -----END PGP SIGNATURE-----
diff --git a/sci-mathematics/freemat/files/freemat-4.0-no_implicit_GLU.patch b/sci-mathematics/freemat/files/freemat-4.0-no_implicit_GLU.patch
new file mode 100644
index 000000000000..dd3798bb8f6a
--- /dev/null
+++ b/sci-mathematics/freemat/files/freemat-4.0-no_implicit_GLU.patch
@@ -0,0 +1,14 @@
+error: 'gluProject' was not declared in this scope
+
+http://bugs.gentoo.org/402361
+
+--- libs/libGraphics/GLRenderEngine.cpp
++++ libs/libGraphics/GLRenderEngine.cpp
+@@ -20,6 +20,7 @@
+ #include <qimage.h>
+ #include <qpainter.h>
+ #include <QtOpenGL>
++#include <GL/glu.h>
+ #include <math.h>
+ #include "IEEEFP.hpp"
+ 
diff --git a/sci-mathematics/freemat/freemat-4.0.ebuild b/sci-mathematics/freemat/freemat-4.0.ebuild
index 4d8a781dea82..429c5b13ed44 100644
--- a/sci-mathematics/freemat/freemat-4.0.ebuild
+++ b/sci-mathematics/freemat/freemat-4.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-4.0.ebuild,v 1.3 2010/05/05 16:11:17 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/freemat/freemat-4.0.ebuild,v 1.4 2012/03/10 10:33:04 ssuominen Exp $
 
 EAPI="2"
 inherit eutils cmake-utils fdo-mime
@@ -36,7 +36,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${MY_P}.1-Source"
 
 src_prepare(){
-	epatch "${FILESDIR}"/${P}-gcc45.patch
+	epatch \
+		"${FILESDIR}"/${P}-gcc45.patch \
+		"${FILESDIR}"/${P}-no_implicit_GLU.patch
 }
 
 src_configure() {