diff options
| author |   Mark Wright <gienah@gentoo.org> | 2012-03-04 05:12:57 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2012-03-04 05:12:57 +0000 |
| commit | 74c88bdcb8c56f2d135eb911d5b515c2acf10a4e (patch) | |
| tree | 8ceeddd75d6b8bd749640cb4cffd3d3108e95f7e | |
| parent | whitespace (diff) | |
| download | gentoo-2-74c88bdcb8c56f2d135eb911d5b515c2acf10a4e.tar.gz gentoo-2-74c88bdcb8c56f2d135eb911d5b515c2acf10a4e.tar.bz2 gentoo-2-74c88bdcb8c56f2d135eb911d5b515c2acf10a4e.zip | |
Fix x11-xft 0.3 compile with ghc 7.4.1
(Portage version: 2.1.10.49/cvs/Linux x86_64)
| -rw-r--r-- | dev-haskell/x11-xft/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/x11-xft/files/x11-xft-0.3-ghc72.patch | 26 | ||||
| -rw-r--r-- | dev-haskell/x11-xft/x11-xft-0.3.ebuild | 6 |
3 files changed, 35 insertions, 3 deletions
diff --git a/dev-haskell/x11-xft/ChangeLog b/dev-haskell/x11-xft/ChangeLog index 11cdf9cf79ee..be3e1fa04b90 100644 --- a/dev-haskell/x11-xft/ChangeLog +++ b/dev-haskell/x11-xft/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-haskell/x11-xft # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11-xft/ChangeLog,v 1.3 2012/03/04 05:02:57 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11-xft/ChangeLog,v 1.4 2012/03/04 05:12:57 gienah Exp $ + + 04 Mar 2012; Mark Wright <gienah@gentoo.org> x11-xft-0.3.ebuild, + +files/x11-xft-0.3-ghc72.patch: + Fix x11-xft 0.3 compile with ghc 7.4.1 04 Mar 2012; Mark Wright <gienah@gentoo.org> x11-xft-0.3.ebuild: Add ~ppc64 keywords to x11-xft 0.3, thanks to EM3RY for testing. diff --git a/dev-haskell/x11-xft/files/x11-xft-0.3-ghc72.patch b/dev-haskell/x11-xft/files/x11-xft-0.3-ghc72.patch new file mode 100644 index 000000000000..42e53fd3d0c5 --- /dev/null +++ b/dev-haskell/x11-xft/files/x11-xft-0.3-ghc72.patch @@ -0,0 +1,26 @@ +diff --git a/Graphics/X11/Xft.hsc b/Graphics/X11/Xft.hsc +index b32d3c9..493c5ee 100644 +--- a/Graphics/X11/Xft.hsc ++++ b/Graphics/X11/Xft.hsc +@@ -57,7 +57,7 @@ import Foreign.Marshal.Array + import Codec.Binary.UTF8.String as UTF8 + import Data.Int + import Data.Word +-import Monad ++import Control.Monad + + #include <X11/Xft/Xft.h> + +diff --git a/X11-xft.cabal b/X11-xft.cabal +index 06bba67..273c96a 100644 +--- a/X11-xft.cabal ++++ b/X11-xft.cabal +@@ -9,7 +9,7 @@ synopsis: Bindings to the Xft, X Free Type interface library, and some Xre + description: Bindings to the Xft, X Free Type interface library, and some Xrender parts + exposed-modules: Graphics.X11.Xft, Graphics.X11.Xrender + extensions: ForeignFunctionInterface +-build-depends: base, haskell98, X11>=1.2.1, utf8-string>=0.1 ++build-depends: base, X11>=1.2.1, utf8-string>=0.1 + ghc-options: -funbox-strict-fields + pkgconfig-depends: xft + extra-source-files: Hello.hs diff --git a/dev-haskell/x11-xft/x11-xft-0.3.ebuild b/dev-haskell/x11-xft/x11-xft-0.3.ebuild index bcddf33a19d1..9a7c0276285b 100644 --- a/dev-haskell/x11-xft/x11-xft-0.3.ebuild +++ b/dev-haskell/x11-xft/x11-xft-0.3.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11-xft/x11-xft-0.3.ebuild,v 1.3 2012/03/04 05:02:57 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/x11-xft/x11-xft-0.3.ebuild,v 1.4 2012/03/04 05:12:57 gienah Exp $ EAPI="4" CABAL_FEATURES="lib profile haddock" -inherit haskell-cabal +inherit base haskell-cabal MY_PN="X11-xft" MY_P="${MY_PN}-${PV}" @@ -28,3 +28,5 @@ DEPEND="${RDEPEND} dev-haskell/cabal" S="${WORKDIR}/${MY_P}" + +PATCHES=("${FILESDIR}/${PN}-0.3-ghc72.patch") |