| 1 |
gienah 14/03/23 15:05:13 |
| 2 |
|
| 3 |
Added: wxdirect-0.13.1.3-ghc-7.6.patch |
| 4 |
wxdirect-0.90.1.1-ghc-7.5.patch |
| 5 |
Log: |
| 6 |
Bump wxdirect to 0.13.1.3 and 0.90.1.1 |
| 7 |
|
| 8 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 618E971F) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxdirect/files/wxdirect-0.13.1.3-ghc-7.6.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: wxdirect-0.13.1.3-ghc-7.6.patch |
| 17 |
=================================================================== |
| 18 |
--- wxdirect-0.13.1.3-orig/src/ParseEiffel.hs 2012-09-30 20:02:15.000000000 +1000 |
| 19 |
+++ wxdirect-0.13.1.3/src/ParseEiffel.hs 2014-03-23 14:15:23.118131281 +1100 |
| 20 |
@@ -1,3 +1,4 @@ |
| 21 |
+{-# LANGUAGE ScopedTypeVariables #-} |
| 22 |
----------------------------------------------------------------------------------------- |
| 23 |
{-| Module : ParseEiffel |
| 24 |
Copyright : (c) Daan Leijen 2003 |
| 25 |
@@ -12,6 +13,8 @@ |
| 26 |
----------------------------------------------------------------------------------------- |
| 27 |
module ParseEiffel( parseEiffel ) where |
| 28 |
|
| 29 |
+import Prelude hiding ( catch ) |
| 30 |
+import Control.Exception ( catch, IOException ) |
| 31 |
import Data.Char( digitToInt ) |
| 32 |
import Text.ParserCombinators.Parsec |
| 33 |
import qualified Text.ParserCombinators.Parsec.Token as P |
| 34 |
--- wxdirect-0.13.1.3-orig/src/Classes.hs 2012-09-30 20:02:15.000000000 +1000 |
| 35 |
+++ wxdirect-0.13.1.3/src/Classes.hs 2014-03-23 14:15:23.118131281 +1100 |
| 36 |
@@ -1,3 +1,4 @@ |
| 37 |
+{-# LANGUAGE CPP #-} |
| 38 |
----------------------------------------------------------------------------------------- |
| 39 |
{-| Module : Classes |
| 40 |
Copyright : (c) Daan Leijen 2003 |
| 41 |
@@ -28,7 +29,9 @@ |
| 42 |
import Data.List( sort, sortBy ) |
| 43 |
import qualified Data.Set as Set |
| 44 |
import qualified Data.Map as Map |
| 45 |
+#if !MIN_VERSION_base(4,6,0) |
| 46 |
import Prelude hiding ( catch ) |
| 47 |
+#endif |
| 48 |
import HaskellNames( haskellTypeName, isBuiltin ) |
| 49 |
import Types |
| 50 |
|
| 51 |
--- wxdirect-0.13.1.3-orig/src/CompileClasses.hs 2012-09-30 20:02:15.000000000 +1000 |
| 52 |
+++ wxdirect-0.13.1.3/src/CompileClasses.hs 2014-03-23 14:15:23.119131301 +1100 |
| 53 |
@@ -89,7 +89,7 @@ |
| 54 |
(exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] |
| 55 |
|
| 56 |
methodCount = length decls |
| 57 |
- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] |
| 58 |
+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] |
| 59 |
|
| 60 |
export = concat [ ["module " ++ moduleRoot ++ moduleName |
| 61 |
, " ( -- * Global" ] |
| 62 |
@@ -104,6 +104,9 @@ |
| 63 |
, "import System.IO.Unsafe( unsafePerformIO )" |
| 64 |
, "import " ++ moduleRoot ++ "WxcTypes" |
| 65 |
, "import " ++ moduleRoot ++ moduleClassTypesName |
| 66 |
+ , "#if (__GLASGOW_HASKELL__>=705)" |
| 67 |
+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" |
| 68 |
+ , "#endif" |
| 69 |
, "" |
| 70 |
] |
| 71 |
] |
| 72 |
|
| 73 |
|
| 74 |
|
| 75 |
1.1 dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch |
| 76 |
|
| 77 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch?rev=1.1&view=markup |
| 78 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch?rev=1.1&content-type=text/plain |
| 79 |
|
| 80 |
Index: wxdirect-0.90.1.1-ghc-7.5.patch |
| 81 |
=================================================================== |
| 82 |
--- wxdirect-0.90.1.1-orig/src/Classes.hs 2014-03-23 01:08:59.000000000 +1100 |
| 83 |
+++ wxdirect-0.90.1.1/src/Classes.hs 2014-03-23 15:43:57.402011540 +1100 |
| 84 |
@@ -1,3 +1,4 @@ |
| 85 |
+{-# LANGUAGE CPP #-} |
| 86 |
----------------------------------------------------------------------------------------- |
| 87 |
{-| Module : Classes |
| 88 |
Copyright : (c) Daan Leijen 2003 |
| 89 |
@@ -24,6 +25,9 @@ |
| 90 |
|
| 91 |
import qualified Data.Set as Set |
| 92 |
import qualified Data.Map as Map |
| 93 |
+#if !MIN_VERSION_base(4,6,0) |
| 94 |
+import Prelude hiding ( catch ) |
| 95 |
+#endif |
| 96 |
import Text.Parsec.Prim hiding ( try ) |
| 97 |
import HaskellNames( haskellTypeName, isBuiltin ) |
| 98 |
import Types |
| 99 |
--- wxdirect-0.90.1.1-orig/src/CompileClasses.hs 2014-03-23 01:08:59.000000000 +1100 |
| 100 |
+++ wxdirect-0.90.1.1/src/CompileClasses.hs 2014-03-23 15:42:14.123894206 +1100 |
| 101 |
@@ -96,7 +96,7 @@ |
| 102 |
(exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] |
| 103 |
|
| 104 |
methodCount = length decls |
| 105 |
- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] |
| 106 |
+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] |
| 107 |
|
| 108 |
export = concat [ ["module " ++ moduleRoot ++ moduleName |
| 109 |
, " ( -- * Global" ] |
| 110 |
@@ -111,6 +111,9 @@ |
| 111 |
, "import Foreign.C.Types(CInt(..), CWchar(..), CChar(..), CDouble(..))" |
| 112 |
, "import " ++ moduleRoot ++ "WxcTypes" |
| 113 |
, "import " ++ moduleRoot ++ moduleClassTypesName |
| 114 |
+ , "#if (__GLASGOW_HASKELL__>=705)" |
| 115 |
+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" |
| 116 |
+ , "#endif" |
| 117 |
, "" |
| 118 |
] |
| 119 |
] |
Archives