From 5d8f8d2014fd164ca73ec2c43daa9276352dc63b Mon Sep 17 00:00:00 2001 From: Andrea Rossato Date: Wed, 10 Feb 2010 13:29:27 +0100 Subject: fix ghc-6.12.1 warnings andd fix issue 17 Ignore-this: 868a877e7a107ddc8bc4085f3eb7fc8ae64597ee ghc-6.12.1 has native support for locales (very cool indeed!!), which simplify the code - unless for the compatibility layer with past ghc versions. xmobar has now support for every locale supported by ghc. The rest of the patch are just redundant import warnings and some xmobar.cabal updates. darcs-hash:20100210122927-d6583-e131c86cf89ce26adea9aa2ae06467bfdc40e14b.gz --- xmobar.cabal | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'xmobar.cabal') diff --git a/xmobar.cabal b/xmobar.cabal index 7bddedd..6fb7ffe 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -34,23 +34,28 @@ flag with_inotify executable xmobar main-is: Main.hs other-Modules: Xmobar, Config, Parsers, Commands, XUtil, Runnable, Plugins - ghc-options: -funbox-strict-fields -Wall ghc-prof-options: -prof -auto-all + if true + ghc-options: -funbox-strict-fields -Wall + if impl (ghc == 6.10.1) && arch (x86_64) - ghc-options: -O0 + ghc-options: -O0 + + if impl (ghc >= 6.12.1) + ghc-options: -fno-warn-unused-do-bind if flag(small_base) - build-depends: base == 4.*, containers, process, old-time, old-locale, bytestring, directory + build-depends: base == 4.*, containers, process, old-time, old-locale, bytestring, directory else - build-depends: base < 3 + build-depends: base < 3 if flag(with_xft) build-depends: utf8-string, X11-xft >= 0.2 cpp-options: -DXFT - if flag(with_utf8) + if flag(with_utf8) && impl (ghc < 6.12.1) build-depends: utf8-string cpp-options: -DUTF8 @@ -58,4 +63,4 @@ executable xmobar build-depends: hinotify cpp-options: -DINOTIFY - build-depends: X11>=1.3.0, mtl, unix, parsec, filepath, stm + build-depends: X11>=1.3.0, mtl, unix, parsec, filepath, stm -- cgit v1.2.3