summaryrefslogtreecommitdiff
path: root/dev-haskell/c2hs/files
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/c2hs/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.xz
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/c2hs/files')
-rw-r--r--dev-haskell/c2hs/files/c2hs-0.16.3-ghc-7.6.patch45
-rw-r--r--dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch25
-rw-r--r--dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch34
3 files changed, 104 insertions, 0 deletions
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.3-ghc-7.6.patch b/dev-haskell/c2hs/files/c2hs-0.16.3-ghc-7.6.patch
new file mode 100644
index 00000000000..2b6adb2f0f6
--- /dev/null
+++ b/dev-haskell/c2hs/files/c2hs-0.16.3-ghc-7.6.patch
@@ -0,0 +1,45 @@
+--- c2hs-0.16.3-orig/src/C2HS/Config.hs 2011-03-25 00:04:59.000000000 +1100
++++ c2hs-0.16.3/src/C2HS/Config.hs 2012-09-16 10:57:54.514595408 +1000
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -- -*-haskell-*-
+ -- ** @configure_input@ **
+ -- ===========================================================================
+@@ -38,6 +39,10 @@
+
+ import Foreign (toBool)
+ import Foreign.C (CInt)
++#if (__GLASGOW_HASKELL__>=705)
++import Foreign.C.Types(CInt(..))
++#endif
++
+ import System.Info (arch, os)
+
+ -- program settings
+--- c2hs-0.16.3-orig/src/Control/StateTrans.hs 2011-03-25 00:04:59.000000000 +1100
++++ c2hs-0.16.3/src/Control/StateTrans.hs 2012-09-16 10:56:52.470863551 +1000
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP, ScopedTypeVariables #-}
+ -- The HiPar Toolkit: state transformer routines
+ --
+ -- Author : Manuel M. T. Chakravarty
+@@ -73,6 +74,10 @@
+ throwExc, fatal, catchExc, fatalsHandledBy)
+ where
+
++#if !MIN_VERSION_base(4,6,0)
++import Prelude hiding (catch)
++#endif
++import Control.Exception (catch, IOException)
+
+ -- BEWARE! You enter monad country. Read any of Wadler's or
+ -- Launchbury/Peyton-Jones' texts before entering. Otherwise,
+@@ -296,7 +301,7 @@
+ ioError err
+ Right _a -> return state
+ )
+- `catch` (\err -> let
++ `catch` (\(err :: IOException) -> let
+ STB handler' = handler err
+ in
+ handler' bs gs)
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch b/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch
new file mode 100644
index 00000000000..cdf0fbe547d
--- /dev/null
+++ b/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch
@@ -0,0 +1,25 @@
+diff --git a/c2hs.cabal b/c2hs.cabal
+index 89f978f..53a96e5 100644
+--- a/c2hs.cabal
++++ b/c2hs.cabal
+@@ -41,7 +41,7 @@ flag base3
+
+ Executable c2hs
+ Build-Depends: base >= 2 && < 5,
+- language-c >= 0.3.1.1 && < 0.4.0,
++ language-c >= 0.3.1.1 && < 0.5,
+ filepath
+
+ if flag(base3)
+diff --git a/src/C2HS/Gen/Bind.hs b/src/C2HS/Gen/Bind.hs
+index 1fd2acc..9c25b42 100644
+--- a/src/C2HS/Gen/Bind.hs
++++ b/src/C2HS/Gen/Bind.hs
+@@ -117,6 +117,7 @@ import Control.Monad (when, unless, liftM, mapAndUnzipM)
+ import Language.C.Data.Position
+ import Language.C.Data.Ident
+ import Language.C.Pretty
++import Language.C.Syntax.AST
+ import Text.PrettyPrint.HughesPJ (render)
+ import Data.Errors
+ import Data.Attributes (newAttrsOnlyPos)
diff --git a/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch b/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch
new file mode 100644
index 00000000000..e6d808bb98a
--- /dev/null
+++ b/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch
@@ -0,0 +1,34 @@
+--- c2hs-0.16.4-orig/src/C2HS/Config.hs 2012-11-01 08:02:48.000000000 +1100
++++ c2hs-0.16.4/src/C2HS/Config.hs 2012-11-03 12:12:15.754353409 +1100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ -- -*-haskell-*-
+ -- ** @configure_input@ **
+ -- ===========================================================================
+--- c2hs-0.16.4-orig/src/Control/StateTrans.hs 2012-11-01 08:02:48.000000000 +1100
++++ c2hs-0.16.4/src/Control/StateTrans.hs 2012-11-03 12:12:15.755353436 +1100
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP, ScopedTypeVariables #-}
+ -- The HiPar Toolkit: state transformer routines
+ --
+ -- Author : Manuel M. T. Chakravarty
+@@ -80,6 +81,10 @@
+ -- Launchbury/Peyton-Jones' texts before entering. Otherwise,
+ -- your mental health my be in danger. You have been warned!
+
++#if !MIN_VERSION_base(4,6,0)
++import Prelude hiding (catch)
++#endif
++import Control.Exception (catch, IOException)
+
+ -- state transformer base and its monad operations
+ -- -----------------------------------------------
+@@ -298,7 +303,7 @@
+ ioError err
+ Right _a -> return state
+ )
+- `catch` (\err -> let
++ `catch` (\(err :: IOException) -> let
+ STB handler' = handler err
+ in
+ handler' bs gs)