From c3ff6b4da8966c22dcbf0f5d8a957b875242789f Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Thu, 4 Oct 2012 01:23:34 -0700
Subject: Thu Oct  4 01:23:34 PDT 2012

---
 ...e-of-catch-to-catchIOError-since-catch-ha.patch | 34 ++++++++++++++++++++++
 community-testing/xmobar/PKGBUILD                  | 29 +++++++++---------
 2 files changed, 49 insertions(+), 14 deletions(-)
 create mode 100644 community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch

(limited to 'community-testing/xmobar')

diff --git a/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
new file mode 100644
index 000000000..d4508c916
--- /dev/null
+++ b/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
@@ -0,0 +1,34 @@
+From b7345a790e8026a2075ce636ac377d8f049b4b7c Mon Sep 17 00:00:00 2001
+From: Thomas Dziedzic <gostrc@gmail.com>
+Date: Wed, 3 Oct 2012 06:51:21 -0700
+Subject: [PATCH] Update usage of catch to catchIOError since catch has been
+ removed from System.IO.Error in ghc 7.6.1
+
+---
+ src/Plugins/Monitors/Bright.hs | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Plugins/Monitors/Bright.hs b/src/Plugins/Monitors/Bright.hs
+index 499e5bc..b5ec4c0 100644
+--- a/src/Plugins/Monitors/Bright.hs
++++ b/src/Plugins/Monitors/Bright.hs
+@@ -20,6 +20,7 @@ import Data.Char
+ import System.FilePath ((</>))
+ import System.Posix.Files (fileExist)
+ import System.Console.GetOpt
++import System.IO.Error (catchIOError)
+ 
+ data BrightOpts = BrightOpts
+ 	{ subDir :: String
+@@ -101,7 +102,7 @@ readBright files =
+ 		maxVal <- grab $ (fMax files)
+ 		return $ (currVal / maxVal) 
+ 	where
+-		grab f = catch (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
++		grab f = catchIOError (fmap (read . B.unpack) $ B.readFile f)(\_ -> return 0)
+ 
+ 
+ showHorizontalBar :: Float -> Monitor String
+-- 
+1.7.12.2
+
diff --git a/community-testing/xmobar/PKGBUILD b/community-testing/xmobar/PKGBUILD
index 42f0207ad..25e6e53e1 100644
--- a/community-testing/xmobar/PKGBUILD
+++ b/community-testing/xmobar/PKGBUILD
@@ -1,36 +1,37 @@
-# $Id: PKGBUILD 72320 2012-06-11 17:26:54Z tdziedzic $
+# $Id: PKGBUILD 77032 2012-10-03 15:25:55Z 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.15
+pkgver=0.16
 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.4.2-1' 'haskell-x11=1.6.0' 'haskell-x11-xft=0.3.1' 'haskell-utf8-string'
+makedepends=('ghc=7.6.1-1' 'haskell-x11=1.6.0.2' '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 xmobar-0.15-haskell-mtl.patch)
+#source=(http://hackage.haskell.org/packages/archive/xmobar/$pkgver/xmobar-$pkgver.tar.gz  xmobar-0.15-builddep.patch)
+# Use Git snapshot for Ghc 7.6.1 rebuild
+source=(ftp://ftp.archlinux.org/other/community/xmobar/xmobar-$pkgver.tar.gz 
+0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch)
 
 build() {
-    cd ${srcdir}/xmobar-$pkgver
-    # Fix haskell mtl dep
-    patch -Np1 -i $srcdir/xmobar-0.15-haskell-mtl.patch
+    cd ${srcdir}/xmobar
+    patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch
 
-    runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_xft with_iwlib"
+    runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib"
     runhaskell Setup build
 }
 
 package() {
-    cd ${srcdir}/xmobar-$pkgver
+    cd ${srcdir}/xmobar
     runhaskell Setup copy --destdir=${pkgdir}
-    install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
+    install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 }
-md5sums=('0658679b39168f49d32fe178029ff9f1')
 
-md5sums=('0658679b39168f49d32fe178029ff9f1'
-         '0d9fb64557233c3a349feb53097c7b09')
+md5sums=('b470f8253f8d2b014f59e9d657cc7ddd'
+         'ffd6079c879f3b6ff7208a846d6ee241'
+         '149583c19ac3d0ad829f3138342bb9db')
-- 
cgit v1.2.3-54-g00ecf