Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix building WXWIDGETS_2_8 with GHC 7.6.1 #11

Merged
merged 3 commits into from

2 participants

@shelarcy

GHC 7.6.1 can't build WXWIDGETS_2_8 branch's wxdirect and wxcore. I made change to fix this problem.

I splited my changes into two part, their are general change ( shelarcy@5149eb3 ) and WXWIDGETS_2_8 specific one. So, I think that we can pick general change to fix HEAD's same problem.

I already uploaded fixed version to HackageDB. Becase HackageDB's version didn't reflect c31ca7c change, too. That causes building problem.

shelarcy added some commits
@shelarcy shelarcy Fix building with GHC 7.6.1
This change doesn't have WXWIDGETS_2_8 specific change for helping
to pick (or merge) this change to HEAD.

I'll commit WXWIDGETS_2_8 specific change next time.
5149eb3
@shelarcy shelarcy Fix building wx-2.8 with GHC 7.6.x
This is wx-2.8 specific change to fix building with GHC 7.6.x.
7a22efc
@shelarcy shelarcy Bump wxdirect version number to 0.13.1.3 a00bf24
@jodonoghue jodonoghue merged commit 4a204f8 into from
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Sep 30, 2012
  1. @shelarcy

    Fix building with GHC 7.6.1

    shelarcy authored
    This change doesn't have WXWIDGETS_2_8 specific change for helping
    to pick (or merge) this change to HEAD.
    
    I'll commit WXWIDGETS_2_8 specific change next time.
  2. @shelarcy

    Fix building wx-2.8 with GHC 7.6.x

    shelarcy authored
    This is wx-2.8 specific change to fix building with GHC 7.6.x.
  3. @shelarcy
This page is out of date. Refresh to see the latest.
View
1  wxcore/src/haskell/Graphics/UI/WXCore/Events.hs
@@ -237,6 +237,7 @@ import System.Environment( getProgName, getArgs )
import Foreign.StablePtr
import Foreign.Ptr
import Foreign.C.String
+import Foreign.C.Types
import Foreign.Marshal.Alloc
import Foreign.Marshal.Array
import Foreign.Marshal.Utils
View
2  wxcore/wxcore.cabal
@@ -209,7 +209,7 @@ library
build-depends:
array >= 0.2 && < 0.5,
base >= 4 && < 5,
- containers >= 0.2 && < 0.5
+ containers >= 0.2 && < 0.6
else
build-depends:
array >= 0.1 && < 0.3,
View
1  wxdirect/src/CompileClasses.hs
@@ -100,6 +100,7 @@ compileClassesFile showIgnore moduleRoot moduleClassTypesName moduleName outputF
, ""
, "import qualified Data.ByteString as B (ByteString, useAsCStringLen)"
, "import qualified Data.ByteString.Lazy as LB (ByteString, length, unpack)"
+ , "import Foreign.C.Types"
, "import System.IO.Unsafe( unsafePerformIO )"
, "import " ++ moduleRoot ++ "WxcTypes"
, "import " ++ moduleRoot ++ moduleClassTypesName
View
3  wxdirect/src/ParseEiffel.hs
@@ -20,6 +20,7 @@ import Text.ParserCombinators.Parsec.Language
import Types
import System.Environment ( getEnv )
+import System.IO.Error (catchIOError)
{-----------------------------------------------------------------------------------------
Testing
@@ -33,7 +34,7 @@ test
getDefaultEiffelFiles :: IO [FilePath]
getDefaultEiffelFiles
- = do wxwin <- getEnv "WXWIN" `catch` \err -> return ""
+ = do wxwin <- getEnv "WXWIN" `catchIOError` \err -> return ""
return [wxwin ++ "/wxc/include/wxc_defs.e"
,wxwin ++ "/wxc/ewxw/eiffel/spec/r_2_4/wx_defs.e"]
View
4 wxdirect/wxdirect.cabal
@@ -1,5 +1,5 @@
name: wxdirect
-version: 0.13.1.2
+version: 0.13.1.3
license: BSD3
license-file: LICENSE
author: Daan Leijen
@@ -68,7 +68,7 @@ executable wxdirect
if flag(splitBase)
build-depends:
base >= 4 && < 5,
- containers >= 0.2 && < 0.5
+ containers >= 0.2 && < 0.6
else
build-depends:
base >= 3 && < 4,
Something went wrong with that request. Please try again.