| 1 |
commit: b137e1dd0a59e550f45a45aee56f10257f01b636 |
| 2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Jul 28 17:00:08 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 3 07:21:54 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b137e1dd |
| 7 |
|
| 8 |
dev-haskell/wxdirect: remove unused patch |
| 9 |
|
| 10 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 11 |
|
| 12 |
.../wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch | 74 ---------------------- |
| 13 |
.../wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch | 49 -------------- |
| 14 |
2 files changed, 123 deletions(-) |
| 15 |
|
| 16 |
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 |
| 17 |
deleted file mode 100644 |
| 18 |
index 0dc58a6..0000000 |
| 19 |
--- a/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch |
| 20 |
+++ /dev/null |
| 21 |
@@ -1,74 +0,0 @@ |
| 22 |
---- wxdirect-0.13.1.2-orig/wxdirect.cabal 2012-02-07 18:26:28.000000000 +1100 |
| 23 |
-+++ wxdirect-0.13.1.2/wxdirect.cabal 2012-11-29 17:03:30.132111644 +1100 |
| 24 |
-@@ -68,7 +68,7 @@ |
| 25 |
- if flag(splitBase) |
| 26 |
- build-depends: |
| 27 |
- base >= 4 && < 5, |
| 28 |
-- containers >= 0.2 && < 0.5 |
| 29 |
-+ containers >= 0.2 && < 0.6 |
| 30 |
- else |
| 31 |
- build-depends: |
| 32 |
- base >= 3 && < 4, |
| 33 |
---- wxdirect-0.13.1.2-orig/src/ParseEiffel.hs 2012-02-07 18:26:28.000000000 +1100 |
| 34 |
-+++ wxdirect-0.13.1.2/src/ParseEiffel.hs 2013-01-11 20:11:46.192991896 +1100 |
| 35 |
-@@ -1,3 +1,4 @@ |
| 36 |
-+{-# LANGUAGE ScopedTypeVariables #-} |
| 37 |
- ----------------------------------------------------------------------------------------- |
| 38 |
- {-| Module : ParseEiffel |
| 39 |
- Copyright : (c) Daan Leijen 2003 |
| 40 |
-@@ -12,6 +13,8 @@ |
| 41 |
- ----------------------------------------------------------------------------------------- |
| 42 |
- module ParseEiffel( parseEiffel ) where |
| 43 |
- |
| 44 |
-+import Prelude hiding ( catch ) |
| 45 |
-+import Control.Exception ( catch, IOException ) |
| 46 |
- import Data.Char( digitToInt ) |
| 47 |
- import Text.ParserCombinators.Parsec |
| 48 |
- import qualified Text.ParserCombinators.Parsec.Token as P |
| 49 |
-@@ -33,7 +36,7 @@ |
| 50 |
- |
| 51 |
- getDefaultEiffelFiles :: IO [FilePath] |
| 52 |
- getDefaultEiffelFiles |
| 53 |
-- = do wxwin <- getEnv "WXWIN" `catch` \err -> return "" |
| 54 |
-+ = do wxwin <- getEnv "WXWIN" `catch` \(err::IOException) -> return "" |
| 55 |
- return [wxwin ++ "/wxc/include/wxc_defs.e" |
| 56 |
- ,wxwin ++ "/wxc/ewxw/eiffel/spec/r_2_4/wx_defs.e"] |
| 57 |
- |
| 58 |
---- wxdirect-0.13.1.2-orig/src/Classes.hs 2012-02-07 18:26:28.000000000 +1100 |
| 59 |
-+++ wxdirect-0.13.1.2/src/Classes.hs 2012-11-29 17:12:55.416713615 +1100 |
| 60 |
-@@ -1,3 +1,4 @@ |
| 61 |
-+{-# LANGUAGE CPP #-} |
| 62 |
- ----------------------------------------------------------------------------------------- |
| 63 |
- {-| Module : Classes |
| 64 |
- Copyright : (c) Daan Leijen 2003 |
| 65 |
-@@ -28,7 +29,9 @@ |
| 66 |
- import Data.List( sort, sortBy ) |
| 67 |
- import qualified Data.Set as Set |
| 68 |
- import qualified Data.Map as Map |
| 69 |
-+#if !MIN_VERSION_base(4,6,0) |
| 70 |
- import Prelude hiding ( catch ) |
| 71 |
-+#endif |
| 72 |
- import HaskellNames( haskellTypeName, isBuiltin ) |
| 73 |
- import Types |
| 74 |
- |
| 75 |
---- wxdirect-0.13.1.2-orig/src/CompileClasses.hs 2012-02-07 18:26:28.000000000 +1100 |
| 76 |
-+++ wxdirect-0.13.1.2/src/CompileClasses.hs 2012-11-29 17:12:55.417713640 +1100 |
| 77 |
-@@ -89,7 +89,7 @@ |
| 78 |
- (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] |
| 79 |
- |
| 80 |
- methodCount = length decls |
| 81 |
-- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] |
| 82 |
-+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] |
| 83 |
- |
| 84 |
- export = concat [ ["module " ++ moduleRoot ++ moduleName |
| 85 |
- , " ( -- * Global" ] |
| 86 |
-@@ -103,6 +103,9 @@ |
| 87 |
- , "import System.IO.Unsafe( unsafePerformIO )" |
| 88 |
- , "import " ++ moduleRoot ++ "WxcTypes" |
| 89 |
- , "import " ++ moduleRoot ++ moduleClassTypesName |
| 90 |
-+ , "#if (__GLASGOW_HASKELL__>=705)" |
| 91 |
-+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" |
| 92 |
-+ , "#endif" |
| 93 |
- , "" |
| 94 |
- ] |
| 95 |
- ] |
| 96 |
|
| 97 |
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 |
| 98 |
deleted file mode 100644 |
| 99 |
index 75d9bf2..0000000 |
| 100 |
--- a/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch |
| 101 |
+++ /dev/null |
| 102 |
@@ -1,49 +0,0 @@ |
| 103 |
---- wxdirect-0.90.0.1-orig/wxdirect.cabal 2012-04-19 01:05:11.000000000 +1000 |
| 104 |
-+++ wxdirect-0.90.0.1/wxdirect.cabal 2012-05-19 21:12:02.612085338 +1000 |
| 105 |
-@@ -66,7 +66,7 @@ |
| 106 |
- if flag(splitBase) |
| 107 |
- build-depends: |
| 108 |
- base >= 4 && < 5, |
| 109 |
-- containers >= 0.2 && < 0.5 |
| 110 |
-+ containers >= 0.2 && < 0.6 |
| 111 |
- else |
| 112 |
- build-depends: |
| 113 |
- base >= 3 && < 4, |
| 114 |
---- wxdirect-0.90.0.1-orig/src/Classes.hs 2012-04-19 01:05:10.000000000 +1000 |
| 115 |
-+++ wxdirect-0.90.0.1/src/Classes.hs 2012-07-14 13:58:48.072492467 +1000 |
| 116 |
-@@ -1,3 +1,4 @@ |
| 117 |
-+{-# LANGUAGE CPP #-} |
| 118 |
- ----------------------------------------------------------------------------------------- |
| 119 |
- {-| Module : Classes |
| 120 |
- Copyright : (c) Daan Leijen 2003 |
| 121 |
-@@ -28,7 +29,9 @@ |
| 122 |
- import Data.List( sort, sortBy ) |
| 123 |
- import qualified Data.Set as Set |
| 124 |
- import qualified Data.Map as Map |
| 125 |
-+#if !MIN_VERSION_base(4,6,0) |
| 126 |
- import Prelude hiding ( catch ) |
| 127 |
-+#endif |
| 128 |
- import HaskellNames( haskellTypeName, isBuiltin ) |
| 129 |
- import Types |
| 130 |
- |
| 131 |
---- wxdirect-0.90.0.1-orig/src/CompileClasses.hs 2012-04-19 01:05:10.000000000 +1000 |
| 132 |
-+++ wxdirect-0.90.0.1/src/CompileClasses.hs 2012-05-19 21:28:27.358052781 +1000 |
| 133 |
-@@ -89,7 +89,7 @@ |
| 134 |
- (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] |
| 135 |
- |
| 136 |
- methodCount = length decls |
| 137 |
-- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] |
| 138 |
-+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] |
| 139 |
- |
| 140 |
- export = concat [ ["module " ++ moduleRoot ++ moduleName |
| 141 |
- , " ( -- * Global" ] |
| 142 |
-@@ -103,6 +103,9 @@ |
| 143 |
- , "import System.IO.Unsafe( unsafePerformIO )" |
| 144 |
- , "import " ++ moduleRoot ++ "WxcTypes" |
| 145 |
- , "import " ++ moduleRoot ++ moduleClassTypesName |
| 146 |
-+ , "#if (__GLASGOW_HASKELL__>=705)" |
| 147 |
-+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" |
| 148 |
-+ , "#endif" |
| 149 |
- , "" |
| 150 |
- ] |
| 151 |
- ] |
Archives