Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/opengl/files/
Date: Sun, 29 Dec 2019 02:15:31
Message-Id: 1577585711.e9fa34fe1a645caef3955350adea8d4a53d1675f.bman@gentoo
1 commit: e9fa34fe1a645caef3955350adea8d4a53d1675f
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Sat Dec 28 19:33:48 2019 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 29 02:15:11 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9fa34fe
7
8 dev-haskell/opengl: remove unused patch
9
10 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
11 Closes: https://github.com/gentoo/gentoo/pull/14155
12 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
13
14 .../opengl/files/opengl-2.2.1.1-ghc-7.4.patch | 29 ----------------------
15 1 file changed, 29 deletions(-)
16
17 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
18 deleted file mode 100644
19 index 772b1753952..00000000000
20 --- a/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch
21 +++ /dev/null
22 @@ -1,29 +0,0 @@
23 -Fix build failure against ghc-7.4
24 -
25 -[ 4 of 84] Compiling Graphics.Rendering.OpenGL.GL.GLboolean ( Graphics/Rendering/OpenGL/GL/GLboolean.hs, dist/build/Graphics/Rendering/OpenGL/GL/GLboolean.o )
26 -
27 -Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:23:
28 - Could not deduce (Eq a) arising from a use of `/='
29 - from the context (Num a)
30 - bound by the type signature for
31 - unmarshalGLboolean :: Num a => a -> Bool
32 - at Graphics/Rendering/OpenGL/GL/GLboolean.hs:27:1-27
33 - Possible fix:
34 - add (Eq a) to the context of
35 - the type signature for unmarshalGLboolean :: Num a => a -> Bool
36 - In the expression: (/= 0)
37 - In an equation for `unmarshalGLboolean':
38 - unmarshalGLboolean = (/= 0)
39 -
40 -Reported-by: Christian Lask
41 -diff --git a/Graphics/Rendering/OpenGL/GL/GLboolean.hs b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
42 -index cab7356..cc4faa8 100644
43 ---- a/Graphics/Rendering/OpenGL/GL/GLboolean.hs
44 -+++ b/Graphics/Rendering/OpenGL/GL/GLboolean.hs
45 -@@ -23,5 +23,5 @@ marshalGLboolean :: Num a => Bool -> a
46 - marshalGLboolean False = 0
47 - marshalGLboolean True = 1
48 -
49 --unmarshalGLboolean :: Num a => a -> Bool
50 -+unmarshalGLboolean :: (Eq a, Num a) => a -> Bool
51 - unmarshalGLboolean = (/= 0)