4 files changed, 74 insertions, 17 deletions
diff --git a/dev-haskell/gtk/ChangeLog b/dev-haskell/gtk/ChangeLog
index 7459c48dd8a9..5eaa34472278 100644
--- a/dev-haskell/gtk/ChangeLog
+++ b/dev-haskell/gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-haskell/gtk
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/ChangeLog,v 1.3 2011/06/21 11:01:56 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/ChangeLog,v 1.4 2012/05/13 15:40:18 slyfox Exp $
+
+*gtk-0.12.3 (13 May 2012)
+
+  13 May 2012; Sergei Trofimovich <slyfox@gentoo.org>
+  +files/gtk-0.12.3-glib-2.32.patch, +gtk-0.12.3.ebuild:
+  Version bump (ghc-7.4 support, bug #413229 by Alex)
 
   21 Jun 2011; Markos Chandras <hwoarang@gentoo.org> gtk-0.12.0.ebuild:
   Stable on amd64 wrt bug #314059
diff --git a/dev-haskell/gtk/Manifest b/dev-haskell/gtk/Manifest
index a278186961da..d4528e55492a 100644
--- a/dev-haskell/gtk/Manifest
+++ b/dev-haskell/gtk/Manifest
@@ -1,24 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX gtk-0.12.3-glib-2.32.patch 541 RMD160 7ab86f3177770450ecb55caeba999f899c93b7bf SHA1 69c5032f8be13230c6d2447eef8a3a60a7562cbb SHA256 319993a82fa416293d3d69fff5aebf22f5bb5e87cac4803c5f5096df3aba6ed1
 DIST gtk-0.12.0.tar.gz 655682 RMD160 14df626d8b75fd293a4f0cc7f390e0477fc2e0d9 SHA1 88bacffb306fa16de05a83e36a66fbf2630f37ec SHA256 423fdd63794b88c822a3aeb8f8bbf5c846fe7c9630a81516cd0daa0cd2001ee7
+DIST gtk-0.12.3.tar.gz 660880 RMD160 574b94a18e41d041ffea8fe52b72bfae295b6554 SHA1 89e7773bd60753db2360bd49b20e0aa07d140a2e SHA256 9880787bd65dff701204df5c08e14a535b698fc75786b192a975de3e7158ab28
 EBUILD gtk-0.12.0.ebuild 1101 RMD160 2d5b617ef20487f8628a3d4272e3a872ee1880b4 SHA1 3063bf94946616ae005bc9852323455485c783ed SHA256 91916989c3d7a67b91c106d2a604fdb4b99cdb2cf249cbf431acbee390a73db5
-MISC ChangeLog 581 RMD160 edd9cb9761aa5304c2148df105e3f23ca925d8ef SHA1 417cce28390bc31435c4e89e3ce6ae2fb92644a9 SHA256 3562a557129cd2c9cfee9b340a9f5e85eace315b50d9686e3995b2baec3a2c31
+EBUILD gtk-0.12.3.ebuild 1203 RMD160 412b31de10319ef85af331f7818f7d27a9a7dc7f SHA1 c2a8a3673cddf3c2f071a37789d2e37c9d07e6c4 SHA256 3b0145e67f0ea8638af7df54d21f192123a05a46d039dbb9248b1eac76bbec33
+MISC ChangeLog 772 RMD160 92692aa7dbce3ea7a51cd025836dcd6061bf3e6b SHA1 524e05ce4e23748d3a06b24a2c91e144a9a1726b SHA256 9df4e0b48cc3459e6f932fe9c8aaeeb5f81922e1c480aec655bb23b23863d093
 MISC metadata.xml 292 RMD160 230fd90350031105ad6550df287647dac9387cac SHA1 5ca0343ced2eec5f4ae7e59a41c8a8902d3077a6 SHA256 5b1d453f724210086fd03e2d27b3f21b45459a0478936718320a88535a8d0b71
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOAHplAAoJEPqDWhW0r/LCBRMP/1w4ldNP96h0RqzanzCMO2Vj
-9fwWFxXYE1k7LHgnYCR88g1vxxbjRlmv0CDfw8iSeJnM8GLv4A00ZINwUvkeiSxg
-qlyxmEkD6d1thOtsU4KVBKpxT5iMCDWXhlPRgtrohzmqCAwFYR42f+vUG8mqP6Nj
-Lja0YLjfWYljz6SD8y1l3rFYolPhqYBg+T/dCMIRVz6cuk7xf5bP0ViruCs2xdaY
-cAn1zbRL0mov/Gp4xFiA2n6aDRsBTe5Ds0HvCZ2NUQxxSpN2IGZmcxri91bSZf24
-h2LQLFnYBr4/s5WysCecjr+OdmarDsVMEU/bezVCZl6SR55napRLVLgJMhjHRKJv
-isoNl1xs93opAU0AVmj+1hth9hCYhd1q2gk2wQttxw30Kqf4nIEQje3pOtNWdMTa
-/HLJ2EzrXn8EnJwXCPJZAE24EQ++j1llrxubv+QwgnwBy2J+aoRafTUHrPovmZ5S
-LVw7yguPV8cQf0j04IOwngfEzu/mmtUYOVXMPriDb8EaYgXykyB/shcTguXFxqp3
-7h1poJ26swjMvDWKTtpDj9uDs8kObg3S58cK1DdVuWUHaYBZpifQFZO5YrcBbg8s
-9/Ax8arNPPfW1uC6K3ua/L9lq8Fmg0LoYuTQSk+EGFLxqEugswHLpcVTDUaO+QN5
-Ldw34boCHL7/gu/VE/S5
-=rvu6
+iEYEARECAAYFAk+v1xoACgkQcaHudmEf86qv5gCcD90qVlj6JRSb+kN0GRU0c5FW
+DK8An2RGeSBXDFmEC4vAy8rP1y+fZGJh
+=64yw
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/gtk/files/gtk-0.12.3-glib-2.32.patch b/dev-haskell/gtk/files/gtk-0.12.3-glib-2.32.patch
new file mode 100644
index 000000000000..1f07c0737150
--- /dev/null
+++ b/dev-haskell/gtk/files/gtk-0.12.3-glib-2.32.patch
@@ -0,0 +1,18 @@
+fix build failure against recent glib-2.32
+
+In file included from Graphics/UI/Gtk/General/hsgthread.c:29:0: 
+
+/usr/include/glib-2.0/glib/gthread.h:28:2:
+     ошибка: #error "Only <glib.h> can be included directly."
+diff --git a/Graphics/UI/Gtk/General/hsgthread.c b/Graphics/UI/Gtk/General/hsgthread.c
+index 5eaed46..6d20e73 100644
+--- a/Graphics/UI/Gtk/General/hsgthread.c
++++ b/Graphics/UI/Gtk/General/hsgthread.c
+@@ -26,7 +26,6 @@
+  */
+ 
+ #include <glib.h>
+-#include <glib/gthread.h>
+ #include <gdk/gdk.h>
+ #include "hsgthread.h"
+ 
diff --git a/dev-haskell/gtk/gtk-0.12.3.ebuild b/dev-haskell/gtk/gtk-0.12.3.ebuild
new file mode 100644
index 000000000000..5fdd3e635b18
--- /dev/null
+++ b/dev-haskell/gtk/gtk-0.12.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gtk/gtk-0.12.3.ebuild,v 1.1 2012/05/13 15:40:18 slyfox Exp $
+
+# ebuild generated by hackport 0.2.13
+
+EAPI=4
+
+#nocabaldep is for the fancy cabal-detection feature at build-time
+CABAL_FEATURES="lib profile haddock hscolour hoogle nocabaldep"
+inherit base haskell-cabal
+
+DESCRIPTION="Binding to the Gtk+ graphical user interface library."
+HOMEPAGE="http://projects.haskell.org/gtk2hs/"
+SRC_URI="http://hackage.haskell.org/packages/archive/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gio"
+
+RDEPEND="=dev-haskell/cairo-0.12*[profile?]
+		=dev-haskell/glib-0.12*[profile?]
+		dev-haskell/mtl[profile?]
+		=dev-haskell/pango-0.12*[profile?]
+		>=dev-lang/ghc-6.10.1
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		gio? ( =dev-haskell/gio-0.12*[profile?] )"
+DEPEND="${RDEPEND}
+		dev-haskell/gtk2hs-buildtools"
+
+PATCHES=("${FILESDIR}"/${P}-glib-2.32.patch)
+
+src_configure() {
+	# Upstream has this enabled, so we might as well force it enabled to be sure.
+	cabal_src_configure \
+		--flags=deprecated \
+		$(cabal_flag gio have-gio)
+}