Patch glib-0.12.3.1 for ghc 7.6.1

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

4 files changed, 52 insertions, 8 deletions

diff --git a/dev-haskell/glib/ChangeLog b/dev-haskell/glib/ChangeLog
index 86ec7ffbafc2..083bc5f70f50 100644
--- a/dev-haskell/glib/ChangeLog
+++ b/dev-haskell/glib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-haskell/glib
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v 1.8 2012/09/23 08:42:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/ChangeLog,v 1.9 2012/11/25 05:43:19 gienah Exp $
+
+  25 Nov 2012; Mark Wright <gienah@gentoo.org>
+  +files/glib-0.12.3.1-ghc-7.6.patch, glib-0.12.3.1.ebuild:
+  Patch glib-0.12.3.1 for ghc 7.6.1
 
   23 Sep 2012; Pawel Hajdan jr <phajdan.jr@gentoo.org> glib-0.12.3.1.ebuild:
   x86 stable wrt bug #428930
diff --git a/dev-haskell/glib/Manifest b/dev-haskell/glib/Manifest
index 8f7b69e3d492..21cc735eae34 100644
--- a/dev-haskell/glib/Manifest
+++ b/dev-haskell/glib/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX glib-0.12.3.1-ghc-7.6.patch 1210 SHA256 b5e2fdcd26fe9189fa794f02a9baf34d296e6276de70fd1ca04fbc276a379e45 SHA512 d8850369128cf010eab87a0514e6d11a65cfbfa680fb9193efc86271ab73f1a3451ef82402d256b23c32aac119418ba69666133ee8d3c8f3848d6b5d00e804d9 WHIRLPOOL 5512079a6a597d3c94a47c43d47c1ade2c5726d2a74497c6cb60a2b39c0ac27ab5c80d3c8945b3d69d06c929a7164469a7504a6f1439378d2281d03e184fa8aa
 DIST glib-0.12.0.tar.gz 43084 SHA256 29fce431e5561998ad28923a453373b6979d3dbac1fb446d63eca0d7949113eb SHA512 b0aa70eeb65f996fc34703637e30eef007dc4b825ec7892ffdebf8a355edb74e31f6344b4856f44db686da5fa1cf48ab6c74fd0cf51ea4fcbecdf15e24fc1209 WHIRLPOOL 967b2099b3caac6ebc5b47f2c69c2ef04dd517f2cf4ff9b732eef996278f9456f039c5058c59bd2c0c43bdb6b001e9dc851a8cb2d71decda93a87e4ba712560b
 DIST glib-0.12.3.1.tar.gz 45431 SHA256 fe821dc994452e497d075f3be74a7eac6e1637be84982ce7ae0aec59400bbacc SHA512 7521f40780421c08827a0de2bdceaa713ae93f58eefb3befa7b6d2c22069e1bc6afcad846de5f95f4d5c867cc8342b86dfd43e7380e99461f8cecd531abdaca2 WHIRLPOOL 31b15b1f6735578c0188e4663cb89639f50287334b307978a7b8d5b919e30663dc4d346d94fc967302ec3e3c6f382d9470534fdfcf8d895d94cea593505012f7
 DIST glib-0.12.3.tar.gz 45433 SHA256 abc66e4f76ea3f4563de9e5a9a36fd12a71d8f4939220ad912997ea9bbe567c3 SHA512 27112649597a40ccb659c3ccbe8d3854d209683389c33907e534442af1dbfadf685ec757d83b534fdc8f8cceb38d6e0556e0864794bc32e3b0dabd77dc9bd69d WHIRLPOOL 95688e18e30b04f367a879560b73dc083e94bc99ddcf57caccfde103fdfd3779e738bb77bee0cd326e4b8707b786b478b0738515c671130e055f08a5a1a981ed
 EBUILD glib-0.12.0.ebuild 749 SHA256 9ff234d0acd72af622e056bcba12bdb1371adb100fc5842b0faba31003d4480b SHA512 9070154e4bd3ef36dc0eee4f76d578f634aba0fb2df934c31ed9d7c53223c4b6cbcf315aed21de23adab0c2bc92f386ad56d695e2606f3743e7f7a320047a25e WHIRLPOOL 3299eb3e38a2a1f5dcf83033936b508861d73dbc8cecc752cc6fe27278e6825844cf76b797096823054281562ed7fe9a285cea59a42de6cc8d3ae30cd63b546c
