Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/glib/files: glib-0.12.3.1-ghc-7.6.patch
Date: Sun, 25 Nov 2012 05:43:30
Message-Id: 20121125054319.860E920C65@flycatcher.gentoo.org
1 gienah 12/11/25 05:43:19
2
3 Added: glib-0.12.3.1-ghc-7.6.patch
4 Log:
5 Patch glib-0.12.3.1 for ghc 7.6.1
6
7 (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
8
9 Revision Changes Path
10 1.1 dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch?rev=1.1&content-type=text/plain
14
15 Index: glib-0.12.3.1-ghc-7.6.patch
16 ===================================================================
17 --- glib-0.12.3.1-orig/System/Glib/GObject.chs 2012-05-28 08:18:53.000000000 +1000
18 +++ glib-0.12.3.1/System/Glib/GObject.chs 2012-10-11 09:48:16.313701201 +1100
19 @@ -127,8 +127,6 @@
20
21 {#pointer GDestroyNotify as DestroyNotify#}
22
23 -foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
24 -
25 -- | This function wraps any newly created objects that derives from
26 -- GInitiallyUnowned also known as objects with
27 -- \"floating-references\". The object will be refSink (for glib
28 --- glib-0.12.3.1-orig/System/Glib/MainLoop.chs 2012-05-28 08:18:53.000000000 +1000
29 +++ glib-0.12.3.1/System/Glib/MainLoop.chs 2012-10-11 09:48:04.779383615 +1100
30 @@ -71,7 +71,7 @@
31
32 {#pointer SourceFunc#}
33
34 -foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
35 +foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
36
37 type HandlerId = {#type guint#}
38
39 @@ -79,7 +79,7 @@
40 --
41 makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
42 makeCallback fun = do
43 - funPtr <- mkSourceFunc fun
44 + funPtr <- mkSourceFunc (const fun)
45 return (funPtr, destroyFunPtr)
46
47 -- | Sets a function to be called at regular intervals, with the default