aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spencer <baildon.research@googlemail.com>2016-05-09 15:09:30 +0100
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2016-05-11 03:17:21 +0700
commitfdf2d8aa657e10f74af0ae532319105238ba2497 (patch)
treee9de8beda5e42d8afedf397496fa53ae203f0730
parente9b1fc90fec44cd4fbb2e95766d828ae62eb8cf3 (diff)
desktop/xmonad: Updated for version 0.12.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
-rw-r--r--desktop/xmonad/xmonad.SlackBuild20
-rw-r--r--desktop/xmonad/xmonad.info8
2 files changed, 13 insertions, 15 deletions
diff --git a/desktop/xmonad/xmonad.SlackBuild b/desktop/xmonad/xmonad.SlackBuild
index 3603c149a6d77..54de017823b67 100644
--- a/desktop/xmonad/xmonad.SlackBuild
+++ b/desktop/xmonad/xmonad.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xmonad
-VERSION=${VERSION:-0.11}
+VERSION=${VERSION:-0.12}
BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
@@ -66,13 +66,10 @@ tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
-
-# Enable -threaded GHC option only for the binary, not for the libs.
-patch -p0 <$CWD/xmonad_cabal.patch
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+ -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
@@ -83,8 +80,7 @@ runghc Setup configure \
--enable-shared \
--enable-library-profiling \
--enable-executable-dynamic \
- --docdir=/usr/doc/$PRGNAM-$VERSION \
- --flags="threaded"
+ --docdir=/usr/doc/$PRGNAM-$VERSION
runghc Setup build
runghc Setup haddock
@@ -123,7 +119,9 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
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 CONFIG README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+ CHANGES.md CONFIG LICENSE README.md STYLE TODO \
+ $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/desktop/xmonad/xmonad.info b/desktop/xmonad/xmonad.info
index 0e09dfcda8ccf..050a09d0fa82c 100644
--- a/desktop/xmonad/xmonad.info
+++ b/desktop/xmonad/xmonad.info
@@ -1,10 +1,10 @@
PRGNAM="xmonad"
-VERSION="0.11"
+VERSION="0.12"
HOMEPAGE="http://xmonad.org/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.11/xmonad-0.11.tar.gz"
-MD5SUM="5ac9dc1dae5e85dcbdfb9f70cbe312c1"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.12/xmonad-0.12.tar.gz"
+MD5SUM="6fd5f268d38e940e090af0726795f513"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-extensible-exceptions haskell-X11 haskell-mtl haskell-utf8-string"
+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"