From: Sergei Trofimovich Date: Tue, 13 Jul 2010 11:00:26 +0000 (+0000) Subject: Fixed build failure against ghc-6.12.2+ (bug #327903) X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=424696a09f841b213097b852472b213624b800c3;p=gentoo.git Fixed build failure against ghc-6.12.2+ (bug #327903) Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/dev-haskell/gtk2hs/ChangeLog b/dev-haskell/gtk2hs/ChangeLog index bb3ebd5e898c..45774177fe3b 100644 --- a/dev-haskell/gtk2hs/ChangeLog +++ b/dev-haskell/gtk2hs/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for dev-haskell/gtk2hs # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.55 2010/06/28 14:28:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/ChangeLog,v 1.56 2010/07/13 11:00:26 slyfox Exp $ + + 13 Jul 2010; Sergei Trofimovich gtk2hs-0.10.1.ebuild: + Fixed build failure against ghc-6.12.2+ (bug #327903). Thanks to Renato + Gallo and Diego E. 'Flameeyes' Pettenò + for the report. Thanks to Ivan Lazar Miljenovic + for the fix. 28 Jun 2010; Samuli Suominen gtk2hs-0.9.12.1.ebuild, gtk2hs-0.10.1.ebuild: diff --git a/dev-haskell/gtk2hs/Manifest b/dev-haskell/gtk2hs/Manifest index fd04c2395357..b661560a366d 100644 --- a/dev-haskell/gtk2hs/Manifest +++ b/dev-haskell/gtk2hs/Manifest @@ -3,7 +3,7 @@ AUX gtk2hs-0.10.1-ghc-6.12-packages.patch 15076 RMD160 0c9931317c06f86a4d145e569 AUX gtk2hs-0.9.12.1-librsvg-2.22.3.patch 335 RMD160 cf96ef312fda9388a3d4cf28058ffa004ebd2b77 SHA1 2908e21aa9bc8e28d61d410f8b8570ad30a59f7f SHA256 e8e4adb06d915a0c1300a3b4bf597930bd20ba5fd7bd7f9121fc999ccf855577 DIST gtk2hs-0.10.1.tar.gz 1451125 RMD160 c72acd0e2c5471c7757532cfb44c841be8e83f1d SHA1 808d8c80026b82dc2b1347055efba82f8847c424 SHA256 07cc98520ce6c9e0d2549fd8fd23fc5118148b7509843b0163340713a762d0c0 DIST gtk2hs-0.9.12.1.tar.gz 1004661 RMD160 cd658027ed91b9550915e686d546e36b1b371c10 SHA1 a85f8568aa072e0c55da5889b2aabff92b8da3ae SHA256 4278078b786202fc64f86881c2b2517bdd589d5248bff2e9b7e6c1ffd2361f84 -EBUILD gtk2hs-0.10.1.ebuild 2652 RMD160 b07b5eb168031ddc34aa99a1882b424c3155c287 SHA1 4f943c942b6d493235bcd28f546c5783d533600b SHA256 a5d9695ba132a1aee4c08102a0dee262133831970364c0623a94367cbd21e0b1 +EBUILD gtk2hs-0.10.1.ebuild 2851 RMD160 9e1a1385be28475a9b0433ea78a00bfff6de4b3f SHA1 9767d78cd8b9a623e437511f75057284126cfd94 SHA256 1b63ea93eb2594004b24c598c4cefc0512beb7dc84e2875937364d7d01824267 EBUILD gtk2hs-0.9.12.1.ebuild 3048 RMD160 11710382e632810b6fae74c7d0e4374b799dd528 SHA1 804baff1955127305f88455b02c54542d7b061fc SHA256 e5b9c2adecae399316ae38bd6e33c976aab64b0d06b5ee95963dcde048c0bc47 -MISC ChangeLog 8362 RMD160 1de2426ae571e5922120a1402473b00dc04ff72d SHA1 e56855f12c2f208d4b921f97cef8d73755418441 SHA256 6df6abbc8b93baa99f13b9f3fece93058e4162514b6beb44d079947d2844476a +MISC ChangeLog 8699 RMD160 434b283364437505aa189b7af77766a424f13c1b SHA1 46d1bb63512f28191e5be0780e9c766621c74d8c SHA256 5e663a79c33c080029fa0521808750b0ee40e4ffbca286ffd4db04a3c1228823 MISC metadata.xml 264 RMD160 d289d41d1d04ed1c3e574a29f53999457dbdc52c SHA1 475c909ed389f5e0508b5cd8e1373db2b96ce75b SHA256 743889dc0a1fac66b79afe2bbc2e61338d1d467aabc7b29977885d61c94a2a82 diff --git a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild b/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild index 551cf720f475..ec5291a1597a 100644 --- a/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild +++ b/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild,v 1.3 2010/06/28 14:28:37 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk2hs/gtk2hs-0.10.1.ebuild,v 1.4 2010/07/13 11:00:26 slyfox Exp $ EAPI="2" @@ -40,6 +40,12 @@ src_prepare() { epatch "${FILESDIR}/gtk2hs-0.10.1-ghc-6.12-packages.patch" epatch "${FILESDIR}/gtk2hs-0.10.1-ghc-6.12-c2hs.patch" cd "${S}" + + # In GHC 6.12.2, qualified imports is now an error + sed -i -e "s/Map.findWithDefault, empty/findWithDefault, empty/" \ + tools/c2hs/base/syms/Attributes.hs \ + || die "Can't remove qualified import" + eautoreconf }