Permalink
Browse files

changes for ghc 7.2.2

  • Loading branch information...
1 parent 24657d0 commit 66796339a38d3850099ed06e5ac6caf510c6bbad @jutaro jutaro committed Nov 26, 2011
Showing with 30 additions and 18 deletions.
  1. +29 −17 leksah.cabal
  2. +1 −1 src/IDE/TextEditor.hs
View
@@ -1,5 +1,5 @@
name: leksah
-version: 0.10.0.5
+version: 0.11.0.0
cabal-version: >=1.8
build-type: Simple
license: GPL
@@ -14,7 +14,7 @@ synopsis: Haskell IDE written in Haskell
description: An Integrated Development Environment for Haskell written in Haskell.
category: Development, IDE, Editor
author: Juergen Nicklisch-Franken, Hamish Mackenzie
-tested-with: GHC ==6.10 || ==6.12 || ==7.0
+tested-with: GHC == 7.2.2
data-files: LICENSE
Readme
@@ -99,19 +99,24 @@ library
build-depends: dyre >= 0.8.3 && <0.9
cpp-options: -DLEKSAH_WITH_YI_DYRE
+ if (impl(ghc >= 7.2))
+ build-depends: process >= 1.1 && <1.2
+ else
+ build-depends: process-leksah >=1.0.1.3 && <1.1
+
hs-source-dirs: src
extensions: CPP
- build-depends: Cabal >=1.6.0.1 && <1.12, base >=4.0.0.0 && <4.5, binary >=0.5.0.0 && <0.6,
- bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,
- filepath >=1.1.0.1 && <1.3, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,
- gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.1, old-time >=1.0.0.1 && <1.1,
- parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
- regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.4,
- time >=0.1 && <1.3, ltk >= 0.10 && <0.11, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.2,
- hslogger >= 1.0.7 && <1.2, leksah-server >= 0.10.0.5 && <0.11, network >= 2.2 && <3.0,
- ghc >=6.10.1 && <7.3, strict >= 0.3.2 && <0.4, gio >=0.12 && <0.13, text, pango,
- enumerator >=0.4.14 && <0.5
+ build-depends: Cabal >=1.6.0.1 && <1.13, base >=4.0.0.0 && <4.5, binary >=0.5.0.0 && <0.6,
+ bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,
+ filepath >=1.1.0.1 && <1.3, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,
+ gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.1, old-time >=1.0.0.1 && <1.1,
+ parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
+ regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.4,
+ time >=0.1 && <1.3, ltk >= 0.10 && <0.12, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.3,
+ hslogger >= 1.0.7 && <1.2, leksah-server >= 0.10.0.5 && <0.12, network >= 2.2 && <3.0,
+ ghc >=6.10.1 && <7.3, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.9 && < 0.12,
+ gio >= 0.12.2 && < 0.13
if (impl(ghc >= 7.2))
build-depends: process >= 1.1 && <1.2
@@ -161,6 +166,12 @@ Executable leksah
if flag(yi) && flag(dyre)
cpp-options: -DLEKSAH_WITH_DYRE
+ if (impl(ghc >= 7.2))
+ build-depends: process >= 1.1 && <1.2
+ else
+ build-depends: process-leksah >=1.0.1.3 && <1.1
+
+
if impl(ghc < 7.0) && flag(yi)
build-depends: yi >=0.6.1 && <0.7
@@ -173,14 +184,15 @@ Executable leksah
bytestring >=0.9.0.1 && <0.10, containers >=0.2.0.0 && <0.5, directory >=1.0.0.2 && <3.1,
filepath >=1.1.0.1 && <1.3, glib >=0.10 && <0.13, gtk >=0.10 && <0.13,
gtksourceview2 >=0.10.0 && <0.13, mtl >=1.1.0.2 && <2.1, old-time >=1.0.0.1 && <1.1,
- parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2, process-leksah >=1.0.1.3 && <1.1,
+ parsec >=2.1.0.1 && <3.2, pretty >=1.0.1.0 && <1.2,
regex-tdfa ==1.1.*, regex-base ==0.93.*, utf8-string >=0.3.1.1 && <0.4, array >=0.2.0.0 && <0.4,
- time >=0.1 && <1.3, ltk >= 0.10 && <0.11, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.2,
- hslogger >= 1.0.7 && <1.2, leksah-server >= 0.10.0.5 && <0.11, network >= 2.2 && <3.0,
- ghc >=6.10.1 && <7.3, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5
+ time >=0.1 && <1.3, ltk >= 0.10 && <0.12, binary-shared >= 0.8 && <0.9, deepseq >= 1.1.0.0 && <1.3,
+ hslogger >= 1.0.7 && <1.2, leksah-server >= 0.10.0.5 && <0.12, network >= 2.2 && <3.0,
+ ghc >=6.10.1 && <7.3, strict >= 0.3.2 && <0.4, enumerator >=0.4.14 && <0.5, text >= 0.11.1.9 && < 0.12,
+ gio >= 0.12.2 && < 0.13
else
hs-source-dirs: main
- build-depends: leksah ==0.10.0.5, base >=4.0.0.0 && <= 5
+ build-depends: leksah ==0.11.0.0, base >=4.0.0.0 && <= 5
main-is: Main.hs
buildable: True
View
@@ -151,7 +151,7 @@ import qualified Graphics.UI.Gtk.Multiline.TextView as Gtk
import qualified Graphics.UI.Gtk.Scrolling.ScrolledWindow
import Graphics.UI.Gtk.Multiline.TextTag
import Graphics.UI.Gtk.Gdk.Cursor
-import Graphics.Rendering.Pango
+--import Graphics.Rendering.Pango
import System.Glib.Attributes
import System.Glib.MainLoop
import qualified Graphics.UI.Gtk.Multiline.TextView as Gtk

0 comments on commit 6679633

Please sign in to comment.