aboutsummaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2018-10-27 12:22:09 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2018-11-10 07:47:00 +0700
commit5e7b647a8e13f0298660f83d1f8ff71e73f16f4e (patch)
tree93ce6b92c98c8518196055a127af598ce9864d1a /desktop
parent27de2f9495685868a98ede3e305bdaed9329b2fa (diff)
desktop/xmonad: Updated for version 0.15.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
Diffstat (limited to 'desktop')
-rw-r--r--desktop/xmonad/README2
-rw-r--r--desktop/xmonad/xmonad.SlackBuild11
-rw-r--r--desktop/xmonad/xmonad.desktop3
-rw-r--r--desktop/xmonad/xmonad.info12
4 files changed, 14 insertions, 14 deletions
diff --git a/desktop/xmonad/README b/desktop/xmonad/README
index 393b2390edf50..c998299799a27 100644
--- a/desktop/xmonad/README
+++ b/desktop/xmonad/README
@@ -10,7 +10,7 @@ to do user-specific selection.
To get you started, the most basic key bindings are:
mod-shift-return Launch xterm
mod-shift-q Quit xmonad
-For a guided tour, see http://www.xmonad.org/tour.html
+For a guided tour, see https://www.xmonad.org/tour.html
After uninstalling, run this command to unregister the package from
the ghc package database: ghc-pkg recache
diff --git a/desktop/xmonad/xmonad.SlackBuild b/desktop/xmonad/xmonad.SlackBuild
index 54de017823b67..2218f76346bb4 100644
--- a/desktop/xmonad/xmonad.SlackBuild
+++ b/desktop/xmonad/xmonad.SlackBuild
@@ -3,6 +3,7 @@
# Slackware build script for xmonad
# 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
@@ -23,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xmonad
-VERSION=${VERSION:-0.12}
+VERSION=${VERSION:-0.15}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
@@ -31,7 +32,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
@@ -42,8 +43,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"
@@ -120,7 +121,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
cp -a \
- CHANGES.md CONFIG LICENSE README.md STYLE TODO \
+ CHANGES.md CONFIG LICENSE README.md STYLE \
$PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
diff --git a/desktop/xmonad/xmonad.desktop b/desktop/xmonad/xmonad.desktop
index 8c451c686439a..746de7537ba72 100644
--- a/desktop/xmonad/xmonad.desktop
+++ b/desktop/xmonad/xmonad.desktop
@@ -1,6 +1,5 @@
[Desktop Entry]
-Encoding=UTF-8
-Type=XSession
+Type=Application
Exec=/usr/bin/xmonad
TryExec=/usr/bin/xmonad
Name=xmonad
diff --git a/desktop/xmonad/xmonad.info b/desktop/xmonad/xmonad.info
index 36c55ba6ce7ab..bb42e63aa264a 100644
--- a/desktop/xmonad/xmonad.info
+++ b/desktop/xmonad/xmonad.info
@@ -1,10 +1,10 @@
PRGNAM="xmonad"
-VERSION="0.12"
+VERSION="0.15"
HOMEPAGE="https://xmonad.org/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.12/xmonad-0.12.tar.gz"
-MD5SUM="6fd5f268d38e940e090af0726795f513"
+DOWNLOAD="https://hackage.haskell.org/packages/archive/xmonad/0.15/xmonad-0.15.tar.gz"
+MD5SUM="3a45ffb3a46482da8d94873c48a79dfa"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="ghc haskell-X11 haskell-data-default haskell-extensible-exceptions haskell-mtl haskell-setlocale haskell-utf8-string"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-X11 haskell-data-default haskell-extensible-exceptions haskell-setlocale haskell-utf8-string"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"