summaryrefslogtreecommitdiff
path: root/desktop/xmonad/xmonad_cabal.patch
diff options
context:
space:
mode:
authorMikko Värri <vmj@linuxbox.fi>2012-06-27 16:25:01 -0400
committerdsomero <xgizzmo@slackbuilds.org>2012-06-27 16:25:01 -0400
commitbffbaabf9cb5353f073f22b42872088e59cc0e23 (patch)
tree733938918551ad6ad261c1a2636f373af1ed9b96 /desktop/xmonad/xmonad_cabal.patch
parent8863badc72be7687bea5e2a6352c379adc7e7d60 (diff)
downloadslackbuilds-bffbaabf9cb5353f073f22b42872088e59cc0e23.tar.gz
desktop/xmonad: Adjust build for ghc 7.4.x.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
Diffstat (limited to 'desktop/xmonad/xmonad_cabal.patch')
-rw-r--r--desktop/xmonad/xmonad_cabal.patch23
1 files changed, 13 insertions, 10 deletions
diff --git a/desktop/xmonad/xmonad_cabal.patch b/desktop/xmonad/xmonad_cabal.patch
index ece0834cb1..599fbcb3c2 100644
--- a/desktop/xmonad/xmonad_cabal.patch
+++ b/desktop/xmonad/xmonad_cabal.patch
@@ -1,6 +1,6 @@
---- xmonad.cabal.orig 2011-11-19 01:14:36.000000000 +0200
-+++ xmonad.cabal 2012-01-05 14:57:48.000000000 +0200
-@@ -32,6 +32,14 @@
+--- xmonad.cabal.orig 2012-05-16 01:04:06.426000004 +0300
++++ xmonad.cabal 2012-05-16 01:04:39.336999960 +0300
+@@ -32,6 +32,10 @@
description: Testing mode, only build minimal components
default: False
@@ -8,18 +8,21 @@
+ description: Use threaded runtime for xmonad binary
+ default: False
+
-+flag dynamic
-+ description: Link xmonad binary dynamically
-+ default: False
-+
library
exposed-modules: XMonad
XMonad.Main
-@@ -88,3 +96,7 @@
+@@ -46,7 +54,7 @@
+ build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions
+ else
+ build-depends: base < 3
+- build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix,
++ build-depends: X11>=1.5.0.0 && < 1.7, mtl, unix,
+ utf8-string >= 0.3 && < 0.4
+
+ if true
+@@ -88,3 +96,5 @@
ghc-options: -Werror
if flag(testing) && flag(small_base)
build-depends: filepath, process, directory, mtl, unix, X11, base, containers, random, extensible-exceptions
+ if flag(threaded)
+ ghc-options: -threaded
-+ if flag(dynamic)
-+ ghc-options: -dynamic