summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Mikko Värri <vmj@linuxbox.fi>2013-03-04 05:52:21 (GMT)
committer dsomero <xgizzmo@slackbuilds.org>2013-03-04 22:26:57 (GMT)
commitd722b68b0e738744802bbb1f01606c270c513f69 (patch)
treefa5dfc7c6c36c6ae89dab222949068a9ac832e4b
parent9651832f4bf0af9cb319dffc6fc4b13f463f99bc (diff)
downloadslackbuilds-d722b68b0e738744802bbb1f01606c270c513f69.tar.gz
desktop/xmonad: Updated for version 0.11.
Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
-rw-r--r--desktop/xmonad/slack-desc10
-rw-r--r--desktop/xmonad/xmonad.SlackBuild7
-rw-r--r--desktop/xmonad/xmonad.info8
-rw-r--r--desktop/xmonad/xmonad_cabal.patch9
4 files changed, 12 insertions, 22 deletions
diff --git a/desktop/xmonad/slack-desc b/desktop/xmonad/slack-desc
index 2110ef6..f16ecfd 100644
--- a/desktop/xmonad/slack-desc
+++ b/desktop/xmonad/slack-desc
@@ -1,9 +1,9 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
-# customary to leave one space after the ':'.
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
|-----handy-ruler------------------------------------------------------|
xmonad: xmonad (stable, featureful, and easy tiling window manager for X11)
diff --git a/desktop/xmonad/xmonad.SlackBuild b/desktop/xmonad/xmonad.SlackBuild
index ba6ac1d..293aa03 100644
--- a/desktop/xmonad/xmonad.SlackBuild
+++ b/desktop/xmonad/xmonad.SlackBuild
@@ -2,7 +2,7 @@
# Slackware build script for xmonad
-# Copyright 2012 Mikko Värri, Finland
+# Copyright 2013 Mikko Värri, Finland
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=xmonad
-VERSION=${VERSION:-0.10}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.11}
+BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
GHC_VERSION=$(ghc --numeric-version)
@@ -72,7 +72,6 @@ find . \
-exec chmod 644 {} \;
# Enable -threaded GHC option only for the binary, not for the libs.
-# And raise haskell-X11 version.
patch -p0 <$CWD/xmonad_cabal.patch
CFLAGS="$SLKCFLAGS" \
diff --git a/desktop/xmonad/xmonad.info b/desktop/xmonad/xmonad.info
index c14729f..0e09dfc 100644
--- a/desktop/xmonad/xmonad.info
+++ b/desktop/xmonad/xmonad.info
@@ -1,10 +1,10 @@
PRGNAM="xmonad"
-VERSION="0.10"
+VERSION="0.11"
HOMEPAGE="http://xmonad.org/"
-DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.10/xmonad-0.10.tar.gz"
-MD5SUM="f8381e1ec15137863558a454d4466467"
+DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad/0.11/xmonad-0.11.tar.gz"
+MD5SUM="5ac9dc1dae5e85dcbdfb9f70cbe312c1"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-X11 haskell-mtl haskell-utf8-string"
+REQUIRES="haskell-extensible-exceptions haskell-X11 haskell-mtl haskell-utf8-string"
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"
diff --git a/desktop/xmonad/xmonad_cabal.patch b/desktop/xmonad/xmonad_cabal.patch
index 599fbcb..b737064 100644
--- a/desktop/xmonad/xmonad_cabal.patch
+++ b/desktop/xmonad/xmonad_cabal.patch
@@ -11,15 +11,6 @@
library
exposed-modules: XMonad
XMonad.Main
-@@ -46,7 +54,7 @@
- build-depends: base < 5 && >=3, containers, directory, process, filepath, extensible-exceptions
- else
- build-depends: base < 3
-- build-depends: X11>=1.5.0.0 && < 1.6, mtl, unix,
-+ build-depends: X11>=1.5.0.0 && < 1.7, mtl, unix,
- utf8-string >= 0.3 && < 0.4
-
- if true
@@ -88,3 +96,5 @@
ghc-options: -Werror
if flag(testing) && flag(small_base)