desktop/xmobar: Updated for version 0.15.

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

5 files changed, 61 insertions, 33 deletions

diff --git a/desktop/xmobar/README b/desktop/xmobar/README
index 1b79a3d21d30..550d70d95863 100644
--- a/desktop/xmobar/README
+++ b/desktop/xmobar/README
@@ -1,12 +1,11 @@
-xmobar (A Minimalistic Text Based Status Bar)
-
-It was designed to work with the xmonad Window Manager.
+Xmobar was designed to work with the xmonad Window Manager.
 
 It was inspired by the Ion3 status bar, and supports similar features,
-like dynamic color management, output templates, and extensibility 
+like dynamic color management, output templates, and extensibility
 through plugins.
 
-This requires ghc, haskell-X11, haskell-X11-xft, haskell-mtl, haskell-stm,
-haskell-parsec, and haskell-hinotify.
+This requires ghc, haskell-hinotify, haskell-stm, haskell-syb,
+haskell-text, haskell-transformers, haskell-utf8-string, haskell-X11,
+haskell-mtl, haskell-X11-xft, and haskell-parsec.
 
 haskell-xmonad-contrib is recommended.
diff --git a/desktop/xmobar/slack-desc b/desktop/xmobar/slack-desc
index f6778f0c9bb7..035513ca2c61 100644
--- a/desktop/xmobar/slack-desc
+++ b/desktop/xmobar/slack-desc
@@ -5,13 +5,13 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler-------------------------------------------------------|
+      |-----handy-ruler------------------------------------------------------|
 xmobar: xmobar (A Minimalistic Text Based Status Bar)
 xmobar:
 xmobar: It was designed to work with the xmonad Window Manager.
 xmobar:
 xmobar: It was inspired by the Ion3 status bar, and supports similar features,
-xmobar: like dynamic color management, output templates, and extensibility 
+xmobar: like dynamic color management, output templates, and extensibility
 xmobar: through plugins.
 xmobar:
 xmobar: http://code.haskell.org/~arossato/xmobar/
diff --git a/desktop/xmobar/xmobar.SlackBuild b/desktop/xmobar/xmobar.SlackBuild
index a6a6cc9c7a9a..f895befa0f30 100644
--- a/desktop/xmobar/xmobar.SlackBuild
+++ b/desktop/xmobar/xmobar.SlackBuild
@@ -4,29 +4,45 @@
 
 # Written by Xavier Maillard <xma@gnu.org>
 # Updated by Andy Bailey <bailey@akamai.com>
-# Public domain.
+# Copyright 2012 Mikko Värri, Finland
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=xmobar
-VERSION=${VERSION:-0.11.1}
+VERSION=${VERSION:-0.15}
 BUILD=${BUILD:-1}
-TAG=${TAG:-_SBo}		
+TAG=${TAG:-_SBo}
 
-GHC_VERSION=$(ghc-pkg field ghc version | cut -d' ' -f2)
+GHC_VERSION=$(ghc --numeric-version)
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
-OUTPUT=${OUTPUT:-/tmp}	
+OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -42,7 +58,7 @@ else
   LIBDIRSUFFIX=""
 fi
 
-set -e # Exit on most errors
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
@@ -57,27 +73,29 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# We can enable the Wireless monitor after adding "with_iwlib"
-# here, but the iwlib binding version in xmobar 0.11.1 requires
-# wireless-tools 0.30.x, which is still in beta.
+# Fix mtl 2.1 compatibility
+patch -p0 <$CWD/xmobar_cabal.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-runhaskell Setup.lhs configure \
+runghc Setup configure \
   --prefix=/usr \
+  --enable-executable-dynamic \
   --libdir=/usr/lib${LIBDIRSUFFIX}/ghc-$GHC_VERSION \
   --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --flags="with_threaded" \
+  --flags="with_iwlib" \
   --flags="with_xft" \
   --flags="with_inotify"
 
-runhaskell Setup.lhs build
-runhaskell Setup.lhs copy --destdir=$PKG
+runghc Setup build
+runghc Setup copy --destdir=$PKG
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  LICENSE README xmobar.config-sample \
+cp -a LICENSE readme.md news.md samples \
     $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/desktop/xmobar/xmobar.info b/desktop/xmobar/xmobar.info
index b3fa2a09552c..254fa176576e 100644
--- a/desktop/xmobar/xmobar.info
+++ b/desktop/xmobar/xmobar.info
@@ -1,10 +1,10 @@
 PRGNAM="xmobar"
-VERSION="0.11.1"
-HOMEPAGE="http://code.haskell.org/~arossato/xmobar/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmobar/0.11.1/xmobar-0.11.1.tar.gz"
-MD5SUM="766fe504909384628321fb7472fdb621"
+VERSION="0.15"
+HOMEPAGE="http://hackage.haskell.org/package/xmobar/"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/xmobar/0.15/xmobar-0.15.tar.gz"
+MD5SUM="0658679b39168f49d32fe178029ff9f1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Andy Bailey"
-EMAIL="bailey@akamai.com"
-APPROVED="rworkman"
+MAINTAINER="Mikko Värri"
+EMAIL="vmj@linuxbox.fi"
+APPROVED="dsomero"
diff --git a/desktop/xmobar/xmobar_cabal.patch b/desktop/xmobar/xmobar_cabal.patch
new file mode 100644
index 000000000000..5c64847665e1
--- /dev/null
+++ b/desktop/xmobar/xmobar_cabal.patch
@@ -0,0 +1,11 @@
+--- xmobar.cabal.orig	2012-06-23 16:00:20.668999533 +0300
++++ xmobar.cabal	2012-06-23 16:01:42.749000428 +0300
+@@ -112,7 +112,7 @@
+       time,
+       filepath,
+       X11 == 1.6.*,
+-      mtl == 2.0.*,
++      mtl >= 2.0.0 && < 2.2, 
+       parsec == 3.1.*,
+       stm == 2.3.*
+