diff options
| author |   Mark Wright <gienah@gentoo.org> | 2012-11-25 05:44:31 +0000 |
|---|---|---|
| committer | Mark Wright <gienah@gentoo.org> | 2012-11-25 05:44:31 +0000 |
| commit | c58c0c595212b118ee3571f294d5b81b2a25824d (patch) | |
| tree | 9063ac00a6865bc2a833dc305a08908a2f57ace3 /dev-haskell | |
| parent | Patch glib-0.12.3.1 for ghc 7.6.1 (diff) | |
| download | gentoo-2-c58c0c595212b118ee3571f294d5b81b2a25824d.tar.gz gentoo-2-c58c0c595212b118ee3571f294d5b81b2a25824d.tar.bz2 gentoo-2-c58c0c595212b118ee3571f294d5b81b2a25824d.zip | |
Patch gio-0.12.3 for ghc 7.6.1
(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
Diffstat (limited to 'dev-haskell')
| -rw-r--r-- | dev-haskell/gio/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-haskell/gio/files/gio-0.12.3-ghc-7.6.patch | 17 | ||||
| -rw-r--r-- | dev-haskell/gio/gio-0.12.3.ebuild | 10 |
3 files changed, 31 insertions, 2 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/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 +} |