From 123fbce476fdc8deee41785c0c20c09f0a05da8e Mon Sep 17 00:00:00 2001 From: jao Date: Thu, 15 Sep 2022 12:23:56 +0100 Subject: cairo: flags: with_xft gone and with_cairo true by default --- doc/compiling.org | 5 +---- xmobar.cabal | 13 ++++--------- 2 files changed, 5 insertions(+), 13 deletions(-) diff --git a/doc/compiling.org b/doc/compiling.org index dabcec6..b967292 100644 --- a/doc/compiling.org +++ b/doc/compiling.org @@ -57,11 +57,8 @@ them to =stack= directly: - =with_threaded= Uses GHC's threaded runtime. Use this option if xmobar enters a high-CPU regime right after starting. - - =with_xft= Antialiased font support. Deprecated: use =with_cairo= instead. - - =with_cairo= Antialiased fonts via Cairo/Pango. Requires the [[http://hackage.haskell.org/package/X11-xft/][X11-xft]] - package. This option automatically enables UTF-8. To use XFT fonts you - can use their fontconfig name, e.g + package. To use XFT fonts you can use their fontconfig name, e.g #+begin_src haskell font = "Iosevka Medium 10" diff --git a/xmobar.cabal b/xmobar.cabal index 8fe9acb..a2958ad 100644 --- a/xmobar.cabal +++ b/xmobar.cabal @@ -32,13 +32,8 @@ source-repository head location: git://codeberg.org/xmobar/xmobar.git branch: master -flag with_xft - description: Use Xft to render text. Deprecated: use with_cairo instead. - default: False - flag with_cairo description: Use Cairo and Pango to render anti-aliased text. - default: False flag with_inotify description: inotify support (modern Linux only). Required for the Mail and MBox plugins. @@ -229,11 +224,11 @@ library if flag(with_rtsopts) cpp-options: -DRTSOPTS - if flag(with_cairo) || flag(all_extensions) || flag(with_xft) - build-depends: cairo >= 0.13 && < 0.14, - pango >= 0.13 && < 0.14, + if flag(with_cairo) + build-depends: cairo >= 0.13, + pango >= 0.13, colour >= 2.3.6, - X11-xft >= 0.2 && < 0.4 + X11-xft >= 0.2 other-modules: Xmobar.X11.CairoSurface, Xmobar.X11.CairoDraw, Xmobar.X11.XRender -- cgit v1.2.3