From 3edc42216fee4bb8237aa128510c32ceb77dfd8f Mon Sep 17 00:00:00 2001 From: root Date: Fri, 28 Sep 2012 01:39:44 -0700 Subject: Fri Sep 28 01:39:41 PDT 2012 --- .../0001-compatibility-with-ghc-7.6.1.patch | 55 ++++++++++++++++++++++ 1 file changed, 55 insertions(+) create mode 100644 community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch (limited to 'community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch') diff --git a/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch b/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch new file mode 100644 index 000000000..845beb2bd --- /dev/null +++ b/community-staging/haskell-glib/0001-compatibility-with-ghc-7.6.1.patch @@ -0,0 +1,55 @@ +From 7e677b1c633d2b426fc956fcfa084a82ef6df861 Mon Sep 17 00:00:00 2001 +From: Thomas Dziedzic +Date: Thu, 27 Sep 2012 04:48:10 -0700 +Subject: [PATCH] compatibility with ghc 7.6.1 + +--- + System/Glib/GObject.chs | 4 +--- + System/Glib/MainLoop.chs | 4 ++-- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/System/Glib/GObject.chs b/System/Glib/GObject.chs +index 5f0fe5c..9925d2c 100644 +--- a/System/Glib/GObject.chs ++++ b/System/Glib/GObject.chs +@@ -127,8 +127,6 @@ makeNewGObject (constr, objectUnref) generator = do + + {#pointer GDestroyNotify as DestroyNotify#} + +-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify +- + -- | This function wraps any newly created objects that derives from + -- GInitiallyUnowned also known as objects with + -- \"floating-references\". The object will be refSink (for glib +@@ -225,4 +223,4 @@ isA obj gType = + -- at this point we would normally implement the notify signal handler; + -- I've moved this definition into the Object class of the gtk package + -- since there's a quite a bit of machinery missing here (generated signal +--- register functions and the problem of recursive modules) +\ No newline at end of file ++-- register functions and the problem of recursive modules) +diff --git a/System/Glib/MainLoop.chs b/System/Glib/MainLoop.chs +index 72fecb6..feb4c77 100644 +--- a/System/Glib/MainLoop.chs ++++ b/System/Glib/MainLoop.chs +@@ -71,7 +71,7 @@ import System.Glib.GObject (DestroyNotify, destroyFunPtr) + + {#pointer SourceFunc#} + +-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc ++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc + + type HandlerId = {#type guint#} + +@@ -79,7 +79,7 @@ type HandlerId = {#type guint#} + -- + makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify) + makeCallback fun = do +- funPtr <- mkSourceFunc fun ++ funPtr <- mkSourceFunc (const fun) + return (funPtr, destroyFunPtr) + + -- | Sets a function to be called at regular intervals, with the default +-- +1.7.12.1 + -- cgit v1.2.3-54-g00ecf