[arch-commits] Commit in xmonad-contrib/trunk (2 files)

[Jelle van der Waa]

    Date: Sunday, April 27, 2014 @ 21:36:44
  Author: jelle
Revision: 110247

upgpkg: xmonad-contrib 0.11.2-3

ghc 7.8.2 rebuild

Added:
  xmonad-contrib/trunk/remove_unnecessary_contexts.patch
Modified:
  xmonad-contrib/trunk/PKGBUILD

-----------------------------------+
 PKGBUILD                          |   15 +++++++++++----
 remove_unnecessary_contexts.patch |   21 +++++++++++++++++++++
 2 files changed, 32 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-04-27 19:31:42 UTC (rev 110246)
+++ PKGBUILD	2014-04-27 19:36:44 UTC (rev 110247)
@@ -5,19 +5,26 @@
 
 pkgname=xmonad-contrib
 pkgver=0.11.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Add-ons for xmonad"
 arch=('i686' 'x86_64')
 url="http://xmonad.org/"
 license=('BSD')
-depends=('ghc=7.6.3-1' 'xmonad=0.11-7' 'sh' 'haskell-x11=1.6.1.1-3' 'haskell-x11-xft=0.3.1-9' 'haskell-utf8-string=0.3.7-5' 'haskell-random=1.0.1.1-5')
+depends=('ghc=7.8.2-2' 'xmonad=0.11-8' 'sh' 'haskell-x11=1.6.1.1' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string=0.3.7' 'haskell-random=1.0.1.1')
 install='xmonad-contrib.install'
 options=('staticlibs')
-source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz)
-md5sums=('415a7ed9449198b0e93d49ab0a4a0f72')
+source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz 'remove_unnecessary_contexts.patch')
+md5sums=('415a7ed9449198b0e93d49ab0a4a0f72'
+         '724a45ea306054ddb7f8a42b185e708f')
 
+prepare() {
+  cd $srcdir/$pkgname-$pkgver
+  patch -Np1 -i $srcdir/remove_unnecessary_contexts.patch
+}
+
 build() {
   cd $srcdir/$pkgname-$pkgver
+
   runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr -fuse_xft \
              --libsubdir=\$compiler/site-local/\$pkgid
   runhaskell Setup build

Added: remove_unnecessary_contexts.patch
===================================================================
--- remove_unnecessary_contexts.patch	                        (rev 0)
+++ remove_unnecessary_contexts.patch	2014-04-27 19:36:44 UTC (rev 110247)
@@ -0,0 +1,21 @@
+diff -aur xmonad-contrib-0.11.2/XMonad/Layout/MultiToggle.hs xmonad-contrib-new/XMonad/Layout/MultiToggle.hs
+--- xmonad-contrib-0.11.2/XMonad/Layout/MultiToggle.hs	2013-07-16 04:52:11.000000000 +0200
++++ xmonad-contrib-new/XMonad/Layout/MultiToggle.hs	2014-04-27 21:26:20.746206511 +0200
+@@ -99,7 +99,7 @@
+     transform :: (LayoutClass l a) => t -> l a ->
+         (forall l'. (LayoutClass l' a) => l' a -> (l' a -> l a) -> b) -> b
+ 
+-data (LayoutClass l a) => EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
++data  EL l a = forall l'. (LayoutClass l' a) => EL (l' a) (l' a -> l a)
+ 
+ unEL :: (LayoutClass l a) => EL l a -> (forall l'. (LayoutClass l' a) => l' a -> b) -> b
+ unEL (EL x _) k = k x
+@@ -159,7 +159,7 @@
+ infixr 0 ??
+ -- | Prepend an element to a heterogeneous list. Used to build transformer
+ -- tables for 'mkToggle'.
+-(??) :: (HList b w) => a -> b -> HCons a b
++(??) ::  a -> b -> HCons a b
+ (??) = HCons
+ 
+ -- | Construct a singleton transformer table.