haskell/xmonad-contrib: Updated for version 0.11.

Signed-off-by: dsomero <xgizzmo@slackbuilds.org>
This commit is contained in:
Mikko Värri 2013-03-04 00:52:22 -05:00 committed by dsomero
parent d722b68b0e
commit 753ebbc3c8
6 changed files with 12 additions and 53 deletions

View file

@ -1,11 +0,0 @@
--- XMonad/Layout/Spiral.hs.orig 2012-05-17 16:33:50.958000408 +0300
+++ XMonad/Layout/Spiral.hs 2012-05-17 16:36:17.469000030 +0300
@@ -26,7 +26,7 @@
) where
import Data.Ratio
-import XMonad
+import XMonad hiding (Rotation)
import XMonad.StackSet ( integrate )
-- $usage

View file

@ -1,12 +0,0 @@
--- XMonad/Util/Paste.hs.orig 2012-05-17 16:47:40.345000003 +0300
+++ XMonad/Util/Paste.hs 2012-05-17 16:47:55.724000002 +0300
@@ -89,9 +89,3 @@
sendEvent d w True keyPressMask ev
setEventType ev keyRelease
sendEvent d w True keyReleaseMask ev
-
--- | A null 'KeyMask'. Used when you don't want a character or string shifted, control'd, or what.
---
--- TODO: This really should be a function in the X11 binding. When noModMask shows up there, remove.
-noModMask :: KeyMask
-noModMask = 0

View file

@ -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-contrib: xmonad-contrib (3rd party extensions for xmonad)

View file

@ -2,7 +2,7 @@
# Slackware build script for xmonad-contrib
# 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-contrib
VERSION=${VERSION:-0.10}
BUILD=${BUILD:-2}
VERSION=${VERSION:-0.11}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
GHC_VERSION=$(ghc --numeric-version)
@ -71,13 +71,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
# Raise haskell-X11 version.
patch -p0 <$CWD/xmonad-contrib_cabal.patch
# Unambiguate Rotation type
patch -p0 <$CWD/XMonad_Layout_Spiral_hs.patch
# Remove noModMask, which is lifted to X11 bindings
patch -p0 <$CWD/XMonad_Util_Paste_hs.patch
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
runghc Setup configure \

View file

@ -1,10 +1,10 @@
PRGNAM="xmonad-contrib"
VERSION="0.10"
VERSION="0.11"
HOMEPAGE="http://www.xmonad.org/"
DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad-contrib/0.10/xmonad-contrib-0.10.tar.gz"
MD5SUM="9a4353a94ec0ea3a9c4700757ef5ae81"
DOWNLOAD="http://hackage.haskell.org/packages/archive/xmonad-contrib/0.11/xmonad-contrib-0.11.tar.gz"
MD5SUM="05fba258ac6063e49b50786a0869bd1f"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="haskell-random xmonad"
REQUIRES="haskell-extensible-exceptions haskell-random xmonad"
MAINTAINER="Mikko Värri"
EMAIL="vmj@linuxbox.fi"

View file

@ -1,11 +0,0 @@
--- xmonad-contrib.cabal.orig 2012-05-16 02:46:22.006000000 +0300
+++ xmonad-contrib.cabal 2012-05-16 02:47:01.352999062 +0300
@@ -61,7 +61,7 @@
extensions: ForeignFunctionInterface
cpp-options: -DXFT
- build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.6, xmonad>=0.10, xmonad<0.11, utf8-string
+ build-depends: mtl >= 1 && < 3, unix, X11>=1.5.0.0 && < 1.7, xmonad>=0.10, xmonad<0.11, utf8-string
if true
ghc-options: -fwarn-tabs -Wall