summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wright <gienah@gentoo.org>2013-04-03 05:29:37 +0000
committerMark Wright <gienah@gentoo.org>2013-04-03 05:29:37 +0000
commit86736a09744f18861b992ac343850e1708f1213b (patch)
treec8f096736d3e7a6b6d4ff80b6646acabb632736d /dev-haskell/gtk/files
parentMove gtk2hs to slot 2 fix bug 464260. (diff)
downloadgentoo-2-86736a09744f18861b992ac343850e1708f1213b.tar.gz
gentoo-2-86736a09744f18861b992ac343850e1708f1213b.tar.bz2
gentoo-2-86736a09744f18861b992ac343850e1708f1213b.zip
Move gtk2hs to slot 2 fix bug 464260. Patch gtk-0.12.0 to fix bugs 464266 - dev-haskell/gtk-0.12.0: build fails with >=ghc-7.4.1 Ambiguous module name and 455012 - dev-haskell/gtk-0.12.0: fails to build with glib-2.32
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell/gtk/files')
-rw-r--r--dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch23
1 files changed, 23 insertions, 0 deletions
diff --git a/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch b/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch
new file mode 100644
index 000000000000..1d454c5f06ea
--- /dev/null
+++ b/dev-haskell/gtk/files/gtk-0.12.0-ghc-7.2.patch
@@ -0,0 +1,23 @@
+diff --git a/Graphics/UI/Gtk/General/Structs.hsc b/Graphics/UI/Gtk/General/Structs.hsc
+index 2df0385..c1b8452 100644
+--- a/Graphics/UI/Gtk/General/Structs.hsc
++++ b/Graphics/UI/Gtk/General/Structs.hsc
+@@ -1,4 +1,5 @@
+ {-# LANGUAGE ScopedTypeVariables, TypeSynonymInstances #-}
++{-# LANGUAGE FlexibleInstances #-}
+ {-# OPTIONS_HADDOCK hide #-}
+ -- -*-haskell-*-
+
+diff --git a/gtk.cabal b/gtk.cabal
+index bd97975..aa7165f 100644
+--- a/gtk.cabal
++++ b/gtk.cabal
+@@ -126,7 +126,7 @@ Flag have-gio
+
+ Library
+ build-depends: base >= 4 && < 5,
+- array, containers, haskell98, mtl, bytestring,
++ array, containers, mtl, bytestring,
+ glib >= 0.12.0 && < 0.13,
+ pango >= 0.12.0 && < 0.13,
+ cairo >= 0.12.0 && < 0.13