[xmobar] fix MPD build on ghc-7.4

Jens Petersen petersen at fedoraproject.org
Wed Mar 21 04:25:19 UTC 2012


commit 5471e08de6181e2a7f2147e4565050103c3b7460
Author: Jens Petersen <petersen at redhat.com>
Date:   Wed Mar 21 13:25:11 2012 +0900

    fix MPD build on ghc-7.4

 xmobar-0.14-MPD-ghc74-Show.patch |   10 ++++++++++
 xmobar.spec                      |    7 ++++++-
 2 files changed, 16 insertions(+), 1 deletions(-)
---
diff --git a/xmobar-0.14-MPD-ghc74-Show.patch b/xmobar-0.14-MPD-ghc74-Show.patch
new file mode 100644
index 0000000..0672a82
--- /dev/null
+++ b/xmobar-0.14-MPD-ghc74-Show.patch
@@ -0,0 +1,10 @@
+diff -u xmobar-0.14/src/Plugins/Monitors/MPD.hs\~ xmobar-0.14/src/Plugins/Monitors/MPD.hs
+--- xmobar-0.14/src/Plugins/Monitors/MPD.hs~	2011-12-11 02:41:54.000000000 +0900
++++ xmobar-0.14/src/Plugins/Monitors/MPD.hs	2012-03-21 11:30:50.420759773 +0900
+@@ -102,5 +102,5 @@
+   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
diff --git a/xmobar.spec b/xmobar.spec
index b8e6fcf..953409d 100644
--- a/xmobar.spec
+++ b/xmobar.spec
@@ -9,7 +9,7 @@
 
 Name:           xmobar
 Version:        0.14
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A minimalistic text-based status bar
 
 Group:          User Interface/X
@@ -23,6 +23,7 @@ BuildRequires:  ghc-rpm-macros
 # END cabal2spec
 Source1:        xmobar.desktop
 Patch1:         xmobar-0.13-default-fonts.patch
+Patch2:         xmobar-0.14-MPD-ghc74-Show.patch
 
 %if %{with alsa}
 BuildRequires:  ghc-alsa-mixer-devel
@@ -62,6 +63,7 @@ color management, output templates, and extensibility through plugins.
 %prep
 %setup -q
 %patch1 -p1 -b .fonts
+%patch2 -p1 -b .show
 
 
 %build
@@ -88,6 +90,9 @@ install --mode=0755 -p samples/xmonadpropwrite %{buildroot}%{_bindir}/xmonadprop
 
 
 %changelog
+* Wed Mar 21 2012 Jens Petersen <petersen at redhat.com> - 0.14-4
+- fix MPD build on ghc-7.4
+
 * Wed Feb 29 2012 Ben Boeckel <mathstuf at gmail.com> - 0.14-3
 - Rebuild for ghc-libmpd
 


More information about the scm-commits mailing list