[gentoo-commits] gentoo-x86 commit in dev-haskell/gtk2hs-buildtools/files: gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch

[gentoo-commits] gentoo-x86 commit in dev-haskell/gtk2hs-buildtools/files: gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch

[Mark Wright (gienah)]

gienah      12/11/25 05:42:32

  Added:                gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch
                        gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
  Log:
  Patch gtk2hs-buildtools-0.12.3.1 for ghc 7.6.1
  
  (Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.1                  dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch?rev=1.1&content-type=text/plain

Index: gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch
===================================================================
--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/base/general/FileOps.hs	2012-05-28 08:17:27.000000000 +1000
+++ gtk2hs-buildtools-0.12.3.1/c2hs/base/general/FileOps.hs	2012-07-14 14:17:58.121511985 +1000
@@ -36,6 +36,7 @@
 import System.Directory (doesFileExist)
 import System.IO	 (Handle, IOMode(..), openFile)
 import Control.Monad	 (liftM)
+import qualified Control.Exception
 import System.Random    (newStdGen, randomRs)
 
 import FNameOps  (dirname, stripDirname, addPath)
@@ -89,7 +90,9 @@
 			     in do
 			       h <- openFile fname ReadWriteMode
 			       return (h, fname)
-			     `catch` \_ -> createLoop (attempts - 1) rs'
+			     `Control.Exception.catch` ((\_ -> createLoop (attempts - 1) rs') ::
+                                                           Control.Exception.SomeException ->
+                                                           IO (Handle, FilePath))
     --
     sixChars :: [Int] -> ([Int], String)
     sixChars is = 
--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/base/state/StateTrans.hs	2012-05-28 08:17:27.000000000 +1000
+++ gtk2hs-buildtools-0.12.3.1/c2hs/base/state/StateTrans.hs	2012-07-14 14:14:12.365626559 +1000
@@ -80,6 +80,7 @@
 where
 
 import Control.Monad      (liftM)
+import qualified Control.Exception
 import System.IO  (fixIO)
 import Data.IORef (IORef, newIORef, readIORef, writeIORef)
 
@@ -337,7 +338,7 @@
 				  ioError err
 	      Right a          -> return state
 	    )
-	    `catch` (\err -> let
+	    `Control.Exception.catch` (\err -> let
 			       STB handler' = handler err
 			     in
 			     handler' bs gs)
--- gtk2hs-buildtools-0.12.3.1-orig/c2hs/toplevel/C2HSConfig.hs	2012-05-28 08:17:27.000000000 +1000
+++ gtk2hs-buildtools-0.12.3.1/c2hs/toplevel/C2HSConfig.hs	2012-07-14 14:12:10.172439583 +1000
@@ -46,7 +46,7 @@
 
 import Foreign (Ptr, FunPtr)
 import Foreign  (Storable(sizeOf, alignment), toBool)
-import Foreign.C (CInt)
+import Foreign.C (CInt(..))
 import System.Info (os)
 
 -- program settings



1.1                  dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch?rev=1.1&content-type=text/plain

Index: gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
===================================================================
--- gtk2hs-buildtools-0.12.3.1-orig/hierarchyGen/Hierarchy.chs.template	2012-05-28 08:17:27.000000000 +1000
+++ gtk2hs-buildtools-0.12.3.1/hierarchyGen/Hierarchy.chs.template	2012-10-11 12:28:58.851901084 +1100
@@ -38,11 +38,7 @@
   ) where
 
 import Foreign.ForeignPtr (ForeignPtr, castForeignPtr, unsafeForeignPtrToPtr)
-#if __GLASGOW_HASKELL__>=704
 import Foreign.C.Types    (CULong(..), CUInt(..))
-#else
-import Foreign.C.Types    (CULong, CUInt)
-#endif
 import System.Glib.GType	(GType, typeInstanceIsA)
 @MODULE_IMPORTS@
 {# context lib="@CONTEXT_LIB@" prefix="@CONTEXT_PREFIX@" #}