diff options
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/xmonad/slack-desc | 10 | ||||
| -rw-r--r-- | desktop/xmonad/xmonad.SlackBuild | 7 | ||||
| -rw-r--r-- | desktop/xmonad/xmonad.info | 8 | ||||
| -rw-r--r-- | desktop/xmonad/xmonad_cabal.patch | 9 |
4 files changed, 12 insertions, 22 deletions
diff --git a/desktop/xmonad/slack-desc b/desktop/xmonad/slack-desc index 2110ef6e43..f16ecfdc10 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 ba6ac1df1a..293aa033d6 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 c14729ffb4..0e09dfcda8 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 599fbcb3c2..b737064f45 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) |