diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-10-21 10:47:37 +0200 |
| commit | aec9ffe68488d34c02bceb4942b87779f5c460d5 (patch) | |
| tree | 5aaa0d61510bf94c4dd5bd751b53f61d39817e96 /community-testing/xmobar | |
| parent | 59d570b2f4d752b3cd4dfcdf2ce8c75993d9c2eb (diff) | |
| parent | 9598f5141ea75ffa72a3c7c85639c6f296020ef1 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
community-staging/projectm/PKGBUILD
community-testing/evas_generic_loaders-svn/PKGBUILD
community-testing/gambas2/PKGBUILD
community-testing/gambas3/PKGBUILD
community-testing/libextractor/PKGBUILD
community-testing/pdf2djvu/PKGBUILD
community-testing/qtcreator/PKGBUILD
community-testing/qtcreator/qtcreator.desktop
community/galculator/PKGBUILD
community/ristretto/PKGBUILD
core/systemd/PKGBUILD
extra/llvm/PKGBUILD
extra/pyqt/PKGBUILD
extra/python-lxml/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/glew/PKGBUILD
staging/xine-lib/PKGBUILD
testing/calligra/PKGBUILD
testing/gdk-pixbuf2/PKGBUILD
testing/gdm/PKGBUILD
testing/gdm/fix_external_program_directories.patch
testing/glib2/PKGBUILD
testing/gnome-color-manager/PKGBUILD
testing/gthumb/PKGBUILD
testing/gtk3/PKGBUILD
testing/gvfs/PKGBUILD
testing/inkscape/PKGBUILD
testing/kdebase-workspace/PKGBUILD
testing/libreoffice/PKGBUILD
testing/networkmanager/PKGBUILD
testing/polkit/PKGBUILD
testing/poppler/PKGBUILD
testing/rhythmbox/PKGBUILD
testing/xorg-server/PKGBUILD
testing/xorg-xdm/PKGBUILD
Diffstat (limited to 'community-testing/xmobar')
| -rw-r--r-- | community-testing/xmobar/0001-Update-usage-of-catch-to-catchIOError-since-catch-ha.patch | 34 |
1 files changed, 0 insertions, 34 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 - |