| 1 |
commit: 599f078d7043bfffbfb6c950130a2445b22a6948 |
| 2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun Sep 13 12:56:18 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 14 07:05:39 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599f078d |
| 7 |
|
| 8 |
dev-haskell/c2hs: remove unused patch(es) |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.6, Repoman-3.0.1 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
| 12 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 13 |
|
| 14 |
.../c2hs/files/c2hs-0.16.3-language-c-0.4.patch | 25 ---------------- |
| 15 |
dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch | 34 ---------------------- |
| 16 |
2 files changed, 59 deletions(-) |
| 17 |
|
| 18 |
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 |
| 19 |
deleted file mode 100644 |
| 20 |
index cdf0fbe547d..00000000000 |
| 21 |
--- a/dev-haskell/c2hs/files/c2hs-0.16.3-language-c-0.4.patch |
| 22 |
+++ /dev/null |
| 23 |
@@ -1,25 +0,0 @@ |
| 24 |
-diff --git a/c2hs.cabal b/c2hs.cabal |
| 25 |
-index 89f978f..53a96e5 100644 |
| 26 |
---- a/c2hs.cabal |
| 27 |
-+++ b/c2hs.cabal |
| 28 |
-@@ -41,7 +41,7 @@ flag base3 |
| 29 |
- |
| 30 |
- Executable c2hs |
| 31 |
- Build-Depends: base >= 2 && < 5, |
| 32 |
-- language-c >= 0.3.1.1 && < 0.4.0, |
| 33 |
-+ language-c >= 0.3.1.1 && < 0.5, |
| 34 |
- filepath |
| 35 |
- |
| 36 |
- if flag(base3) |
| 37 |
-diff --git a/src/C2HS/Gen/Bind.hs b/src/C2HS/Gen/Bind.hs |
| 38 |
-index 1fd2acc..9c25b42 100644 |
| 39 |
---- a/src/C2HS/Gen/Bind.hs |
| 40 |
-+++ b/src/C2HS/Gen/Bind.hs |
| 41 |
-@@ -117,6 +117,7 @@ import Control.Monad (when, unless, liftM, mapAndUnzipM) |
| 42 |
- import Language.C.Data.Position |
| 43 |
- import Language.C.Data.Ident |
| 44 |
- import Language.C.Pretty |
| 45 |
-+import Language.C.Syntax.AST |
| 46 |
- import Text.PrettyPrint.HughesPJ (render) |
| 47 |
- import Data.Errors |
| 48 |
- import Data.Attributes (newAttrsOnlyPos) |
| 49 |
|
| 50 |
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 |
| 51 |
deleted file mode 100644 |
| 52 |
index e6d808bb98a..00000000000 |
| 53 |
--- a/dev-haskell/c2hs/files/c2hs-0.16.4-ghc-7.6.patch |
| 54 |
+++ /dev/null |
| 55 |
@@ -1,34 +0,0 @@ |
| 56 |
---- c2hs-0.16.4-orig/src/C2HS/Config.hs 2012-11-01 08:02:48.000000000 +1100 |
| 57 |
-+++ c2hs-0.16.4/src/C2HS/Config.hs 2012-11-03 12:12:15.754353409 +1100 |
| 58 |
-@@ -1,3 +1,4 @@ |
| 59 |
-+{-# LANGUAGE CPP #-} |
| 60 |
- -- -*-haskell-*- |
| 61 |
- -- ** @configure_input@ ** |
| 62 |
- -- =========================================================================== |
| 63 |
---- c2hs-0.16.4-orig/src/Control/StateTrans.hs 2012-11-01 08:02:48.000000000 +1100 |
| 64 |
-+++ c2hs-0.16.4/src/Control/StateTrans.hs 2012-11-03 12:12:15.755353436 +1100 |
| 65 |
-@@ -1,3 +1,4 @@ |
| 66 |
-+{-# LANGUAGE CPP, ScopedTypeVariables #-} |
| 67 |
- -- The HiPar Toolkit: state transformer routines |
| 68 |
- -- |
| 69 |
- -- Author : Manuel M. T. Chakravarty |
| 70 |
-@@ -80,6 +81,10 @@ |
| 71 |
- -- Launchbury/Peyton-Jones' texts before entering. Otherwise, |
| 72 |
- -- your mental health my be in danger. You have been warned! |
| 73 |
- |
| 74 |
-+#if !MIN_VERSION_base(4,6,0) |
| 75 |
-+import Prelude hiding (catch) |
| 76 |
-+#endif |
| 77 |
-+import Control.Exception (catch, IOException) |
| 78 |
- |
| 79 |
- -- state transformer base and its monad operations |
| 80 |
- -- ----------------------------------------------- |
| 81 |
-@@ -298,7 +303,7 @@ |
| 82 |
- ioError err |
| 83 |
- Right _a -> return state |
| 84 |
- ) |
| 85 |
-- `catch` (\err -> let |
| 86 |
-+ `catch` (\(err :: IOException) -> let |
| 87 |
- STB handler' = handler err |
| 88 |
- in |
| 89 |
- handler' bs gs) |
Archives