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)

4 files changed, 85 insertions, 3 deletions

diff --git a/dev-haskell/gtk2hs-buildtools/ChangeLog b/dev-haskell/gtk2hs-buildtools/ChangeLog
index 50a239d9aebf..142ad88107ac 100644
--- a/dev-haskell/gtk2hs-buildtools/ChangeLog
+++ b/dev-haskell/gtk2hs-buildtools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/gtk2hs-buildtools
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.10 2012/09/23 08:43:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/ChangeLog,v 1.11 2012/11/25 05:42:32 gienah Exp $
+
+  25 Nov 2012; Mark Wright <gienah@gentoo.org>
+  +files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch, +files/gtk2hs-buildtools-0.12
+  .3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch,
+  gtk2hs-buildtools-0.12.3.1.ebuild:
+  Patch gtk2hs-buildtools-0.12.3.1 for ghc 7.6.1
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   gtk2hs-buildtools-0.12.3.1.ebuild:
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch
new file mode 100644
index 000000000000..e9a2e0516a1f
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-ghc-7.5.patch
@@ -0,0 +1,51 @@
+--- 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
diff --git a/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
new file mode 100644
index 000000000000..8bbf892f431b
--- /dev/null
+++ b/dev-haskell/gtk2hs-buildtools/files/gtk2hs-buildtools-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
@@ -0,0 +1,14 @@
+--- 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@" #}
diff --git a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
index 13017bd4a1e1..ca033ac19c88 100644
--- a/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
+++ b/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.4 2012/09/23 08:43:07 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs-buildtools/gtk2hs-buildtools-0.12.3.1.ebuild,v 1.5 2012/11/25 05:42:32 gienah Exp $
 
 EAPI=4
 
@@ -21,6 +21,17 @@ DEPEND="${RDEPEND}
 		dev-haskell/alex
 		>=dev-haskell/cabal-1.8
 		dev-haskell/happy
+		dev-haskell/random
 		>=dev-lang/ghc-6.10.1"
 
-PATCHES=("${FILESDIR}"/${PN}-0.12.3-workaround-UName.patch)
+PATCHES=("${FILESDIR}"/${PN}-0.12.3-workaround-UName.patch
+	"${FILESDIR}"/${PN}-0.12.3.1-ghc-7.5.patch
+)
+
+src_prepare() {
+	base_src_prepare
+	# c2hs ignores #if __GLASGOW_HASKELL__ >= 704
+	if has_version ">=dev-lang/ghc-7.6.1"; then
+		epatch "${FILESDIR}"/${PN}-0.12.3.1-remove-conditional-compilation-as-it-is-ignored-ghc-7.6.patch
+	fi
+}