2 files changed, 55 insertions, 5 deletions
diff --git a/community/xmonad-contrib/PKGBUILD b/community/xmonad-contrib/PKGBUILD
index 91a537576..dbb48f0a2 100644
--- a/community/xmonad-contrib/PKGBUILD
+++ b/community/xmonad-contrib/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 69222 2012-04-10 09:03:48Z bluewind $
+# $Id: PKGBUILD 72409 2012-06-13 13:48:15Z tdziedzic $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: orbisvicis <gmail.com>
 
 pkgname=xmonad-contrib
 pkgver=0.10
-pkgrel=3
+pkgrel=4
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.4.1-2' 'xmonad=0.10-3' 'sh' 'haskell-x11=1.5.0.1-3' 'haskell-x11-xft=0.3.1-3' 'haskell-utf8-string=0.3.7-1' 'haskell-random=1.0.1.1-1')
+depends=('ghc=7.4.2-1' 'xmonad=0.10-4' 'sh' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1-4' 'haskell-utf8-string=0.3.7-2' 'haskell-random=1.0.1.1-2')
 install='xmonad-contrib.install'
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81')
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz xmonad-contrib-0.10-x11-1.6.patch)
+md5sums=('9a4353a94ec0ea3a9c4700757ef5ae81'
+         '32163aaeb3424cf73bf831640c162a8a')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
+  # Patch xmonad-contrib to support haskell-x11
+  patch -Np1 -i $srcdir/xmonad-contrib-0.10-x11-1.6.patch
+
   runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
              --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build
diff --git a/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
new file mode 100644
index 000000000..8372b4144
--- /dev/null
+++ b/community/xmonad-contrib/xmonad-contrib-0.10-x11-1.6.patch
@@ -0,0 +1,46 @@
+Tue Mar 20 03:53:11 FET 2012  Adam Vogt <vogt.adam@gmail.com>
+  * Bump version to 0.10.1
+  
+  Raising the X11 dependency while keeping the xmonad version the same leads to
+  problems where cabal install uses the dependency versions following hackage,
+  not what is installed.
+diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
+index 743bdc8..0fbf4ac 100644
+--- a/xmonad-contrib.cabal
++++ b/xmonad-contrib.cabal
+@@ -61,7 +61,7 @@ library
+         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
+diff --git a/XMonad/Layout/Spiral.hs b/XMonad/Layout/Spiral.hs
+index a485d95..5e388e2 100644
+--- a/XMonad/Layout/Spiral.hs
++++ b/XMonad/Layout/Spiral.hs
+@@ -26,7 +26,7 @@ module XMonad.Layout.Spiral (
+                             ) where
+ 
+ import Data.Ratio
+-import XMonad
++import XMonad (LayoutClass(..), Rectangle(..), fromMessage, Resize(..))
+ import XMonad.StackSet ( integrate )
+ 
+ -- $usage
+diff --git a/XMonad/Util/Paste.hs b/XMonad/Util/Paste.hs
+index 0d78653..4b7fd3b 100644
+--- a/XMonad/Util/Paste.hs
++++ b/XMonad/Util/Paste.hs
+@@ -23,7 +23,8 @@ module XMonad.Util.Paste ( -- * Usage
+                            where
+ 
+ import XMonad (io, theRoot, withDisplay, X ())
+-import Graphics.X11
++import Graphics.X11 (Window, shiftMask, KeyMask, stringToKeysym, KeySym, keysymToKeycode)
++import Graphics.X11 (allocaXEvent, keyPress, sendEvent, keyPressMask, keyRelease, keyReleaseMask)
+ import Graphics.X11.Xlib.Extras (none, setEventType, setKeyEvent)
+ import Control.Monad.Reader (asks)
+ import XMonad.Operations (withFocused)