diff options
Diffstat (limited to 'community-testing/xmobar')
3 files changed, 0 insertions, 83 deletions
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 deleted file mode 100644 index d4508c916..000000000 --- a/community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch +++ /dev/null @@ -1,34 +0,0 @@ -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 deleted file mode 100644 index 25e6e53e1..000000000 --- a/community-testing/xmobar/PKGBUILD +++ /dev/null @@ -1,37 +0,0 @@ -# $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> - -pkgname=xmobar -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.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-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 - patch -Np1 -i $srcdir/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch - - runhaskell Setup configure --disable-optimization --prefix=/usr --flags="with_utf8 with_xft with_iwlib" - runhaskell Setup build -} - -package() { - cd ${srcdir}/xmobar - runhaskell Setup copy --destdir=${pkgdir} - install -D -m644 license ${pkgdir}/usr/share/licenses/$pkgname/LICENSE -} - -md5sums=('b470f8253f8d2b014f59e9d657cc7ddd' - 'ffd6079c879f3b6ff7208a846d6ee241' - '149583c19ac3d0ad829f3138342bb9db') diff --git a/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch b/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch deleted file mode 100644 index bee3dc354..000000000 --- a/community-testing/xmobar/xmobar-0.15-haskell-mtl.patch +++ /dev/null @@ -1,12 +0,0 @@ -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.* - |