summaryrefslogtreecommitdiff
path: root/community/xmobar
diff options
context:
space:
mode:
authorroot <root@rshg054.dnsready.net>2012-06-15 00:01:47 +0000
committerroot <root@rshg054.dnsready.net>2012-06-15 00:01:47 +0000
commit63a600a5f9102d817332db9fb746a4153ed62b51 (patch)
treed4219aa8c6331cc37c98b943b1f9db68306bd81d /community/xmobar
parent35c30674b2b901077a809a6f1d8e5a0115098c8b (diff)
Fri Jun 15 00:01:47 UTC 2012
Diffstat (limited to 'community/xmobar')
-rw-r--r--community/xmobar/PKGBUILD21
-rw-r--r--community/xmobar/xmobar-0.15-haskell-mtl.patch12
2 files changed, 25 insertions, 8 deletions
diff --git a/community/xmobar/PKGBUILD b/community/xmobar/PKGBUILD
index 2df798cad..d3afe6262 100644
--- a/community/xmobar/PKGBUILD
+++ b/community/xmobar/PKGBUILD
@@ -1,25 +1,26 @@
-# $Id: PKGBUILD 67080 2012-03-03 16:12:00Z tdziedzic $
+# $Id: PKGBUILD 72407 2012-06-13 13:47:57Z tdziedzic $
# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
# Contributor: Arch Haskell Team <arch-haskell@haskell.org>
# Package generated by cabal2arch 0.4
pkgname=xmobar
-pkgver=0.14
-pkgrel=2
+pkgver=0.15
+pkgrel=1
pkgdesc="A Minimalistic Text Based Status Bar"
url="http://hackage.haskell.org/package/xmobar"
license=('custom:BSD3')
arch=('i686' 'x86_64')
depends=('gmp' 'libxft' 'libxinerama' 'wireless_tools' 'libxrandr')
-makedepends=('ghc>=7.0.2' 'haskell-x11>=1.3.0' 'haskell-x11-xft>=0.2' 'haskell-utf8-string'
- 'haskell-stm' 'haskell-parsec>=3' 'haskell-mtl>=2')
+makedepends=('ghc=7.4.2-1' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string'
+ 'haskell-stm>=2.3' 'haskell-parsec>=3.1' 'haskell-mtl>=2')
options=('strip')
-source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz)
-md5sums=('b965e2db0555c741db96945210995777')
+source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz xmobar-0.15-haskell-mtl.patch)
build() {
cd ${srcdir}/xmobar-$pkgver
-# runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_alsa with_inotify with_iwlib"
+ # Fix haskell mtl dep
+ patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch
+
runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_iwlib"
runhaskell Setup build
}
@@ -29,3 +30,7 @@ package() {
runhaskell Setup copy --destdir=${pkgdir}
install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
}
+md5sums=('0658679b39168f49d32fe178029ff9f1')
+
+md5sums=('0658679b39168f49d32fe178029ff9f1'
+ '0d9fb64557233c3a349feb53097c7b09')
diff --git a/community/xmobar/xmobar-0.15-haskell-mtl.patch b/community/xmobar/xmobar-0.15-haskell-mtl.patch
new file mode 100644
index 000000000..bee3dc354
--- /dev/null
+++ b/community/xmobar/xmobar-0.15-haskell-mtl.patch
@@ -0,0 +1,12 @@
+diff -aur xmobar-0.15.old/xmobar.cabal xmobar-0.15/xmobar.cabal
+--- xmobar-0.15.old/xmobar.cabal 2012-06-11 17:04:21.422444926 +0000
++++ xmobar-0.15/xmobar.cabal 2012-06-11 17:05:16.772001865 +0000
+@@ -112,7 +112,7 @@
+ time,
+ filepath,
+ X11 == 1.6.*,
+- mtl == 2.0.*,
++ mtl >= 2.0 && <2.2,
+ parsec == 3.1.*,
+ stm == 2.3.*
+