Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-haskell/wxdirect/files: wxdirect-0.90.0.1-ghc-7.5.patch wxdirect-0.13.1.2-ghc-7.6.patch
Date: Thu, 27 Dec 2012 02:55:29
Message-Id: 20121227025518.E4A842171F@flycatcher.gentoo.org
1 gienah 12/12/27 02:55:18
2
3 Added: wxdirect-0.90.0.1-ghc-7.5.patch
4 wxdirect-0.13.1.2-ghc-7.6.patch
5 Log:
6 Bump wxdirect to 0.13.1.2 and 0.90.0.1, fixes Bug 424073 - dev-haskell/wxdirect-0.12.1.3: fails to build.
7
8 (Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
9
10 Revision Changes Path
11 1.1 dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch?rev=1.1&content-type=text/plain
15
16 Index: wxdirect-0.90.0.1-ghc-7.5.patch
17 ===================================================================
18 --- wxdirect-0.90.0.1-orig/wxdirect.cabal 2012-04-19 01:05:11.000000000 +1000
19 +++ wxdirect-0.90.0.1/wxdirect.cabal 2012-05-19 21:12:02.612085338 +1000
20 @@ -66,7 +66,7 @@
21 if flag(splitBase)
22 build-depends:
23 base >= 4 && < 5,
24 - containers >= 0.2 && < 0.5
25 + containers >= 0.2 && < 0.6
26 else
27 build-depends:
28 base >= 3 && < 4,
29 --- wxdirect-0.90.0.1-orig/src/Classes.hs 2012-04-19 01:05:10.000000000 +1000
30 +++ wxdirect-0.90.0.1/src/Classes.hs 2012-07-14 13:58:48.072492467 +1000
31 @@ -1,3 +1,4 @@
32 +{-# LANGUAGE CPP #-}
33 -----------------------------------------------------------------------------------------
34 {-| Module : Classes
35 Copyright : (c) Daan Leijen 2003
36 @@ -28,7 +29,9 @@
37 import Data.List( sort, sortBy )
38 import qualified Data.Set as Set
39 import qualified Data.Map as Map
40 +#if !MIN_VERSION_base(4,6,0)
41 import Prelude hiding ( catch )
42 +#endif
43 import HaskellNames( haskellTypeName, isBuiltin )
44 import Types
45
46 --- wxdirect-0.90.0.1-orig/src/CompileClasses.hs 2012-04-19 01:05:10.000000000 +1000
47 +++ wxdirect-0.90.0.1/src/CompileClasses.hs 2012-05-19 21:28:27.358052781 +1000
48 @@ -89,7 +89,7 @@
49 (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
50
51 methodCount = length decls
52 - ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
53 + ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
54
55 export = concat [ ["module " ++ moduleRoot ++ moduleName
56 , " ( -- * Global" ]
57 @@ -103,6 +103,9 @@
58 , "import System.IO.Unsafe( unsafePerformIO )"
59 , "import " ++ moduleRoot ++ "WxcTypes"
60 , "import " ++ moduleRoot ++ moduleClassTypesName
61 + , "#if (__GLASGOW_HASKELL__>=705)"
62 + , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))"
63 + , "#endif"
64 , ""
65 ]
66 ]
67
68
69
70 1.1 dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch
71
72 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch?rev=1.1&view=markup
73 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/wxdirect/files/wxdirect-0.13.1.2-ghc-7.6.patch?rev=1.1&content-type=text/plain
74
75 Index: wxdirect-0.13.1.2-ghc-7.6.patch
76 ===================================================================
77 --- wxdirect-0.13.1.2-orig/wxdirect.cabal 2012-02-07 18:26:28.000000000 +1100
78 +++ wxdirect-0.13.1.2/wxdirect.cabal 2012-11-29 17:03:30.132111644 +1100
79 @@ -68,7 +68,7 @@
80 if flag(splitBase)
81 build-depends:
82 base >= 4 && < 5,
83 - containers >= 0.2 && < 0.5
84 + containers >= 0.2 && < 0.6
85 else
86 build-depends:
87 base >= 3 && < 4,
88 --- wxdirect-0.13.1.2-orig/src/ParseEiffel.hs 2012-02-07 18:26:28.000000000 +1100
89 +++ wxdirect-0.13.1.2/src/ParseEiffel.hs 2012-11-29 16:13:33.791009108 +1100
90 @@ -1,3 +1,4 @@
91 +{-# LANGUAGE ScopedTypeVariables #-}
92 -----------------------------------------------------------------------------------------
93 {-| Module : ParseEiffel
94 Copyright : (c) Daan Leijen 2003
95 @@ -12,6 +13,7 @@
96 -----------------------------------------------------------------------------------------
97 module ParseEiffel( parseEiffel ) where
98
99 +import Control.Exception ( catch, IOException )
100 import Data.Char( digitToInt )
101 import Text.ParserCombinators.Parsec
102 import qualified Text.ParserCombinators.Parsec.Token as P
103 @@ -33,7 +35,7 @@
104
105 getDefaultEiffelFiles :: IO [FilePath]
106 getDefaultEiffelFiles
107 - = do wxwin <- getEnv "WXWIN" `catch` \err -> return ""
108 + = do wxwin <- getEnv "WXWIN" `catch` \(err::IOException) -> return ""
109 return [wxwin ++ "/wxc/include/wxc_defs.e"
110 ,wxwin ++ "/wxc/ewxw/eiffel/spec/r_2_4/wx_defs.e"]
111
112 --- wxdirect-0.13.1.2-orig/src/Classes.hs 2012-02-07 18:26:28.000000000 +1100
113 +++ wxdirect-0.13.1.2/src/Classes.hs 2012-11-29 17:12:55.416713615 +1100
114 @@ -1,3 +1,4 @@
115 +{-# LANGUAGE CPP #-}
116 -----------------------------------------------------------------------------------------
117 {-| Module : Classes
118 Copyright : (c) Daan Leijen 2003
119 @@ -28,7 +29,9 @@
120 import Data.List( sort, sortBy )
121 import qualified Data.Set as Set
122 import qualified Data.Map as Map
123 +#if !MIN_VERSION_base(4,6,0)
124 import Prelude hiding ( catch )
125 +#endif
126 import HaskellNames( haskellTypeName, isBuiltin )
127 import Types
128
129 --- wxdirect-0.13.1.2-orig/src/CompileClasses.hs 2012-02-07 18:26:28.000000000 +1100
130 +++ wxdirect-0.13.1.2/src/CompileClasses.hs 2012-11-29 17:12:55.417713640 +1100
131 @@ -89,7 +89,7 @@
132 (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass []
133
134 methodCount = length decls
135 - ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"]
136 + ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"]
137
138 export = concat [ ["module " ++ moduleRoot ++ moduleName
139 , " ( -- * Global" ]
140 @@ -103,6 +103,9 @@
141 , "import System.IO.Unsafe( unsafePerformIO )"
142 , "import " ++ moduleRoot ++ "WxcTypes"
143 , "import " ++ moduleRoot ++ moduleClassTypesName
144 + , "#if (__GLASGOW_HASKELL__>=705)"
145 + , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))"
146 + , "#endif"
147 , ""
148 ]
149 ]
Report Message
Find on MARC Find on Google Groups