Patch gio-0.12.3 for ghc 7.6.1

Package-Manager: portage-2.1.11.31/cvs/Linux x86_64
Manifest-Sign-Key: 0x618E971F

4 files changed, 44 insertions, 4 deletions

diff --git a/dev-haskell/gio/ChangeLog b/dev-haskell/gio/ChangeLog
index 02c16a43f5c7..8b7e7c2d9b0c 100644
--- a/dev-haskell/gio/ChangeLog
+++ b/dev-haskell/gio/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/gio
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/ChangeLog,v 1.7 2012/09/12 14:39:19 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/ChangeLog,v 1.8 2012/11/25 05:44:31 gienah Exp $
+
+  25 Nov 2012; Mark Wright <gienah@gentoo.org> +files/gio-0.12.3-ghc-7.6.patch,
+  gio-0.12.3.ebuild:
+  Patch gio-0.12.3 for ghc 7.6.1
 
   12 Sep 2012; Alexander Vershilov <qnikst@gentoo.org> gio-0.12.0.ebuild,
   gio-0.12.3.ebuild:
diff --git a/dev-haskell/gio/Manifest b/dev-haskell/gio/Manifest
index 61ef3d9d6d04..1e70bd23f01a 100644
--- a/dev-haskell/gio/Manifest
+++ b/dev-haskell/gio/Manifest
@@ -1,6 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+AUX gio-0.12.3-ghc-7.6.patch 944 SHA256 4afa5ca50cccf40173f1934f7a6b5b70b3cd76c43ce5d662262ea1829f16318f SHA512 86e2809d1acea8a7dfb71939e4085c4bdb7023a690e153bec3f4b2cf487d7775d4b00cb142431bb64ae4c793d648bea8ce12ac2822cbf3e6d05d8bd9a09c1bde WHIRLPOOL 1f86eceec48adda7072b96d4a5f28cab3b7a085e5b73eac7cff9560a65bce5914c9c7e66440656132befdb1a534fc63468280e83f302e657281a451b721c9a43
 DIST gio-0.12.0.tar.gz 76629 SHA256 2c3c60a63251d08c35abae6fe22c04de585f54e07f8a97d1f1835d42e6f3b25c SHA512 0accc2496dd93456a47fc767ce3472d5858aed27239c0a9712051a06974c99473a5654c20b42c8e314e21342745261ddaeeb42cc4d104b1aa16644e35aa01104 WHIRLPOOL 69219777af316ef92abf2038824e32650ea6b596d5f05bc16deb87c40e3eb091297133d52219c0ad4fadda2ac2deac6042aa29f0870bf9b76bac8e775baea9ec
 DIST gio-0.12.3.tar.gz 77997 SHA256 56aa7cd4d48486ce895fadba0113abc68a5f188bafccb200d448f2fe68a3b84e SHA512 8bd895dd5607679cbb6a7e82d5055e1c347bb75f152f21f9bd27feb59d01abcc419ea3abd6a87e4878318b9cffbd8b742c89def648c0605f3245eb40b2d94c0b WHIRLPOOL 77c931e4fbac05f4b0cbe0a0a6d7592654d73fc2f3b8522c9a0ca87bb91c031295401bcc4b79b93ffc6fad3b0956a037a7c82b5c831015e6e19999fe1492b174
 EBUILD gio-0.12.0.ebuild 797 SHA256 0156da9fdb71ebf4b1118016e2538f372ed1b6284fcaff4b0aa7dffe9b939922 SHA512 4a12560fe8ce97a4a7c2a21d94606efcb1bb6f31597a8fe781329cae9d747ef1e9436635e81be0cadfd1c197eb8ea38ff75b3a157d8b9ff3ba5396075faaf81a WHIRLPOOL 8bdf80e4ed6f4beb3f320f3fdbabc3c5bd3b1a787cf4fafd62e8cfa54a73bede8d7248d2faed738f0a06a1f0257f04d8eca5d624cdceaec3d779b680a98c6311
