Fix build failure against ghc-7.4 (reported by Christian Lask).

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

4 files changed, 53 insertions, 7 deletions

diff --git a/dev-haskell/opengl/ChangeLog b/dev-haskell/opengl/ChangeLog
index bd05ba51017f..9e54f4df7d1b 100644
--- a/dev-haskell/opengl/ChangeLog
+++ b/dev-haskell/opengl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/opengl
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/opengl/ChangeLog,v 1.11 2010/09/16 16:36:07 scarabeus Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/opengl/ChangeLog,v 1.12 2012/03/30 03:39:30 slyfox Exp $
+
+  30 Mar 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/opengl-2.2.1.1-ghc-7.4.patch, opengl-2.2.1.1.ebuild:
+  Fix build failure against ghc-7.4 (reported by Christian Lask).
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   opengl-2.2.1.1.ebuild:
diff --git a/dev-haskell/opengl/Manifest b/dev-haskell/opengl/Manifest
index 74481b3e4987..e683cdfa32ca 100644
--- a/dev-haskell/opengl/Manifest
+++ b/dev-haskell/opengl/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX opengl-2.2.1.1-ghc-7.4.patch 1209 RMD160 421168395cdef131d14b48c1b9a6a74672d70ec6 SHA1 31612aa2a2f8f09a86caf48cad7832410aa68521 SHA256 3d123d77ced64d297e4c75cb25ecb82a577bddbcd1a4615fcdfccac60c855fb7
 DIST OpenGL-2.2.1.1.tar.gz 176695 RMD160 dcbe42faa008d01ffafd4ca27341e1d2d5267b6e SHA1 39591c317f9359dc1306432fecfe9eff0919ad00 SHA256 926ca25cf9502cdaaeb8ade484015468cb60594e1bfbf0e04bd01235d8d9a792
-EBUILD opengl-2.2.1.1.ebuild 645 RMD160 85dee68cd4b86404299edb890643940c9144c17d SHA1 ae8ae6d93ecab5f5abf42254e1af86ab961b90ad SHA256 f0ec839af16f6b3ea86787798cab2ebf6929bcbaf1434565980307d26fd9c4bc
-MISC ChangeLog 1585 RMD160 e849c006a1e2f2f909b4c24aa21ff6e95ceea689 SHA1 3446acd0136a59db02e2e8fdb768682314c6e690 SHA256 feee98763e8878e037b8a32b309b3736238367690567de51ac3f8fa6e4227aea
+EBUILD opengl-2.2.1.1.ebuild 691 RMD160 5a4eeffcce8d50df304c6bc6eec2d1d98c619bc4 SHA1 603abb50a793b7aac974bd1979b89e8a8c4df12c SHA256 c218caf30d52cc7e9d27c7bcad2b648765c1bd0dc6eed4e7b1ccabef0f90ae1a
+MISC ChangeLog 1765 RMD160 61bb2ec44ef7c145eaafafa79a39d9dfee078352 SHA1 92655d18120de6363fb25126b9c9e905bd77e5e2 SHA256 6f23f204d639953aeed58e755a6b8c4b315efbef814764ce01df799044545481
 MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk91LBgACgkQcaHudmEf86r5eQCeNWoX8Wpe9CjJvfPhH1uBBBF6
+xy4Ani48vqDt+dxdaLstmYaRqYf/Zr/T
+=0H29
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch b/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch
new file mode 100644
index 000000000000..772b17539523
--- /dev/null
+++ b/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch
@@ -0,0 +1,29 @@
+Fix build failure against ghc-7.4
+
+[ 4 of 84] Compiling Graphics.Rendering.OpenGL.GL.GLboolean ( Graphics/Rendering/OpenGL/GL/GLboolean.hs, dist/build/Graphics/Rendering/OpenGL/GL/GLboolean.o )
+
+Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:23:
+    Could not deduce (Eq a) arising from a use of `/='
+    from the context (Num a)
+      bound by the type signature for
+                 unmarshalGLboolean :: Num a => a -> Bool
+      at Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:1-27
+    Possible fix:
+      add (Eq a) to the context of
+        the type signature for unmarshalGLboolean :: Num a => a -> Bool
+    In the expression: (/= 0)
+    In an equation for `unmarshalGLboolean':
+        unmarshalGLboolean = (/= 0)
+
+Reported-by: Christian Lask
+diff --git a/Graphics/Rendering/OpenGL/GL/GLboolean.hs b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
+index cab7356..cc4faa8 100644
+--- a/Graphics/Rendering/OpenGL/GL/GLboolean.hs
++++ b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
+@@ -23,5 +23,5 @@ marshalGLboolean :: Num a => Bool -> a
+ marshalGLboolean False = 0
+ marshalGLboolean True  = 1
+ 
+-unmarshalGLboolean :: Num a => a -> Bool
++unmarshalGLboolean :: (Eq a, Num a) => a -> Bool
+ unmarshalGLboolean = (/= 0)
diff --git a/dev-haskell/opengl/opengl-2.2.1.1.ebuild b/dev-haskell/opengl/opengl-2.2.1.1.ebuild
index 2762a2e3fd30..aee3835df1af 100644
--- a/dev-haskell/opengl/opengl-2.2.1.1.ebuild
+++ b/dev-haskell/opengl/opengl-2.2.1.1.ebuild
@@ -1,9 +1,9 @@
-# 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/dev-haskell/opengl/opengl-2.2.1.1.ebuild,v 1.5 2010/09/16 16:36:07 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/opengl/opengl-2.2.1.1.ebuild,v 1.6 2012/03/30 03:39:30 slyfox Exp $
 
 CABAL_FEATURES="lib profile haddock"
-inherit haskell-cabal
+inherit base haskell-cabal
 
 MY_PN=OpenGL
 MY_P="${MY_PN}-${PV}"
@@ -23,3 +23,5 @@ DEPEND=">=dev-lang/ghc-6.4
 	media-libs/freeglut"
 
 S="${WORKDIR}/${MY_P}"
+
+PATCHES=("${FILESDIR}/${P}-ghc-7.4.patch")