-EBUILD glib-0.12.3.1.ebuild 721 SHA256 a54bcbeb975d9f48154679f50ca04dbcf69a174eaba05c83986747182bb36d39 SHA512 647c2fc72a58624a8c69200374ada526ce006282dce961158243704eac547ce7b582d9cfb0f8963fcaea448a60fc31b87433bc08e222a48c2b2c6448ee5af44f WHIRLPOOL 168bf57c0dc7d382fde67dd5087cbb84fa7971e964933ff8649c21bda764ad3e9f8e83adedef814c8e6b17aaf7148f1ceccf4ed9edbd3b3bdd0c09711a47135b
+EBUILD glib-0.12.3.1.ebuild 963 SHA256 5e404ffc32a149607e3d7b630ba8ea85de8df6eefca7ca78b952f8363cd2c8eb SHA512 c7471db7f0a0cfa835e382a8984ac8ec207bb702cad7c2ce8348ce745f94058ab1567dfbb8f92e9a8a2b95e716847fa5a1b7cb9d71ea55b353a94efe52772019 WHIRLPOOL a55db5d675f319a915863796e0933204c2e56c56e152634c0ded30a3b28d02a2c6dd1bc69a8b9009c5f1c0ff2d63d40a91d9de7f94a8a39b8748fe02982d006e
 EBUILD glib-0.12.3.ebuild 756 SHA256 72a13e842b44a56dabca3e367bf45af3f0ea63224d663f6744e0ecefe2532138 SHA512 98f5bdfc0db3d36b355aa81fcd73f3cd4280fdc5bb2ffa787e2c0c1452cd286df610c965a373403b6b726afa4a7872c24523c1a63c4ab950d5ee09a5fb642587 WHIRLPOOL 7d7eff67b3d2a732acb1c73d3857cb544a36630f9ace988eda5a45175f078c418afbc8ca0f8a486fb1561034bb4d35ed285a92666083c6d1d2e628cd2a48d2b8
-MISC ChangeLog 1263 SHA256 2371680a8862c42f7bedb479a969c5b7f3153784eec5d825c55e14e3f53d5547 SHA512 a906a7e39440e6aa94e2f59a15a37d045c8260020e036fa412dce5705f586cfaf82eea40797d32b9eb299df4c240812bb38ce1fb2466c96f56b2e3d3b09d895d WHIRLPOOL 5e1f09f3a95a615904effd75e0834e0ff7d38332636c9d123361419595575cb944425c3ede19fc804aa48901812cbde0a630f55df0b82a677150fea67d069a0e
+MISC ChangeLog 1403 SHA256 d1d8b8cd100eda3313a7b8b72d9788a54a5a31a79c461aa29e711c4fcd7e57af SHA512 09ed18991be4542012eafc9c792d2e62806d58fc2fe5a023b36434fc7cc7cb20bd6933a65dbf68731b844fd04d782445a910459c5ffe78b4ec3527b36108bfc3 WHIRLPOOL 991df508282884e1771f5a8ac80742bb4f4747986616a6cf21b92372b9646150d4e246cbb9a1ae98c7b62db3d24034fbd36cc0716bffbef3ee09fcdaa0c059b5
 MISC metadata.xml 226 SHA256 e5dc2b6b77ac9bf27c18c122bdce1f2e766bbe26979d753337459c3fe807b851 SHA512 ab01f2a59cef0c84d5ec40bf54b03cfe070c9fb14f4d86fd7577aae2f893f2a51a3524f3afb55b31ba9dff9e2d168a516bc65b5e729df196298969268770a632 WHIRLPOOL 93426518ef4d789da504d28e1346f50b3961b3d7950ec2fd9958d443585d8dfbb65662a12b134163b6aa6ba1ada80bc0056542b2a6907ad2dcc7624dad051567
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBey2YACgkQuUQtlDBCeQI0owCfR8hR4YHUHHy7inlf4Ed3NipK
-Q74An0lO65m4RybJrGDzRAd5/1RDANXo
-=lslH
+iF4EAREIAAYFAlCxr/0ACgkQoBEVQmGOlx9+HQD+N2n9+xyyoERMLl9O2opV4F7o
+ZJ4BB3jEgulVPyGwC6MBALdqL53MUtINLkFMR12fQCAX2ATD3uAX46UltdZ4nmrG
+=nA1V
 -----END PGP SIGNATURE-----
