diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-10-13 11:26:30 -0300 |
| commit | ea319c11ce5dcbe5994f166ea099b115bbffe960 (patch) | |
| tree | 365b7a8276a93d738840c4481a1ff5e327920738 /community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch | |
| parent | 37936150d275890b518542e93a435ab5815d722b (diff) | |
| parent | 21c295a86a10a3cd59802b2cf3ab7c24ebf0c608 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/conntrack-tools/01-config-file-path.patch
community-testing/conntrack-tools/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/gigi/PKGBUILD
community-testing/glob2/PKGBUILD
community-testing/megaglest/PKGBUILD
community-testing/openimageio/PKGBUILD
community/gtk2hs-buildtools/PKGBUILD
community/haddock/PKGBUILD
community/haskell-dataenc/PKGBUILD
community/haskell-ghc-paths/PKGBUILD
community/haskell-haskeline/PKGBUILD
community/haskell-hslogger/PKGBUILD
community/haskell-tar/PKGBUILD
community/haskell-terminfo/PKGBUILD
community/haskell-utf8-string/PKGBUILD
community/haskell-x11-xft/PKGBUILD
community/libnetfilter_acct/PKGBUILD
community/libnetfilter_conntrack/PKGBUILD
community/libnetfilter_queue/PKGBUILD
community/libnfnetlink/PKGBUILD
community/sfk/PKGBUILD
extra/cabal-install/PKGBUILD
extra/claws-mail/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/nx/PKGBUILD
extra/ocaml/PKGBUILD
multilib/gcc-multilib/PKGBUILD
multilib/lib32-dbus-core/PKGBUILD
multilib/lib32-gnutls/PKGBUILD
multilib/lib32-libtiff/PKGBUILD
multilib/lib32-libxcb/PKGBUILD
multilib/libtool-multilib/PKGBUILD
social/squirm/PKGBUILD
staging/kdebindings-python/PKGBUILD
testing/curl/PKGBUILD
testing/dnsutils/PKGBUILD
testing/dnsutils/remove-bind.patch
testing/mesa/PKGBUILD
testing/openldap/PKGBUILD
testing/pam/PKGBUILD
testing/subversion/PKGBUILD
testing/systemd/PKGBUILD
testing/sysvinit/PKGBUILD
Diffstat (limited to 'community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch')
| -rw-r--r-- | community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch b/community/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch new file mode 100644 index 000000000..d4508c916 --- /dev/null +++ b/community/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 + |