diff options
author | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
---|---|---|
committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-02-09 11:13:39 +0100 |
commit | 80c5e58be137999f5d9690b682e888436ffe69b2 (patch) | |
tree | 5aef91b2cbc21ef5471d9ab69066ba7beaf747f0 /community/xmonad/PKGBUILD | |
parent | 9866fa59a35ebbae88bec725eba8551f34990e03 (diff) | |
parent | e9c244cac8e5dc1c59c7e8b7bc885fef04224b70 (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community/haskell-dataenc/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
core/openssl/PKGBUILD
extra/cabal-install/PKGBUILD
extra/haskell-http/PKGBUILD
extra/haskell-mtl/PKGBUILD
extra/haskell-network/PKGBUILD
extra/haskell-parsec/PKGBUILD
extra/haskell-text/PKGBUILD
extra/haskell-transformers/PKGBUILD
extra/haskell-zlib/PKGBUILD
extra/kdebindings-python/PKGBUILD
Diffstat (limited to 'community/xmonad/PKGBUILD')
-rw-r--r-- | community/xmonad/PKGBUILD | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/community/xmonad/PKGBUILD b/community/xmonad/PKGBUILD index a5a2542e4..c3aa02d4d 100644 --- a/community/xmonad/PKGBUILD +++ b/community/xmonad/PKGBUILD @@ -1,24 +1,23 @@ -# $Id: PKGBUILD 81832 2013-01-01 11:47:18Z jelle $ +# $Id: PKGBUILD 84021 2013-02-08 04:15:50Z td123 $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Maintainer: Vesa Kaihlavirta <vegai@iki.fi> # Contributor: shild <shildv@gmail.com> pkgname=xmonad pkgver=0.11 -pkgrel=1 +pkgrel=2 pkgdesc="Lightweight X11 tiled window manager written in Haskell" arch=('i686' 'x86_64' 'mips64el') url="http://xmonad.org/" license=('BSD') -depends=('ghc=7.6.1-1' 'gmp' 'haskell-x11=1.6.0.2' 'sh' 'haskell-mtl=2.1.2' 'haskell-utf8-string=0.3.7' 'haskell-extensible-exceptions') +depends=('ghc=7.6.2-1' 'gmp' 'haskell-x11=1.6.0.2-2' 'sh' 'haskell-mtl=2.1.2-2' 'haskell-utf8-string=0.3.7-4' 'haskell-extensible-exceptions=0.1.1.4-4') makedepends=('setconf' 'gendesk') optdepends=('xorg-xmessage: for displaying visual error messages') install='xmonad.install' -source=(http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz - xmonad.svg xmonad-0.10-x11-1.6.patch) +source=("http://hackage.haskell.org/packages/archive/$pkgname/$pkgver/$pkgname-$pkgver.tar.gz" + 'xmonad.svg') md5sums=('5ac9dc1dae5e85dcbdfb9f70cbe312c1' - '72bfa5e62e4e44fe7fa59b6a7593d993' - '22d29900d71f09a8f9fa6f0d2f3fed32') + '72bfa5e62e4e44fe7fa59b6a7593d993') build() { cd "$srcdir" @@ -26,9 +25,6 @@ build() { gendesk cd $srcdir/$pkgname-$pkgver - # Patch XMonad so we support haskell 1.6 - # patch -Np1 -i $srcdir/xmonad-0.10-x11-1.6.patch - runhaskell Setup.lhs configure --ghc --enable-shared --enable-split-objs --prefix=/usr \ --libsubdir=\$compiler/site-local/\$pkgid |