summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/opengl/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/opengl/files')
-rw-r--r--dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch29
-rw-r--r--dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch13
2 files changed, 42 insertions, 0 deletions
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/files/opengl-2.9.2.0-ghc-7.10.patch b/dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch
new file mode 100644
index 000000000000..02967bf16502
--- /dev/null
+++ b/dev-haskell/opengl/files/opengl-2.9.2.0-ghc-7.10.patch
@@ -0,0 +1,13 @@
+diff --git a/Graphics/Rendering/OpenGL/GL/IOState.hs b/Graphics/Rendering/OpenGL/GL/IOState.hs
+index 6fbc144..2c2a42d 100644
+--- a/Graphics/Rendering/OpenGL/GL/IOState.hs
++++ b/Graphics/Rendering/OpenGL/GL/IOState.hs
+@@ -21 +21,2 @@ module Graphics.Rendering.OpenGL.GL.IOState (
+-import Control.Monad(replicateM)
++import Control.Applicative
++import Control.Monad(replicateM,ap)
+@@ -31,0 +33,4 @@ instance Functor (IOState s) where
++instance Applicative (IOState s) where
++ pure = return
++ (<*>) = ap -- defined in Control.Monad
++