desktop/xmonad: Updated for version 0.9.2.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>

5 files changed, 20 insertions, 20 deletions

diff --git a/desktop/xmonad/README b/desktop/xmonad/README
index 70f07cbf2d..de47369e46 100644
--- a/desktop/xmonad/README
+++ b/desktop/xmonad/README
@@ -1,11 +1,10 @@
-xmonad (stable, featureful, and easy tiling window manager for X11)
-
 xmonad is a dynamically tiling X11 window manager that is written
 and configured in Haskell. In a normal WM, you spend half your time
 aligning and searching for windows. xmonad makes work easier, by
 automating this.
 
-This requires ghc, haskell-mtl and haskell-X11.
+This requires ghc, haskell-transformers, haskell-mtl, haskell-syb and
+haskell-X11.
 
 After installing, use 'xwmconfig' command to reselect xmonad as window
 manager, either as root to do system-wide selection or as normal user
diff --git a/desktop/xmonad/slack-desc b/desktop/xmonad/slack-desc
index fad4ca4368..2110ef6e43 100644
--- a/desktop/xmonad/slack-desc
+++ b/desktop/xmonad/slack-desc
@@ -7,13 +7,13 @@
 
       |-----handy-ruler------------------------------------------------------|
 xmonad: xmonad (stable, featureful, and easy tiling window manager for X11)
-xmonad: 
+xmonad:
 xmonad: xmonad is a dynamically tiling X11 window manager that is written
 xmonad: and configured in Haskell. In a normal WM, you spend half your time
 xmonad: aligning and searching for windows. xmonad makes work easier, by
 xmonad: automating this.
-xmonad: 
+xmonad:
 xmonad: http://www.xmonad.org/
-xmonad: 
-xmonad: 
-xmonad: 
+xmonad:
+xmonad:
+xmonad:
diff --git a/desktop/xmonad/xmonad.SlackBuild b/desktop/xmonad/xmonad.SlackBuild
index 98861d9129..4ab3530a0d 100644
--- a/desktop/xmonad/xmonad.SlackBuild
+++ b/desktop/xmonad/xmonad.SlackBuild
@@ -6,8 +6,8 @@
 # Public domain.
 
 PRGNAM=xmonad
-VERSION=${VERSION:-0.9.1}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-0.9.2}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 GHC_VERSION=$(ghc --numeric-version)
@@ -67,7 +67,8 @@ runghc Setup.lhs configure \
   --flags="threaded dynamic"
 
 runghc Setup.lhs build
-runghc Setup.lhs haddock
+# Known bug that docs of 0.9.2 do not build on GHC7
+#runghc Setup.lhs haddock
 runghc Setup.lhs copy --destdir=$PKG
 runghc Setup.lhs register --gen-pkg-config
 
diff --git a/desktop/xmonad/xmonad.info b/desktop/xmonad/xmonad.info
index deb5ee042c..7a21ad12e1 100644
--- a/desktop/xmonad/xmonad.info
+++ b/desktop/xmonad/xmonad.info
@@ -1,10 +1,10 @@
 PRGNAM="xmonad"
-VERSION="0.9.1"
+VERSION="0.9.2"
 HOMEPAGE="http://xmonad.org/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.9.1/xmonad-0.9.1.tar.gz"
-MD5SUM="3d0dd5cf77768b10e1b7f3a47e32b09e"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.9.2/xmonad-0.9.2.tar.gz"
+MD5SUM="5a4117f798664d772d2a834ea6c90f1c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="Erik Hanson"
+APPROVED="dsomero"
diff --git a/desktop/xmonad/xmonad_cabal.patch b/desktop/xmonad/xmonad_cabal.patch
index 1d2d419191..83486c2484 100644
--- a/desktop/xmonad/xmonad_cabal.patch
+++ b/desktop/xmonad/xmonad_cabal.patch
@@ -1,6 +1,6 @@
---- xmonad.cabal.orig	2010-06-24 04:07:24.000000000 +0300
-+++ xmonad.cabal	2010-06-24 04:09:57.000000000 +0300
-@@ -32,6 +32,14 @@
+--- xmonad.cabal.orig	2011-01-03 15:29:54.000000000 +0200
++++ xmonad.cabal	2011-01-03 15:30:55.000000000 +0200
+@@ -33,6 +33,14 @@
      description: Testing mode, only build minimal components
      default: False
  
@@ -15,10 +15,10 @@
  library
      exposed-modules:    XMonad
                          XMonad.Main
-@@ -77,3 +85,7 @@
+@@ -88,3 +96,7 @@
          ghc-options:    -Werror
      if flag(testing) && flag(small_base)
-         build-depends:  random
+         build-depends:  filepath, process, directory, mtl, unix, X11, base, containers, random, extensible-exceptions
 +    if flag(threaded)
 +        ghc-options:    -threaded
 +    if flag(dynamic)