Gentoo Archives: gentoo-commits

From: Patrice Clement <monsieurp@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/glib/files/
Date: Wed, 03 Aug 2016 07:36:32
Message-Id: 1470208914.baa3f756a4e5487cfbc145fb7b8659515fccda17.monsieurp@gentoo
1 commit: baa3f756a4e5487cfbc145fb7b8659515fccda17
2 Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Tue Jul 26 16:44:07 2016 +0000
4 Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
5 CommitDate: Wed Aug 3 07:21:54 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baa3f756
7
8 dev-haskell/glib: remove unused patches
9
10 Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
11
12 dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch | 31 ----------------------
13 .../glib/files/glib-0.13.0.7-ghc-7.10.patch | 11 --------
14 2 files changed, 42 deletions(-)
15
16 diff --git a/dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch b/dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch
17 deleted file mode 100644
18 index 3c9ab53..0000000
19 --- a/dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch
20 +++ /dev/null
21 @@ -1,31 +0,0 @@
22 ---- glib-0.12.3.1-orig/System/Glib/GObject.chs 2012-05-28 08:18:53.000000000 +1000
23 -+++ glib-0.12.3.1/System/Glib/GObject.chs 2012-10-11 09:48:16.313701201 +1100
24 -@@ -127,8 +127,6 @@
25 -
26 - {#pointer GDestroyNotify as DestroyNotify#}
27 -
28 --foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
29 --
30 - -- | This function wraps any newly created objects that derives from
31 - -- GInitiallyUnowned also known as objects with
32 - -- \"floating-references\". The object will be refSink (for glib
33 ---- glib-0.12.3.1-orig/System/Glib/MainLoop.chs 2012-05-28 08:18:53.000000000 +1000
34 -+++ glib-0.12.3.1/System/Glib/MainLoop.chs 2012-10-11 09:48:04.779383615 +1100
35 -@@ -71,7 +71,7 @@
36 -
37 - {#pointer SourceFunc#}
38 -
39 --foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
40 -+foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
41 -
42 - type HandlerId = {#type guint#}
43 -
44 -@@ -79,7 +79,7 @@
45 - --
46 - makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
47 - makeCallback fun = do
48 -- funPtr <- mkSourceFunc fun
49 -+ funPtr <- mkSourceFunc (const fun)
50 - return (funPtr, destroyFunPtr)
51 -
52 - -- | Sets a function to be called at regular intervals, with the default
53
54 diff --git a/dev-haskell/glib/files/glib-0.13.0.7-ghc-7.10.patch b/dev-haskell/glib/files/glib-0.13.0.7-ghc-7.10.patch
55 deleted file mode 100644
56 index 75943a0..0000000
57 --- a/dev-haskell/glib/files/glib-0.13.0.7-ghc-7.10.patch
58 +++ /dev/null
59 @@ -1,11 +0,0 @@
60 ---- glib-0.13.0.7-orig/SetupWrapper.hs 2014-12-24 20:57:16.000000000 +1100
61 -+++ glib-0.13.0.7/SetupWrapper.hs 2015-01-03 17:39:42.464000600 +1100
62 -@@ -18,7 +18,7 @@
63 -
64 - import System.Environment
65 - import System.Process
66 --import System.Exit
67 -+import System.Exit (exitWith, ExitCode(..))
68 - import System.FilePath
69 - import System.Directory
70 - import qualified Control.Exception as Exception