summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/wxdirect/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/wxdirect/files')
-rw-r--r--dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch74
-rw-r--r--dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch54
-rw-r--r--dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch49
-rw-r--r--dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch38
4 files changed, 215 insertions, 0 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
new file mode 100644
index 000000000000..0dc58a66f709
--- /dev/null
+++ b/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch
@@ -0,0 +1,74 @@
+--- 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.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.0.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
new file mode 100644
index 000000000000..75d9bf21c726
--- /dev/null
+++ b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
@@ -0,0 +1,49 @@
+--- 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"
+ , ""
+ ]
+ ]
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"
+ , ""
+ ]
+ ]