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 | 15ac80871e3185609ed54662ae7536f3367c8fce (patch) | |
| tree | 0ec71785def90b269bab02984664cf42b965f2c2 /dev-haskell/x11-xft | |
| parent | whitespace (diff) | |
| download | historical-15ac80871e3185609ed54662ae7536f3367c8fce.tar.gz historical-15ac80871e3185609ed54662ae7536f3367c8fce.tar.bz2 historical-15ac80871e3185609ed54662ae7536f3367c8fce.zip | |
Fix x11-xft 0.3 compile with ghc 7.4.1
Package-Manager: portage-2.1.10.49/cvs/Linux x86_64
Diffstat (limited to 'dev-haskell/x11-xft')
| -rw-r--r-- | dev-haskell/x11-xft/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/x11-xft/Manifest | 5 | ||||
| -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 |
4 files changed, 38 insertions, 5 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/Manifest b/dev-haskell/x11-xft/Manifest index 464e77db6b1f..9678e5632192 100644 --- a/dev-haskell/x11-xft/Manifest +++ b/dev-haskell/x11-xft/Manifest @@ -1,4 +1,5 @@ +AUX x11-xft-0.3-ghc72.patch 957 RMD160 b45fa9e69911e945175c541b09b700a626f97c30 SHA1 4713a3a62c773f6b30fac3c29d745cfb08ce32fc SHA256 88c12aaa8255bf87c30271db902040e58ed49f9630a966f08dcd271f744f24c9 DIST X11-xft-0.3.tar.gz 13684 RMD160 d8a15e128947cec14371bd4847e69b2f25f247bd SHA1 5d2504ec9e89a57383d4363dc51e094b53f55996 SHA256 48892d0d0a90d5b47658877facabf277bf8466b7388eaf6ce163b843432a567d -EBUILD x11-xft-0.3.ebuild 844 RMD160 ca35eedfadbcde354887d34f897f165b947ceba5 SHA1 9a6911862d83dc29724d30efdd1cf7da4e2e89d3 SHA256 e474ddc9c6ea51572245d8ae86ad37410266f41e691877e9d1416f2854922b42 -MISC ChangeLog 576 RMD160 ec2beb03a73418ab2b8fa00dface18a99932ef64 SHA1 fcc02bb2364121dda18e4bb7866c0396920e89f7 SHA256 d1fec5976153e15cde7a3103eafd5e593bced883578973116c600e6556c6dc40 +EBUILD x11-xft-0.3.ebuild 896 RMD160 a01629e130dbf9db861ff55a9c76423da7e044a2 SHA1 d851742270ac0e7f206258eabd6210f9fe06b89a SHA256 108a384d482819093c027a1ec9a3f95a695066550413caa92237202c578084fc +MISC ChangeLog 719 RMD160 035f879a4b9d72482d52f1351bb323a887ae2c3c SHA1 82c765f57867e9acbeadf1455953c2d982dbcf5a SHA256 8a103443a17f31339dd9a20a1be11aa4223ac565ef03a9483195671430df001d MISC metadata.xml 223 RMD160 7783e6057effb8b8f0b79cffe8b557b32c633839 SHA1 7b962c77f2e38479a9d1621ec8d307ca9f761753 SHA256 1d00c8be162a6cb87b3de440b3e63e10b39c12d56e8fbfe592e75aed872b2508 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") |