summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/gio/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/gio/files')
-rw-r--r--dev-haskell/gio/files/gio-0.12.3-ghc-7.6.patch17
-rw-r--r--dev-haskell/gio/files/gio-0.13.0.4-ghc-7.10.patch11
2 files changed, 28 insertions, 0 deletions
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/files/gio-0.13.0.4-ghc-7.10.patch b/dev-haskell/gio/files/gio-0.13.0.4-ghc-7.10.patch
new file mode 100644
index 000000000000..43a2de3fbc4b
--- /dev/null
+++ b/dev-haskell/gio/files/gio-0.13.0.4-ghc-7.10.patch
@@ -0,0 +1,11 @@
+--- gio-0.13.0.4-orig/SetupWrapper.hs 2014-12-24 21:02:08.000000000 +1100
++++ gio-0.13.0.4/SetupWrapper.hs 2015-01-03 19:14:53.721416960 +1100
+@@ -18,7 +18,7 @@
+
+ import System.Environment
+ import System.Process
+-import System.Exit
++import System.Exit (exitWith, ExitCode(..))
+ import System.FilePath
+ import System.Directory
+ import qualified Control.Exception as Exception