summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--desktop/xmobar/slack-desc2
-rw-r--r--desktop/xmobar/xmobar.SlackBuild13
-rw-r--r--desktop/xmobar/xmobar.info14
3 files changed, 15 insertions, 14 deletions
diff --git a/desktop/xmobar/slack-desc b/desktop/xmobar/slack-desc
index be82b740fb..f21ec2a455 100644
--- a/desktop/xmobar/slack-desc
+++ b/desktop/xmobar/slack-desc
@@ -14,6 +14,6 @@ xmobar: It was inspired by the Ion3 status bar, and supports similar features,
xmobar: like dynamic color management, output templates, and extensibility
xmobar: through plugins.
xmobar:
-xmobar: http://code.haskell.org/~arossato/xmobar/
+xmobar: https://code.haskell.org/~arossato/xmobar/
xmobar:
xmobar:
diff --git a/desktop/xmobar/xmobar.SlackBuild b/desktop/xmobar/xmobar.SlackBuild
index 7da1797f84..1cd36d415f 100644
--- a/desktop/xmobar/xmobar.SlackBuild
+++ b/desktop/xmobar/xmobar.SlackBuild
@@ -5,6 +5,7 @@
# Written by Xavier Maillard <xma@gnu.org>
# Updated by Andy Bailey <GooseYArd@gmail.com>
# Copyright 2015 Mikko Värri, Finland
+# Updated 2018 David Spencer, Baildon, West Yorkshire, U.K.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +26,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xmobar
-VERSION=${VERSION:-0.23.1}
+VERSION=${VERSION:-0.28.1}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -33,7 +34,7 @@ GHC_VERSION=$(ghc --numeric-version)
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +45,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -77,8 +78,8 @@ CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
runghc Setup configure \
--prefix=/usr \
- --enable-executable-dynamic \
--libdir=/usr/lib${LIBDIRSUFFIX}/ghc-$GHC_VERSION \
+ --enable-executable-dynamic \
--docdir=/usr/doc/$PRGNAM-$VERSION \
--flags="with_threaded" \
--flags="with_iwlib" \
@@ -93,7 +94,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a \
- license readme.md news.md samples \
+ license readme.md changelog.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 e6f1dfdc72..60778f3e67 100644
--- a/desktop/xmobar/xmobar.info
+++ b/desktop/xmobar/xmobar.info
@@ -1,10 +1,10 @@
PRGNAM="xmobar"
-VERSION="0.23.1"
-HOMEPAGE="http://hackage.haskell.org/package/xmobar/"
-DOWNLOAD="http://hackage.haskell.org/package/xmobar-0.23.1/xmobar-0.23.1.tar.gz"
-MD5SUM="f97a10f049796f55cc3d13ee68d07eac"
+VERSION="0.28.1"
+HOMEPAGE="https://hackage.haskell.org/package/xmobar/"
+DOWNLOAD="https://hackage.haskell.org/package/xmobar-0.28.1/xmobar-0.28.1.tar.gz"
+MD5SUM="a50631f69fce621deb43280345a08703"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-hinotify haskell-stm haskell-regex-compat haskell-X11-xft haskell-parsec haskell-HTTP xmonad-contrib"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-hinotify haskell-iwlib haskell-parsec-numbers haskell-regex-compat haskell-X11-xft haskell-HTTP xmonad-contrib"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"