diff options
| -rw-r--r-- | dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch | 74 | ||||
| -rw-r--r-- | dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch | 49 |
2 files changed, 0 insertions, 123 deletions
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch b/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch deleted file mode 100644 index 0dc58a66f70..00000000000 --- a/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- wxdirect-0.13.1.2-orig/wxdirect.cabal 2012-02-07 18:26:28.000000000 +1100 -+++ wxdirect-0.13.1.2/wxdirect.cabal 2012-11-29 17:03:30.132111644 +1100 -@@ -68,7 +68,7 @@ - if flag(splitBase) - build-depends: - base >= 4 && < 5, -- containers >= 0.2 && < 0.5 -+ containers >= 0.2 && < 0.6 - else - build-depends: - base >= 3 && < 4, ---- wxdirect-0.13.1.2-orig/src/ParseEiffel.hs 2012-02-07 18:26:28.000000000 +1100 -+++ wxdirect-0.13.1.2/src/ParseEiffel.hs 2013-01-11 20:11:46.192991896 +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 -@@ -33,7 +36,7 @@ - - getDefaultEiffelFiles :: IO [FilePath] - getDefaultEiffelFiles -- = do wxwin <- getEnv "WXWIN" `catch` \err -> return "" -+ = do wxwin <- getEnv "WXWIN" `catch` \(err::IOException) -> return "" - return [wxwin ++ "/wxc/include/wxc_defs.e" - ,wxwin ++ "/wxc/ewxw/eiffel/spec/r_2_4/wx_defs.e"] - ---- wxdirect-0.13.1.2-orig/src/Classes.hs 2012-02-07 18:26:28.000000000 +1100 -+++ wxdirect-0.13.1.2/src/Classes.hs 2012-11-29 17:12:55.416713615 +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.2-orig/src/CompileClasses.hs 2012-02-07 18:26:28.000000000 +1100 -+++ wxdirect-0.13.1.2/src/CompileClasses.hs 2012-11-29 17:12:55.417713640 +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" ] -@@ -103,6 +103,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.0.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch deleted file mode 100644 index 75d9bf21c72..00000000000 --- a/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- wxdirect-0.90.0.1-orig/wxdirect.cabal 2012-04-19 01:05:11.000000000 +1000 -+++ wxdirect-0.90.0.1/wxdirect.cabal 2012-05-19 21:12:02.612085338 +1000 -@@ -66,7 +66,7 @@ - if flag(splitBase) - build-depends: - base >= 4 && < 5, -- containers >= 0.2 && < 0.5 -+ containers >= 0.2 && < 0.6 - else - build-depends: - base >= 3 && < 4, ---- wxdirect-0.90.0.1-orig/src/Classes.hs 2012-04-19 01:05:10.000000000 +1000 -+++ wxdirect-0.90.0.1/src/Classes.hs 2012-07-14 13:58:48.072492467 +1000 -@@ -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.90.0.1-orig/src/CompileClasses.hs 2012-04-19 01:05:10.000000000 +1000 -+++ wxdirect-0.90.0.1/src/CompileClasses.hs 2012-05-19 21:28:27.358052781 +1000 -@@ -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" ] -@@ -103,6 +103,9 @@ - , "import System.IO.Unsafe( unsafePerformIO )" - , "import " ++ moduleRoot ++ "WxcTypes" - , "import " ++ moduleRoot ++ moduleClassTypesName -+ , "#if (__GLASGOW_HASKELL__>=705)" -+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" -+ , "#endif" - , "" - ] - ] |