diff options
| author |   Mark Wright <gienah@gentoo.org> | 2014-03-23 15:05:13 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2014-03-23 15:05:13 +0000 |
| commit | 2d8c9d1bb2f94e72b8957d28ad29350ea047c2c3 (patch) | |
| tree | 971458832a8dd3c36f0226a2e6dadd422de3cff5 /dev-haskell/wxdirect/files | |
| parent | Bump wxcore to 0.90.1.1, loosen array dep in 0.13.2.3 (diff) | |
| download | gentoo-2-2d8c9d1bb2f94e72b8957d28ad29350ea047c2c3.tar.gz gentoo-2-2d8c9d1bb2f94e72b8957d28ad29350ea047c2c3.tar.bz2 gentoo-2-2d8c9d1bb2f94e72b8957d28ad29350ea047c2c3.zip | |
Bump wxdirect to 0.13.1.3 and 0.90.1.1
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell/wxdirect/files')
| -rw-r--r-- | dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch | 54 | ||||
| -rw-r--r-- | dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch | 38 |
2 files changed, 92 insertions, 0 deletions
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch b/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch new file mode 100644 index 000000000000..dfc484a1eb9a --- /dev/null +++ b/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch @@ -0,0 +1,54 @@ +--- wxdirect-0.13.1.3-orig/src/ParseEiffel.hs 2012-09-30 20:02:15.000000000 +1000 ++++ wxdirect-0.13.1.3/src/ParseEiffel.hs 2014-03-23 14:15:23.118131281 +1100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE ScopedTypeVariables #-} + ----------------------------------------------------------------------------------------- + {-| Module : ParseEiffel + Copyright : (c) Daan Leijen 2003 +@@ -12,6 +13,8 @@ + ----------------------------------------------------------------------------------------- + module ParseEiffel( parseEiffel ) where + ++import Prelude hiding ( catch ) ++import Control.Exception ( catch, IOException ) + import Data.Char( digitToInt ) + import Text.ParserCombinators.Parsec + import qualified Text.ParserCombinators.Parsec.Token as P +--- wxdirect-0.13.1.3-orig/src/Classes.hs 2012-09-30 20:02:15.000000000 +1000 ++++ wxdirect-0.13.1.3/src/Classes.hs 2014-03-23 14:15:23.118131281 +1100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + ----------------------------------------------------------------------------------------- + {-| Module : Classes + Copyright : (c) Daan Leijen 2003 +@@ -28,7 +29,9 @@ + import Data.List( sort, sortBy ) + import qualified Data.Set as Set + import qualified Data.Map as Map ++#if !MIN_VERSION_base(4,6,0) + import Prelude hiding ( catch ) ++#endif + import HaskellNames( haskellTypeName, isBuiltin ) + import Types + +--- wxdirect-0.13.1.3-orig/src/CompileClasses.hs 2012-09-30 20:02:15.000000000 +1000 ++++ wxdirect-0.13.1.3/src/CompileClasses.hs 2014-03-23 14:15:23.119131301 +1100 +@@ -89,7 +89,7 @@ + (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] + + methodCount = length decls +- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] ++ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] + + export = concat [ ["module " ++ moduleRoot ++ moduleName + , " ( -- * Global" ] +@@ -104,6 +104,9 @@ + , "import System.IO.Unsafe( unsafePerformIO )" + , "import " ++ moduleRoot ++ "WxcTypes" + , "import " ++ moduleRoot ++ moduleClassTypesName ++ , "#if (__GLASGOW_HASKELL__>=705)" ++ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" ++ , "#endif" + , "" + ] + ] diff --git a/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch new file mode 100644 index 000000000000..df29d1ba08b8 --- /dev/null +++ b/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch @@ -0,0 +1,38 @@ +--- wxdirect-0.90.1.1-orig/src/Classes.hs 2014-03-23 01:08:59.000000000 +1100 ++++ wxdirect-0.90.1.1/src/Classes.hs 2014-03-23 15:43:57.402011540 +1100 +@@ -1,3 +1,4 @@ ++{-# LANGUAGE CPP #-} + ----------------------------------------------------------------------------------------- + {-| Module : Classes + Copyright : (c) Daan Leijen 2003 +@@ -24,6 +25,9 @@ + + import qualified Data.Set as Set + import qualified Data.Map as Map ++#if !MIN_VERSION_base(4,6,0) ++import Prelude hiding ( catch ) ++#endif + import Text.Parsec.Prim hiding ( try ) + import HaskellNames( haskellTypeName, isBuiltin ) + import Types +--- wxdirect-0.90.1.1-orig/src/CompileClasses.hs 2014-03-23 01:08:59.000000000 +1100 ++++ wxdirect-0.90.1.1/src/CompileClasses.hs 2014-03-23 15:42:14.123894206 +1100 +@@ -96,7 +96,7 @@ + (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] + + methodCount = length decls +- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] ++ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] + + export = concat [ ["module " ++ moduleRoot ++ moduleName + , " ( -- * Global" ] +@@ -111,6 +111,9 @@ + , "import Foreign.C.Types(CInt(..), CWchar(..), CChar(..), CDouble(..))" + , "import " ++ moduleRoot ++ "WxcTypes" + , "import " ++ moduleRoot ++ moduleClassTypesName ++ , "#if (__GLASGOW_HASKELL__>=705)" ++ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" ++ , "#endif" + , "" + ] + ] |