From 21435953e16cda318a82334ddbadb3b5c36d9ea7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 15 Jan 2020 15:51:32 +0000 Subject: gentoo resync : 15.01.2020 --- dev-haskell/opengl/Manifest | 1 - .../opengl/files/opengl-2.2.1.1-ghc-7.4.patch | 29 ---------------------- 2 files changed, 30 deletions(-) delete mode 100644 dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch (limited to 'dev-haskell/opengl') diff --git a/dev-haskell/opengl/Manifest b/dev-haskell/opengl/Manifest index 9e7f035ee6b3..341321d4b012 100644 --- a/dev-haskell/opengl/Manifest +++ b/dev-haskell/opengl/Manifest @@ -1,4 +1,3 @@ -AUX opengl-2.2.1.1-ghc-7.4.patch 1209 BLAKE2B e8b6cd8d35cba6ff61fcddf1087a3993df0a81f9775d71552010efbc90b66bf80c294a2282c708ec711e8ee7dbbb3f1db6f38f00de01bfac5ad1cf30f43af1d7 SHA512 0e774a69cba5d99e6362ff2e36a94b212e96ea95de7817b3d6cf15e383d4de4e9cb9ab5c7fbd07e33951e4b6b1a67c7e6f0512c4cd41fe92ab722f1d76ea47e1 AUX opengl-2.9.2.0-ghc-7.10.patch 538 BLAKE2B 1d532d8a36627c389a10d341c7f887d71c2f97b9e101caf40da87c2e1ee319c8bcd57b9d6c97e99583ca52d1a82a58a37af42316bc141b5fad1b1b4638f1528a SHA512 df64e2277c053b9404369ba6def4b474bb49302947405558b3a49ae054a5416a7f28c858e51e3457d2fd90e28af74aeb08424afe3a7389ef381ca4e3b321ee53 DIST OpenGL-2.12.0.1.tar.gz 125419 BLAKE2B f6cb30335f783d9474d112159fef0d7af744c3bef54580485e1df77d58f625d4ba9a6c46120c1dc5d96fa98c89f34a6e63e91909f0f5dd1f7626460ad3f55612 SHA512 58c21efade5a8e10a78a61eaee35986e61581e3ef898f657e3f4c0479e0e35f60772bfa489bf49dfdbf3c395826df513f3f116278fb400d568babed1061e4765 DIST OpenGL-2.9.2.0.tar.gz 122514 BLAKE2B f6d4e40b2b49dcbf542e7ec8e437d5b69834b593d0584ac512dffde97478b5e2f66d94c96129c910d428e1c7311319a0c751b48d52402fc90993407545bd124a SHA512 1abb31033fe57056a0a3d00308910033d25d800f3da9ee4ecfd43bf25d8a392d6344463f3173da432a35ab3bbe5b5964c2aa5b0de5252e4f274025fd8d0dd0e9 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 deleted file mode 100644 index 772b17539523..000000000000 --- a/dev-haskell/opengl/files/opengl-2.2.1.1-ghc-7.4.patch +++ /dev/null @@ -1,29 +0,0 @@ -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) -- cgit v1.2.3