fix MPD build on ghc-7.4
This commit is contained in:
parent
0a61334416
commit
5471e08de6
|
@ -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
|
|
@ -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@redhat.com> - 0.14-4
|
||||
- fix MPD build on ghc-7.4
|
||||
|
||||
* Wed Feb 29 2012 Ben Boeckel <mathstuf@gmail.com> - 0.14-3
|
||||
- Rebuild for ghc-libmpd
|
||||
|
||||
|
|
Loading…
Reference in New Issue