| 1 |
commit: 81f2bb597cc1bf955d5b6ddd29a017e72174201a |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Mon Apr 19 17:22:01 2021 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 22 06:44:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f2bb59 |
| 7 |
|
| 8 |
dev-haskell/wxdirect: remove unused patch(es) |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.18, Repoman-3.0.3 |
| 11 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/20460 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 14 |
|
| 15 |
.../wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch | 49 ---------------------- |
| 16 |
.../wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch | 38 ----------------- |
| 17 |
2 files changed, 87 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 75d9bf21c72..00000000000 |
| 22 |
--- a/dev-haskell/wxdirect/files/wxdirect-0.90.0.1-ghc-7.5.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,49 +0,0 @@ |
| 25 |
---- wxdirect-0.90.0.1-orig/wxdirect.cabal 2012-04-19 01:05:11.000000000 +1000 |
| 26 |
-+++ wxdirect-0.90.0.1/wxdirect.cabal 2012-05-19 21:12:02.612085338 +1000 |
| 27 |
-@@ -66,7 +66,7 @@ |
| 28 |
- if flag(splitBase) |
| 29 |
- build-depends: |
| 30 |
- base >= 4 && < 5, |
| 31 |
-- containers >= 0.2 && < 0.5 |
| 32 |
-+ containers >= 0.2 && < 0.6 |
| 33 |
- else |
| 34 |
- build-depends: |
| 35 |
- base >= 3 && < 4, |
| 36 |
---- wxdirect-0.90.0.1-orig/src/Classes.hs 2012-04-19 01:05:10.000000000 +1000 |
| 37 |
-+++ wxdirect-0.90.0.1/src/Classes.hs 2012-07-14 13:58:48.072492467 +1000 |
| 38 |
-@@ -1,3 +1,4 @@ |
| 39 |
-+{-# LANGUAGE CPP #-} |
| 40 |
- ----------------------------------------------------------------------------------------- |
| 41 |
- {-| Module : Classes |
| 42 |
- Copyright : (c) Daan Leijen 2003 |
| 43 |
-@@ -28,7 +29,9 @@ |
| 44 |
- import Data.List( sort, sortBy ) |
| 45 |
- import qualified Data.Set as Set |
| 46 |
- import qualified Data.Map as Map |
| 47 |
-+#if !MIN_VERSION_base(4,6,0) |
| 48 |
- import Prelude hiding ( catch ) |
| 49 |
-+#endif |
| 50 |
- import HaskellNames( haskellTypeName, isBuiltin ) |
| 51 |
- import Types |
| 52 |
- |
| 53 |
---- wxdirect-0.90.0.1-orig/src/CompileClasses.hs 2012-04-19 01:05:10.000000000 +1000 |
| 54 |
-+++ wxdirect-0.90.0.1/src/CompileClasses.hs 2012-05-19 21:28:27.358052781 +1000 |
| 55 |
-@@ -89,7 +89,7 @@ |
| 56 |
- (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] |
| 57 |
- |
| 58 |
- methodCount = length decls |
| 59 |
-- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] |
| 60 |
-+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] |
| 61 |
- |
| 62 |
- export = concat [ ["module " ++ moduleRoot ++ moduleName |
| 63 |
- , " ( -- * Global" ] |
| 64 |
-@@ -103,6 +103,9 @@ |
| 65 |
- , "import System.IO.Unsafe( unsafePerformIO )" |
| 66 |
- , "import " ++ moduleRoot ++ "WxcTypes" |
| 67 |
- , "import " ++ moduleRoot ++ moduleClassTypesName |
| 68 |
-+ , "#if (__GLASGOW_HASKELL__>=705)" |
| 69 |
-+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" |
| 70 |
-+ , "#endif" |
| 71 |
- , "" |
| 72 |
- ] |
| 73 |
- ] |
| 74 |
|
| 75 |
diff --git a/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch b/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch |
| 76 |
deleted file mode 100644 |
| 77 |
index df29d1ba08b..00000000000 |
| 78 |
--- a/dev-haskell/wxdirect/files/wxdirect-0.90.1.1-ghc-7.5.patch |
| 79 |
+++ /dev/null |
| 80 |
@@ -1,38 +0,0 @@ |
| 81 |
---- wxdirect-0.90.1.1-orig/src/Classes.hs 2014-03-23 01:08:59.000000000 +1100 |
| 82 |
-+++ wxdirect-0.90.1.1/src/Classes.hs 2014-03-23 15:43:57.402011540 +1100 |
| 83 |
-@@ -1,3 +1,4 @@ |
| 84 |
-+{-# LANGUAGE CPP #-} |
| 85 |
- ----------------------------------------------------------------------------------------- |
| 86 |
- {-| Module : Classes |
| 87 |
- Copyright : (c) Daan Leijen 2003 |
| 88 |
-@@ -24,6 +25,9 @@ |
| 89 |
- |
| 90 |
- import qualified Data.Set as Set |
| 91 |
- import qualified Data.Map as Map |
| 92 |
-+#if !MIN_VERSION_base(4,6,0) |
| 93 |
-+import Prelude hiding ( catch ) |
| 94 |
-+#endif |
| 95 |
- import Text.Parsec.Prim hiding ( try ) |
| 96 |
- import HaskellNames( haskellTypeName, isBuiltin ) |
| 97 |
- import Types |
| 98 |
---- wxdirect-0.90.1.1-orig/src/CompileClasses.hs 2014-03-23 01:08:59.000000000 +1100 |
| 99 |
-+++ wxdirect-0.90.1.1/src/CompileClasses.hs 2014-03-23 15:42:14.123894206 +1100 |
| 100 |
-@@ -96,7 +96,7 @@ |
| 101 |
- (exportsStatic,exportsClassClasses,classCount) = exportDefs decls exportsClass [] |
| 102 |
- |
| 103 |
- methodCount = length decls |
| 104 |
-- ghcoptions = [ "{-# LANGUAGE ForeignFunctionInterface #-}"] |
| 105 |
-+ ghcoptions = [ "{-# LANGUAGE CPP, ForeignFunctionInterface #-}"] |
| 106 |
- |
| 107 |
- export = concat [ ["module " ++ moduleRoot ++ moduleName |
| 108 |
- , " ( -- * Global" ] |
| 109 |
-@@ -111,6 +111,9 @@ |
| 110 |
- , "import Foreign.C.Types(CInt(..), CWchar(..), CChar(..), CDouble(..))" |
| 111 |
- , "import " ++ moduleRoot ++ "WxcTypes" |
| 112 |
- , "import " ++ moduleRoot ++ moduleClassTypesName |
| 113 |
-+ , "#if (__GLASGOW_HASKELL__>=705)" |
| 114 |
-+ , "import Foreign.C.Types(CDouble(..), CInt(..), CWchar(..))" |
| 115 |
-+ , "#endif" |
| 116 |
- , "" |
| 117 |
- ] |
| 118 |
- ] |
Archives