[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxhaskell/, dev-haskell/wxhaskell/files/

[gentoo-commits] repo/gentoo:master commit in: dev-haskell/wxhaskell/, dev-haskell/wxhaskell/files/

[Sergei Trofimovich]

commit:     867fdf18ccb78321cdd3eabc0d4ef6e0dd14ff28
Author:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 16 22:27:30 2016 +0000
Commit:     Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sat Jan 16 22:27:30 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867fdf18

dev-haskell/wxhaskell: tweak for ghc-7.10, bug #561254

Package-Manager: portage-2.2.26

 dev-haskell/wxhaskell/files/wxhaskell-0.13.2.3-ghc-7.10.patch | 8 ++++++++
 dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild               | 4 ++++
 dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild               | 4 ++++
 3 files changed, 16 insertions(+)

diff --git a/dev-haskell/wxhaskell/files/wxhaskell-0.13.2.3-ghc-7.10.patch b/dev-haskell/wxhaskell/files/wxhaskell-0.13.2.3-ghc-7.10.patch
new file mode 100644
index 0000000..0d13741
--- /dev/null
+++ b/dev-haskell/wxhaskell/files/wxhaskell-0.13.2.3-ghc-7.10.patch
@@ -0,0 +1,8 @@
+diff --git a/src/Graphics/UI/WX/Window.hs b/src/Graphics/UI/WX/Window.hs
+index 0b04fa9..39c0505 100644
+--- a/src/Graphics/UI/WX/Window.hs
++++ b/src/Graphics/UI/WX/Window.hs
+@@ -1,2 +1,2 @@
+-{-# LANGUAGE TypeSynonymInstances, FlexibleInstances #-}
++{-# LANGUAGE TypeSynonymInstances, FlexibleInstances, FlexibleContexts #-}
+ --------------------------------------------------------------------------------

diff --git a/dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild
index 56a388d..491be5e 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.13.2.3.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.13.2.3-ghc-7.10.patch
+}
+
 src_configure() {
 	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
 	[[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1

diff --git a/dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild b/dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild
index 0ce4f06..0b28b63 100644
--- a/dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild
+++ b/dev-haskell/wxhaskell/wxhaskell-0.90.1.0.ebuild
@@ -31,6 +31,10 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.13.2.3-ghc-7.10.patch
+}
+
 src_configure() {
 	# ghc DCE bug: https://ghc.haskell.org/trac/ghc/ticket/9155
 	[[ $(ghc-version) == 7.8.2 ]] && replace-hcflags -O[2-9] -O1