diff options
| -rw-r--r-- | x11-misc/xmobar/ChangeLog | 9 | ||||
| -rw-r--r-- | x11-misc/xmobar/Manifest | 11 | ||||
| -rw-r--r-- | x11-misc/xmobar/files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch | 29 | ||||
| -rw-r--r-- | x11-misc/xmobar/xmobar-0.13.ebuild | 8 |
4 files changed, 47 insertions, 10 deletions
diff --git a/x11-misc/xmobar/ChangeLog b/x11-misc/xmobar/ChangeLog index c31b20abfaab..692e68feffaf 100644 --- a/x11-misc/xmobar/ChangeLog +++ b/x11-misc/xmobar/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-misc/xmobar -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.13 2011/09/18 18:10:59 slyfox Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/ChangeLog,v 1.14 2012/04/02 03:34:46 slyfox Exp $ + + 02 Apr 2012; Sergei Trofimovich <slyfox@gentoo.org> + +files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch, + xmobar-0.13.ebuild: + Fixed build failure against ghc-7.2+ (bug #410449 by Phil Tooley). 18 Sep 2011; Sergei Trofimovich <slyfox@gentoo.org> -files/xmobar-0.9.2-cpu-high-load.patch, -xmobar-0.11.1.ebuild: diff --git a/x11-misc/xmobar/Manifest b/x11-misc/xmobar/Manifest index 349f42fc83ff..82e917fdf20c 100644 --- a/x11-misc/xmobar/Manifest +++ b/x11-misc/xmobar/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX xmobar-0.13-fix-build-failure-against-ghc-7.2.patch 887 RMD160 e8e8a2f7ab6214ba7df33865910a9e17107d6ddd SHA1 4ec51c9d07d046cf0692a86e7a815a80d793ade0 SHA256 3ffad42f277a6b5306bc534e706ad49bca1f89e0d867bbd215aa6c9c798b72a8 DIST xmobar-0.13.tar.gz 55874 RMD160 c8af69211d65f0b1ef66ff256f9db71b7d8005ee SHA1 a1e9312319a378b2d60fc9388d3e8158e87b835f SHA256 c7c151c12491e230310a7ae22796cfe3f79d8731ddc453b661b509bb81da4a46 -EBUILD xmobar-0.13.ebuild 1439 RMD160 07d7283a25a1bf60f634889c1d45e6f556d35354 SHA1 1ba30a3877453f3c1a2c8556ce2f9878be848118 SHA256 2658ea770e5043b25d13e15abd186cf64344cc858bc66bd1ad07a2d0f9925a09 -MISC ChangeLog 2143 RMD160 ab1d366a895c51c66965e464921691efa6b1d653 SHA1 9848c0b763ba02893bf14471819da9f9e51e716f SHA256 2d2b50b62a27c59664228218c6ada50af88a85ef6c1cb4b6a6d8e9dc0d0cb4d8 +EBUILD xmobar-0.13.ebuild 1520 RMD160 2ad1b55a499e7a4d7eeaca876281c4d9ae9458bb SHA1 959e675ff01a76ed818d2a940d06edf22ae4acd7 SHA256 65bbd9a64eaf59ff3ace0041135cbb3c094d60db8e346686818abcfd36779f7f +MISC ChangeLog 2351 RMD160 323d3823e68ee0251ceaf462dbf17aa50f075ada SHA1 cfb860d3ce53224ff05051d2ef3abcdcf25db037 SHA256 e4ed46509f1b0e596ee4d6a1a73e8b94dec63669cc51ae664a1f2c6ad35d7acf MISC metadata.xml 326 RMD160 8a245bae2f03eafe73e40975ac0de3cb05a195cd SHA1 8a2589e3a4c621b55a0bf39f313a9ced394d4b44 SHA256 91d8af01976bf4fd4ae6a23e26d18acaa2a77b3bcdd426ea48d5a0b75fc34a9c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk52NQgACgkQcaHudmEf86ph5QCfZVZrF0BxHxaAh7NRPNgPswBu -0SEAn2r9J60HxAFd8kQvl3tzHu+cqP7u -=hKlQ +iEYEARECAAYFAk95H38ACgkQcaHudmEf86pmdwCeKrl4jpiqDuQRj5RrSo2KtxgR +K5IAn0y82vnbs8k8C6jR84VYRb/LDo5X +=gJbT -----END PGP SIGNATURE----- diff --git a/x11-misc/xmobar/files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch b/x11-misc/xmobar/files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch new file mode 100644 index 000000000000..698a5d82b38b --- /dev/null +++ b/x11-misc/xmobar/files/xmobar-0.13-fix-build-failure-against-ghc-7.2.patch @@ -0,0 +1,29 @@ +From f7fcc06097d862ca3bc6840b550a53e0b02f139f Mon Sep 17 00:00:00 2001 +From: Sergei Trofimovich <slyfox@gentoo.org> +Date: Fri, 22 Jul 2011 12:36:06 +0300 +Subject: [PATCH] fix build failure against ghc-7.2 + + src/Plugins/Monitors/Top.hs:140:17: + Illegal bang-pattern (use -XBangPatterns): + ! r + +Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org> +--- + src/Plugins/Monitors/Top.hs | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/src/Plugins/Monitors/Top.hs b/src/Plugins/Monitors/Top.hs +index e45210c..6001164 100644 +--- a/src/Plugins/Monitors/Top.hs ++++ b/src/Plugins/Monitors/Top.hs +@@ -13,6 +13,7 @@ + ----------------------------------------------------------------------------- + + {-# LANGUAGE ForeignFunctionInterface #-} ++{-# LANGUAGE BangPatterns #-} + + module Plugins.Monitors.Top (startTop, topMemConfig, runTopMem) where + +-- +1.7.3.4 + diff --git a/x11-misc/xmobar/xmobar-0.13.ebuild b/x11-misc/xmobar/xmobar-0.13.ebuild index a84842f92b5e..5094f65c38e8 100644 --- a/x11-misc/xmobar/xmobar-0.13.ebuild +++ b/x11-misc/xmobar/xmobar-0.13.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.13.ebuild,v 1.1 2011/09/18 18:09:00 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/xmobar/xmobar-0.13.ebuild,v 1.2 2012/04/02 03:34:46 slyfox Exp $ EAPI="3" CABAL_FEATURES="bin" -inherit haskell-cabal +inherit base haskell-cabal DESCRIPTION="A Minimalistic Text Based Status Bar" HOMEPAGE="http://projects.haskell.org/xmobar/" @@ -34,6 +34,8 @@ DEPEND=">=dev-lang/ghc-6.8.1 #RDEPEND="mpd? ( media-sound/mpd )" RDEPEND="" +PATCHES=("${FILESDIR}/${PN}-0.13-fix-build-failure-against-ghc-7.2.patch") + src_configure() { cabal_src_configure \ $(cabal_flag xft with_xft) \ |