-EBUILD gio-0.12.3.ebuild 791 SHA256 e7ae4b9147ab2aaa7a0fdfdd15148126410476fcc85c5621d41ac12e1fac4440 SHA512 ae0f4eab449af4215545c48dc3493dad32d14c160c84f62778e619a754b81fde5739181318a562d0669acf398d4ec4848c1bea3b745e6f53645b4cd19317e80c WHIRLPOOL a4599cf3be66ff51c976158fa976212b6ac9e1580a97a58c0cfa1218f0f2623eabe6fa3c9c5ee04987ea9986e5bbfea6bc92e83d672eb902310bbbf3e72d3db0
-MISC ChangeLog 1128 SHA256 46ef20f5876ae42b1e36473cbe6b0aae33e1b7653c168b7fecf5a6be501a23b8 SHA512 e5fdbfff98a19b205ee85c3549bffb4316ce5832e314fbffaf0451871df8199696e7169b935441b8888026c0e1569443b03e3b6850c001ed8528a729dc7afc23 WHIRLPOOL 0f4c75ed8c785a75d05b653f8ed986fbbc75f12f0a92e0e801a1634cd71c47ee5325e272769e442786ba7fec1725ac0ff483935da6dee3dc2554db8a66a878d9
+EBUILD gio-0.12.3.ebuild 1040 SHA256 682a94001d7225f63e1b90c8ec78c4b7f7f7695faac0b138232864cfd9f110c3 SHA512 aa5ea2637b7266c2e16eb5aa4b1967a07286d5661a142877fabc1e36b0291674f73a0e4246e63c44a9d69038b855ec32c3fecc30eb8c7196989e05042eed5258 WHIRLPOOL 0a1563a4a9e6e3ee1bc9ce5950cfcca491bd28c55d5be6ed9ca881f5196d66da5b7eb74c3b560ee7ccfe11c7ce1239d7e64aea2f921fb8ee9cf42c57d885e3c8
+MISC ChangeLog 1263 SHA256 3f9d35950645fb42b72e53ea4647946134e6c5ce4fda6fc1a2eb9b10698f5922 SHA512 2b3d5d5309abdee1ba2b4f27a2041044a5b08c789154f4a570e285565b9778868342815b54a05f9ff1cd01ed28612dc0d4229bcc716fb85a0e94b26b00113025 WHIRLPOOL 60c9ecbd317b82e301e39d3ff58979926372f495fadc9a415a496736c01755cfda19a3720b8e7e4d1ca162841abe47bdb3825b3da7b9f17aae54afe2056f19d4
 MISC metadata.xml 662 SHA256 45091c1719c556583ac2388de3aa8a2608b7b63f1baba90b1d4532d8c4a8a806 SHA512 6e8cfdffb863044fa82c493e063d130094f8da11de2df673bbf41d568ca36338c6862f3ca27e2c3ab86b964a4cc53353e6e52f48e60020207d89b8e12ca33a40 WHIRLPOOL 22e4d1df519b9f31b5d6e469ca04aa951ba9a022901684028142122661b83b80257804e31d4c4800f20946ed118fe773b1f27df31dfc282da88f0046b270380c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlCxsEUACgkQoBEVQmGOlx+v+wEAySsz5ZXMhXwX7NVcueG/Wfrd
+X9q+PFtzbROfQRitFZ4A/jNZH8GFCU6SLjUCeBQJ4SeslC/aGDFtnbj1yl5unPzH
+=COmH
+-----END PGP SIGNATURE-----
diff --git a/dev-haskell/gio/files/gio-0.12.3-ghc-7.6.patch b/dev-haskell/gio/files/gio-0.12.3-ghc-7.6.patch
new file mode 100644
index 000000000000..45b636b61ba5
--- /dev/null
+++ b/dev-haskell/gio/files/gio-0.12.3-ghc-7.6.patch
@@ -0,0 +1,17 @@
+--- gio-0.12.3-orig/System/GIO/Async/AsyncResult.chs	2012-03-09 10:32:58.000000000 +1100
++++ gio-0.12.3/System/GIO/Async/AsyncResult.chs	2012-10-11 10:04:03.686864483 +1100
+@@ -47,12 +47,12 @@
+ {#pointer GAsyncReadyCallback#}
+ 
+ foreign import ccall "wrapper" mkAsyncReadyCallback :: 
+-    (Ptr GObject -> Ptr AsyncResult -> Ptr () -> IO ()) -> IO GAsyncReadyCallback
++    (Ptr () -> Ptr AsyncResult -> Ptr () -> IO ()) -> IO GAsyncReadyCallback
+ 
+ marshalAsyncReadyCallback :: AsyncReadyCallback -> IO GAsyncReadyCallback
+ marshalAsyncReadyCallback asyncReadyCallback = 
+     mkAsyncReadyCallback $ \ cObject cAsyncResult cCallback -> do
+-      object <- (makeNewGObject mkGObject . return) cObject
++      object <- (makeNewGObject mkGObject . return) (castPtr cObject)
+       asyncResult <- (makeNewGObject mkAsyncResult . return) cAsyncResult
+       asyncReadyCallback object asyncResult
+       freeHaskellFunPtr (castPtrToFunPtr cCallback)
diff --git a/dev-haskell/gio/gio-0.12.3.ebuild b/dev-haskell/gio/gio-0.12.3.ebuild
index 8aa99d8fa1cd..dc34dbd31bee 100644
--- a/dev-haskell/gio/gio-0.12.3.ebuild
+++ b/dev-haskell/gio/gio-0.12.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.12.3.ebuild,v 1.4 2012/09/12 14:39:19 qnikst Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/gio/gio-0.12.3.ebuild,v 1.5 2012/11/25 05:44:31 gienah Exp $
 
 # ebuild generated by hackport 0.2.13
 
@@ -25,3 +25,11 @@ RDEPEND="=dev-haskell/glib-0.12*[profile?]
 		dev-libs/glib:2"
 DEPEND="${RDEPEND}
 		dev-haskell/gtk2hs-buildtools"
+
+src_prepare() {
+	# c2hs ignores #if __GLASGOW_HASKELL__ >= 706
+	# I do not know which earlier ghc versions the patch submitted upstream works with
+	if has_version ">=dev-lang/ghc-7.6.1"; then
+		epatch "${FILESDIR}/${PN}-0.12.3-ghc-7.6.patch"
+	fi
+}