5 files changed, 31 insertions, 20 deletions
diff --git a/desktop/xmonad/README b/desktop/xmonad/README
index de47369e46..655d7a3e30 100644
--- a/desktop/xmonad/README
+++ b/desktop/xmonad/README
@@ -3,8 +3,8 @@ 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-transformers, haskell-mtl, haskell-syb and
-haskell-X11.
+This requires ghc, haskell-utf8-string, 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/xmonad.SlackBuild b/desktop/xmonad/xmonad.SlackBuild
index eb8070a51b..fb0bb01d0b 100644
--- a/desktop/xmonad/xmonad.SlackBuild
+++ b/desktop/xmonad/xmonad.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for xmonad
 
-# Copyright 2011 Mikko Värri, Finland
+# Copyright 2012 Mikko Värri, Finland
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xmonad
-VERSION=${VERSION:-0.9.2}
+VERSION=${VERSION:-0.10}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -76,18 +76,18 @@ patch -p0 <$CWD/xmonad_cabal.patch
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-runghc Setup.lhs configure \
+runghc Setup configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --libsubdir=ghc-${GHC_VERSION}/$PRGNAM-$VERSION \
   --enable-shared \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --flags="threaded dynamic"
 
-runghc Setup.lhs build
-# 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
+runghc Setup build
+runghc Setup haddock
+runghc Setup copy --destdir=$PKG
+runghc Setup register --gen-pkg-config
 
 PKGCONFD=/usr/lib${LIBDIRSUFFIX}/ghc-${GHC_VERSION}/package.conf.d
 PKGID=$( grep -E "^id: " $PRGNAM-$VERSION.conf | cut -d" " -f2 )
@@ -110,7 +110,11 @@ mkdir -p $PKG/etc/X11/xinit
 cat $CWD/xinitrc.xmonad > $PKG/etc/X11/xinit/xinitrc.xmonad
 chmod 0755 $PKG/etc/X11/xinit/xinitrc.xmonad
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+# Add KDM registration file
+mkdir -p $PKG/usr/share/apps/kdm/sessions
+cp $CWD/xmonad.desktop $PKG/usr/share/apps/kdm/sessions/xmonad.desktop
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
@@ -120,8 +124,8 @@ cp -a CONFIG README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/desktop/xmonad/xmonad.desktop b/desktop/xmonad/xmonad.desktop
new file mode 100644
index 0000000000..8c451c6864
--- /dev/null
+++ b/desktop/xmonad/xmonad.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Exec=/usr/bin/xmonad
+TryExec=/usr/bin/xmonad
+Name=xmonad
+Comment=xmonad -- tiling window manager
diff --git a/desktop/xmonad/xmonad.info b/desktop/xmonad/xmonad.info
index 7a21ad12e1..b7b0a9679d 100644
--- a/desktop/xmonad/xmonad.info
+++ b/desktop/xmonad/xmonad.info
@@ -1,10 +1,10 @@
 PRGNAM="xmonad"
-VERSION="0.9.2"
+VERSION="0.10"
 HOMEPAGE="http://xmonad.org/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.9.2/xmonad-0.9.2.tar.gz"
-MD5SUM="5a4117f798664d772d2a834ea6c90f1c"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.10/xmonad-0.10.tar.gz"
+MD5SUM="f8381e1ec15137863558a454d4466467"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Mikko Värri"
 EMAIL="vmj@linuxbox.fi"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/desktop/xmonad/xmonad_cabal.patch b/desktop/xmonad/xmonad_cabal.patch
index 83486c2484..ece0834cb1 100644
--- a/desktop/xmonad/xmonad_cabal.patch
+++ b/desktop/xmonad/xmonad_cabal.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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 @@
      description: Testing mode, only build minimal components
      default: False