diff --git a/dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch b/dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch
new file mode 100644
index 000000000000..3c9ab53ab3aa
--- /dev/null
+++ b/dev-haskell/glib/files/glib-0.12.3.1-ghc-7.6.patch
@@ -0,0 +1,31 @@
+--- glib-0.12.3.1-orig/System/Glib/GObject.chs	2012-05-28 08:18:53.000000000 +1000
++++ glib-0.12.3.1/System/Glib/GObject.chs	2012-10-11 09:48:16.313701201 +1100
+@@ -127,8 +127,6 @@
+ 
+ {#pointer GDestroyNotify as DestroyNotify#}
+ 
+-foreign import ccall "wrapper" mkDestroyNotifyPtr :: IO () -> IO DestroyNotify
+-
+ -- | This function wraps any newly created objects that derives from
+ -- GInitiallyUnowned also known as objects with
+ -- \"floating-references\". The object will be refSink (for glib
+--- glib-0.12.3.1-orig/System/Glib/MainLoop.chs	2012-05-28 08:18:53.000000000 +1000
++++ glib-0.12.3.1/System/Glib/MainLoop.chs	2012-10-11 09:48:04.779383615 +1100
+@@ -71,7 +71,7 @@
+ 
+ {#pointer SourceFunc#}
+ 
+-foreign import ccall "wrapper" mkSourceFunc :: IO {#type gint#} -> IO SourceFunc
++foreign import ccall "wrapper" mkSourceFunc :: (Ptr () -> IO {#type gint#}) -> IO SourceFunc
+ 
+ type HandlerId = {#type guint#}
+ 
+@@ -79,7 +79,7 @@
+ --
+ makeCallback :: IO {#type gint#} -> IO (SourceFunc, DestroyNotify)
+ makeCallback fun = do
+-  funPtr <- mkSourceFunc fun
++  funPtr <- mkSourceFunc (const fun)
+   return (funPtr, destroyFunPtr)
+ 
+ -- | Sets a function to be called at regular intervals, with the default
diff --git a/dev-haskell/glib/glib-0.12.3.1.ebuild b/dev-haskell/glib/glib-0.12.3.1.ebuild
index 818759e1dca6..35cef84c9c88 100644
--- a/dev-haskell/glib/glib-0.12.3.1.ebuild
+++ b/dev-haskell/glib/glib-0.12.3.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v 1.4 2012/09/23 08:42:04 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-haskell/glib/glib-0.12.3.1.ebuild,v 1.5 2012/11/25 05:43:19 gienah Exp $
 
 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
+inherit haskell-cabal
 
 DESCRIPTION="Binding to the GLIB library for Gtk2Hs."
 HOMEPAGE="http://projects.haskell.org/gtk2hs/"
@@ -21,3 +21,11 @@ RDEPEND=">=dev-lang/ghc-6.10.1
 		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.1-ghc-7.6.patch"
+	fi
+}