Update to xmobar-0.15
OK kili@ OK Jona Joachim (maintainer)
This commit is contained in:
dcoppa
parent
8003eddd81
commit
24e4d787e5
@ -1,9 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.13 2012/09/02 22:01:25 kili Exp $
|
||||
# $OpenBSD: Makefile,v 1.14 2012/09/26 07:09:20 dcoppa Exp $
|
||||
|
||||
COMMENT = minimalistic text based status bar
|
||||
|
||||
DISTNAME = xmobar-0.14
|
||||
REVISION = 0
|
||||
DISTNAME = xmobar-0.15
|
||||
CATEGORIES = x11
|
||||
HOMEPAGE = http://projects.haskell.org/xmobar
|
||||
|
||||
@ -20,7 +19,7 @@ WANTLIB = c gmp m pthread util X11 Xext Xft Xinerama Xrandr
|
||||
MODULES = lang/ghc converters/libiconv
|
||||
|
||||
MODGHC_BUILD = cabal hackage nort
|
||||
MODGHC_SETUP_CONF_ARGS = --flags="with_xft with_mpd with_utf8"
|
||||
MODGHC_SETUP_CONF_ARGS = --flags="with_xft with_mpd"
|
||||
|
||||
LIB_DEPENDS = devel/gmp
|
||||
|
||||
|
||||
@ -1,5 +1,2 @@
|
||||
MD5 (ghc/xmobar-0.14.tar.gz) = uWXi2wVVx0HblpRSEJlXdw==
|
||||
RMD160 (ghc/xmobar-0.14.tar.gz) = z2mHDfVnyxRI4tOgxjv1yxn1zx8=
|
||||
SHA1 (ghc/xmobar-0.14.tar.gz) = 6kBkEYSiMBHSndE0b6kcu7VXD3I=
|
||||
SHA256 (ghc/xmobar-0.14.tar.gz) = cMObC9mKlfs2KngwXMmxDU+cJKpkMVl/2B2mXZRYRvg=
|
||||
SIZE (ghc/xmobar-0.14.tar.gz) = 64977
|
||||
SHA256 (ghc/xmobar-0.15.tar.gz) = lDUlLZ76aAm1SkkMGrIPfFHHRo+epcYwyj/P4VYgQfE=
|
||||
SIZE (ghc/xmobar-0.15.tar.gz) = 67304
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-samples_xmobar_config,v 1.1 2011/06/13 21:23:04 kili Exp $
|
||||
--- samples/xmobar.config.orig Mon Mar 28 01:16:24 2011
|
||||
+++ samples/xmobar.config Sat Jun 11 23:46:39 2011
|
||||
@@ -4,15 +4,11 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
|
||||
$OpenBSD: patch-samples_xmobar_config,v 1.2 2012/09/26 07:09:20 dcoppa Exp $
|
||||
--- samples/xmobar.config.orig Mon Jun 4 02:55:49 2012
|
||||
+++ samples/xmobar.config Mon Sep 24 21:36:56 2012
|
||||
@@ -6,15 +6,11 @@ Config { font = "-misc-fixed-*-*-*-*-10-*-*-*-*-*-*-*"
|
||||
, position = Top
|
||||
, lowerOnStart = True
|
||||
, commands = [ Run Weather "EGPF" ["-t","<station>: <tempC>C","-L","18","-H","25","--normal","green","--high","red","--low","lightblue"] 36000
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
$OpenBSD: patch-src_Plugins_Monitors_MPD_hs,v 1.3 2012/09/02 22:01:26 kili Exp $
|
||||
--- src/Plugins/Monitors/MPD.hs.orig Sat Dec 10 18:41:54 2011
|
||||
+++ src/Plugins/Monitors/MPD.hs Fri Jul 13 19:00:52 2012
|
||||
@@ -102,5 +102,5 @@ showTime t = int2str minutes ++ ":" ++ int2str seconds
|
||||
where minutes = t `div` 60
|
||||
seconds = t `mod` 60
|
||||
|
||||
-int2str :: (Num a, Ord a) => a -> String
|
||||
+int2str :: (Show a, Num a, Ord a) => a -> String
|
||||
int2str x = if x < 10 then '0':sx else sx where sx = show x
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-src_Plugins_Monitors_hs,v 1.2 2012/01/12 21:42:07 dcoppa Exp $
|
||||
--- src/Plugins/Monitors.hs.orig Tue Jan 10 20:31:19 2012
|
||||
+++ src/Plugins/Monitors.hs Tue Jan 10 22:01:23 2012
|
||||
$OpenBSD: patch-src_Plugins_Monitors_hs,v 1.3 2012/09/26 07:09:20 dcoppa Exp $
|
||||
--- src/Plugins/Monitors.hs.orig Mon Jun 4 02:55:49 2012
|
||||
+++ src/Plugins/Monitors.hs Mon Sep 24 21:36:56 2012
|
||||
@@ -21,20 +21,20 @@ import Plugins
|
||||
|
||||
import Plugins.Monitors.Common ( runM )
|
||||
@ -35,7 +35,7 @@ $OpenBSD: patch-src_Plugins_Monitors_hs,v 1.2 2012/01/12 21:42:07 dcoppa Exp $
|
||||
#ifdef IWLIB
|
||||
import Plugins.Monitors.Wireless
|
||||
#endif
|
||||
@@ -46,23 +46,23 @@ import Plugins.Monitors.Volume
|
||||
@@ -49,23 +49,23 @@ import Plugins.Monitors.Mpris
|
||||
#endif
|
||||
|
||||
data Monitors = Weather Station Args Rate
|
||||
@ -75,7 +75,7 @@ $OpenBSD: patch-src_Plugins_Monitors_hs,v 1.2 2012/01/12 21:42:07 dcoppa Exp $
|
||||
#ifdef IWLIB
|
||||
| Wireless Interface Args Rate
|
||||
#endif
|
||||
@@ -86,23 +86,23 @@ type DiskSpec = [(String, String)]
|
||||
@@ -93,23 +93,23 @@ type DiskSpec = [(String, String)]
|
||||
|
||||
instance Exec Monitors where
|
||||
alias (Weather s _ _) = s
|
||||
@ -115,9 +115,9 @@ $OpenBSD: patch-src_Plugins_Monitors_hs,v 1.2 2012/01/12 21:42:07 dcoppa Exp $
|
||||
#ifdef IWLIB
|
||||
alias (Wireless i _ _) = i ++ "wi"
|
||||
#endif
|
||||
@@ -112,25 +112,25 @@ instance Exec Monitors where
|
||||
#ifdef ALSA
|
||||
alias (Volume m c _ _) = m ++ ":" ++ c
|
||||
@@ -123,25 +123,25 @@ instance Exec Monitors where
|
||||
alias (Mpris1 _ _ _) = "mpris1"
|
||||
alias (Mpris2 _ _ _) = "mpris2"
|
||||
#endif
|
||||
- start (Network i a r) = startNet i a r
|
||||
- start (Cpu a r) = startCpu a r
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-xmobar_cabal,v 1.3 2012/01/12 21:42:07 dcoppa Exp $
|
||||
--- xmobar.cabal.orig Tue Jan 10 22:20:48 2012
|
||||
+++ xmobar.cabal Tue Jan 10 22:21:50 2012
|
||||
@@ -77,9 +77,10 @@ executable xmobar
|
||||
$OpenBSD: patch-xmobar_cabal,v 1.4 2012/09/26 07:09:20 dcoppa Exp $
|
||||
--- xmobar.cabal.orig Mon Jun 4 02:55:49 2012
|
||||
+++ xmobar.cabal Mon Sep 24 21:53:14 2012
|
||||
@@ -85,9 +85,10 @@ executable xmobar
|
||||
Plugins.Monitors.Swap, Plugins.Monitors.Thermal,
|
||||
Plugins.Monitors.ThermalZone, Plugins.Monitors.Top,
|
||||
Plugins.Monitors.Uptime, Plugins.Monitors.Weather,
|
||||
@ -12,4 +12,13 @@ $OpenBSD: patch-xmobar_cabal,v 1.3 2012/01/12 21:42:07 dcoppa Exp $
|
||||
+ c-sources: src/Plugins/Monitors/Batt/apm.c
|
||||
|
||||
if true
|
||||
ghc-options: -funbox-strict-fields -Wall -threaded
|
||||
ghc-options: -funbox-strict-fields -Wall
|
||||
@@ -112,7 +113,7 @@ executable xmobar
|
||||
time,
|
||||
filepath,
|
||||
X11 == 1.6.*,
|
||||
- mtl == 2.0.*,
|
||||
+ mtl,
|
||||
parsec == 3.1.*,
|
||||
stm == 2.3.*
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user