diff options
| author |   Mark Wright <gienah@gentoo.org> | 2012-06-02 03:50:52 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2012-06-02 03:50:52 +0000 |
| commit | 81c1172d04c0c4da8b2d5772653a88404975e8a3 (patch) | |
| tree | 8625ca0e9066368a2109e68af103e461dbe8f4bc /dev-haskell | |
| parent | Stable everywhere. (diff) | |
| download | historical-81c1172d04c0c4da8b2d5772653a88404975e8a3.tar.gz historical-81c1172d04c0c4da8b2d5772653a88404975e8a3.tar.bz2 historical-81c1172d04c0c4da8b2d5772653a88404975e8a3.zip | |
Fix build with ghc 7.5 dev snapshot
Package-Manager: portage-2.1.10.63/cvs/Linux x86_64
Diffstat (limited to 'dev-haskell')
4 files changed, 31 insertions, 11 deletions
diff --git a/dev-haskell/regex-pcre-builtin/ChangeLog b/dev-haskell/regex-pcre-builtin/ChangeLog index e58708a97bf8..a1848247e987 100644 --- a/dev-haskell/regex-pcre-builtin/ChangeLog +++ b/dev-haskell/regex-pcre-builtin/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-haskell/regex-pcre-builtin # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-pcre-builtin/ChangeLog,v 1.2 2012/04/07 05:19:59 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-pcre-builtin/ChangeLog,v 1.3 2012/06/02 03:50:52 gienah Exp $ + + 02 Jun 2012; Mark Wright <gienah@gentoo.org> + +files/regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch, + regex-pcre-builtin-0.94.2.1.7.7.ebuild: + Fix build with ghc 7.5 dev snapshot 07 Apr 2012; Mark Wright <gienah@gentoo.org> regex-pcre-builtin-0.94.2.1.7.7.ebuild: diff --git a/dev-haskell/regex-pcre-builtin/Manifest b/dev-haskell/regex-pcre-builtin/Manifest index ea7a4260d463..fafe18df965b 100644 --- a/dev-haskell/regex-pcre-builtin/Manifest +++ b/dev-haskell/regex-pcre-builtin/Manifest @@ -1,14 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 +AUX regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch 520 RMD160 3ec5b3faf6792b9f015e6f522872129bf7a13701 SHA1 81468b337122a96f3cc3961f74dc08ca886caab2 SHA256 ab9d463b549d2426a49c43a22256ea667bf6a330af6be6c62486ba4bf497197f DIST regex-pcre-builtin-0.94.2.1.7.7.tar.gz 223037 RMD160 87197f30aa5f01fe128fb14c7b7bdbba4fe710ce SHA1 1ba1a920e5865135d6aec45de05b1e8d1ea56e79 SHA256 1ac5ae23a47d7a595f023e37c4acf9403b1e8db3525c8679bfcb8546a3eb9fb0 -EBUILD regex-pcre-builtin-0.94.2.1.7.7.ebuild 729 RMD160 427f724ada7f524aaa52adb5697cc49a64c33290 SHA1 27f9eeacf9f275eb89600bef537283ae15a9a668 SHA256 cbae8b3b2bd01adb913710b100825e3084cff50c3fb1184d289aaae02cd776ac -MISC ChangeLog 556 RMD160 2f588a33a45d8ea22ac6e1ba2cf371953eee5027 SHA1 7a2d191e17eb28c8e2c47f5ac0b321f775bd51ee SHA256 af3013d3855d1d7bd6cc0301d030daa5c643dc49194533c5f9fd5c68959cd9ba +EBUILD regex-pcre-builtin-0.94.2.1.7.7.ebuild 795 RMD160 16797919a877d64d60200b89f623ceedcfc196cd SHA1 9cc863a59935dfa4c56ee530e6534179b260d16d SHA256 a07ab0722bc22a7e386283b901c19fc0419bef08cdf1d427c1b99e551381c904 +MISC ChangeLog 740 RMD160 234a78f0a52f89e6e2516f790b1b74b6c8b58d9a SHA1 9379e57d63b69dba2b46c1ccea8e9cf243edc8ce SHA256 84d9a9454f773bfca0d4b4967b0116dc20a38ba1e64431f26cb8267cd75a8393 MISC metadata.xml 226 RMD160 ce53ae962a9db6f84ca4bb78be2164eaae59ef7e SHA1 5339c9c3bb37552032524a26cbebf57b6f67ef29 SHA256 e5dc2b6b77ac9bf27c18c122bdce1f2e766bbe26979d753337459c3fe807b851 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk9/zokACgkQoBEVQmGOlx8NuAEApfNNJPzWDP93YGu1ai68/LU+ -G26LiSDYdvumwXQlEDcA/3bpdSxB0maM4ZOHTdF6m6Pg6i6eVDxS1iHiDmiJkZ4Y -=CBXm +iF4EAREIAAYFAk/JjdwACgkQoBEVQmGOlx/VZAEAvy2FqVKXbcCBadC58Uv1Fs0v +b6xuh0Wx645H4sCoe54A/0CQe3tVS3JCpttn0CsqKRqFzrbzRJVKxwHanNSWn1Dw +=S6Df -----END PGP SIGNATURE----- diff --git a/dev-haskell/regex-pcre-builtin/files/regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch b/dev-haskell/regex-pcre-builtin/files/regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch new file mode 100644 index 000000000000..f735d3d2083f --- /dev/null +++ b/dev-haskell/regex-pcre-builtin/files/regex-pcre-builtin-0.94.2.1.7.7-ghc-7.5.patch @@ -0,0 +1,12 @@ +--- regex-pcre-builtin-0.94.2.1.7.7-orig/Text/Regex/PCRE/Wrap.hsc 2009-05-21 16:44:47.000000000 +1000 ++++ regex-pcre-builtin-0.94.2.1.7.7/Text/Regex/PCRE/Wrap.hsc 2012-05-19 15:04:34.225820227 +1000 +@@ -90,6 +90,9 @@ + import Text.Regex.Base.RegexLike(RegexOptions(..),RegexMaker(..),RegexContext(..),MatchArray,MatchOffset) + #endif + ++#if (__GLASGOW_HASKELL__>=705) ++import Foreign.C.Types(CInt(..), CSize(..)) ++#endif + + -- | return version of pcre used or Nothing if pcre is not available. + getVersion :: Maybe String diff --git a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild index 060ed5ba30e6..46f3106e09fe 100644 --- a/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild +++ b/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild @@ -1,13 +1,13 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild,v 1.2 2012/04/07 05:19:59 gienah Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/regex-pcre-builtin/regex-pcre-builtin-0.94.2.1.7.7.ebuild,v 1.3 2012/06/02 03:50:52 gienah Exp $ -# ebuild generated by hackport 0.2.13 +EAPI=4 -EAPI="4" +# ebuild generated by hackport 0.2.18.9999 -CABAL_FEATURES="lib profile haddock hscolour hoogle" -inherit haskell-cabal +CABAL_FEATURES="lib profile haddock hoogle hscolour" +inherit base haskell-cabal DESCRIPTION="Replaces/Enhances Text.Regex" HOMEPAGE="http://sourceforge.net/projects/lazy-regex" @@ -22,3 +22,5 @@ RDEPEND=">=dev-haskell/regex-base-0.93[profile?] >=dev-lang/ghc-6.8.2" DEPEND="${RDEPEND} >=dev-haskell/cabal-1.2.3" + +PATCHES=("${FILESDIR}/${PN}-0.94.2.1.7.7-ghc-7.5.patch") |