1 |
commit: 5e7995a57327033e48f9b6e3a8157ff35fcca984 |
2 |
Author: Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Wed Jul 27 17:01:21 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 3 07:21:54 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e7995a5 |
7 |
|
8 |
dev-haskell/http: remove unused patch |
9 |
|
10 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
11 |
|
12 |
dev-haskell/http/files/http-4000.2.3-ghc-7.6.patch | 154 --------------------- |
13 |
1 file changed, 154 deletions(-) |
14 |
|
15 |
diff --git a/dev-haskell/http/files/http-4000.2.3-ghc-7.6.patch b/dev-haskell/http/files/http-4000.2.3-ghc-7.6.patch |
16 |
deleted file mode 100644 |
17 |
index 595d399..0000000 |
18 |
--- a/dev-haskell/http/files/http-4000.2.3-ghc-7.6.patch |
19 |
+++ /dev/null |
20 |
@@ -1,154 +0,0 @@ |
21 |
---- HTTP-4000.2.3-orig/HTTP.cabal 2012-04-13 06:39:31.000000000 +1000 |
22 |
-+++ HTTP-4000.2.3/HTTP.cabal 2012-09-12 21:08:30.027554352 +1000 |
23 |
-@@ -77,7 +77,7 @@ |
24 |
- Network.HTTP.Utils |
25 |
- Paths_HTTP |
26 |
- GHC-options: -fwarn-missing-signatures -Wall |
27 |
-- Build-depends: base >= 2 && < 4.6, network, parsec |
28 |
-+ Build-depends: base >= 2 && < 5.0, network, parsec |
29 |
- Extensions: FlexibleInstances |
30 |
- if flag(old-base) |
31 |
- Build-depends: base < 3 |
32 |
-@@ -95,7 +95,7 @@ |
33 |
- Test-Suite test |
34 |
- type: exitcode-stdio-1.0 |
35 |
- |
36 |
-- build-tools: ghc >= 6.10 && < 7.6 |
37 |
-+ build-tools: ghc >= 6.10 && < 8.0 |
38 |
- |
39 |
- hs-source-dirs: test |
40 |
- main-is: httpTests.hs |
41 |
-@@ -103,7 +103,7 @@ |
42 |
- build-depends: HTTP, |
43 |
- HUnit, |
44 |
- httpd-shed, |
45 |
-- base >= 2 && < 4.6, |
46 |
-+ base >= 2 && < 5.0, |
47 |
- network, |
48 |
- split >= 0.1 && < 0.2, |
49 |
- test-framework, |
50 |
---- HTTP-4000.2.3-orig/Network/HTTP/Base.hs 2012-04-13 06:39:31.000000000 +1000 |
51 |
-+++ HTTP-4000.2.3/Network/HTTP/Base.hs 2012-09-12 21:44:26.218546007 +1000 |
52 |
-@@ -1,3 +1,4 @@ |
53 |
-+{-# LANGUAGE ScopedTypeVariables #-} |
54 |
- ----------------------------------------------------------------------------- |
55 |
- -- | |
56 |
- -- Module : Network.HTTP.Base |
57 |
-@@ -105,6 +106,7 @@ |
58 |
- , parseURIReference |
59 |
- ) |
60 |
- |
61 |
-+import Control.Exception ( catch ) |
62 |
- import Control.Monad ( guard ) |
63 |
- import Control.Monad.Error () |
64 |
- import Data.Char ( digitToInt, intToDigit, toLower, isDigit, |
65 |
-@@ -886,10 +888,10 @@ |
66 |
- -- | @catchIO a h@ handles IO action exceptions throughout codebase; version-specific |
67 |
- -- tweaks better go here. |
68 |
- catchIO :: IO a -> (IOException -> IO a) -> IO a |
69 |
--catchIO a h = Prelude.catch a h |
70 |
-+catchIO a h = Control.Exception.catch a h |
71 |
- |
72 |
- catchIO_ :: IO a -> IO a -> IO a |
73 |
--catchIO_ a h = Prelude.catch a (const h) |
74 |
-+catchIO_ a h = Control.Exception.catch a (\(_ :: IOException) -> h) |
75 |
- |
76 |
- responseParseError :: String -> String -> Result a |
77 |
- responseParseError loc v = failWith (ErrorParse (loc ++ ' ':v)) |
78 |
---- HTTP-4000.2.3-orig/Network/TCP.hs 2012-04-13 06:39:31.000000000 +1000 |
79 |
-+++ HTTP-4000.2.3/Network/TCP.hs 2012-09-12 21:51:35.633839689 +1000 |
80 |
-@@ -1,3 +1,4 @@ |
81 |
-+{-# LANGUAGE ScopedTypeVariables #-} |
82 |
- {-# LANGUAGE TypeSynonymInstances #-} |
83 |
- ----------------------------------------------------------------------------- |
84 |
- -- | |
85 |
-@@ -57,6 +58,7 @@ |
86 |
- |
87 |
- import Data.Char ( toLower ) |
88 |
- import Data.Word ( Word8 ) |
89 |
-+import qualified Control.Exception ( catch, IOException ) |
90 |
- import Control.Concurrent |
91 |
- import Control.Monad ( liftM, when ) |
92 |
- import System.IO ( Handle, hFlush, IOMode(..), hClose ) |
93 |
-@@ -302,7 +304,7 @@ |
94 |
- ConnClosed -> print "aa" >> return False |
95 |
- _ |
96 |
- | connEndPoint v == endPoint -> |
97 |
-- catch (getPeerName (connSock v) >> return True) (const $ return False) |
98 |
-+ Control.Exception.catch (getPeerName (connSock v) >> return True) (\(_:: Control.Exception.IOException) -> return False) |
99 |
- | otherwise -> return False |
100 |
- |
101 |
- isTCPConnectedTo :: HandleStream ty -> EndPoint -> IO Bool |
102 |
-@@ -312,7 +314,7 @@ |
103 |
- ConnClosed -> return False |
104 |
- _ |
105 |
- | connEndPoint v == endPoint -> |
106 |
-- catch (getPeerName (connSock v) >> return True) (const $ return False) |
107 |
-+ Control.Exception.catch (getPeerName (connSock v) >> return True) (\(_:: Control.Exception.IOException) -> return False) |
108 |
- | otherwise -> return False |
109 |
- |
110 |
- readBlockBS :: HStream a => HandleStream a -> Int -> IO (Result a) |
111 |
-@@ -364,18 +366,18 @@ |
112 |
- modifyMVar_ (getRef ref) (\ co -> return co{connInput=Just b}) |
113 |
- return (return a) |
114 |
- _ -> do |
115 |
-- Prelude.catch (buf_hGet (connBuffer conn) (connHandle conn) n >>= return.return) |
116 |
-+ Control.Exception.catch (buf_hGet (connBuffer conn) (connHandle conn) n >>= return.return) |
117 |
- (\ e -> |
118 |
- if isEOFError e |
119 |
- then do |
120 |
-- when (connCloseEOF conn) $ catch (closeQuick ref) (\ _ -> return ()) |
121 |
-+ when (connCloseEOF conn) $ Control.Exception.catch (closeQuick ref) (\ (_ :: Control.Exception.IOException) -> return ()) |
122 |
- return (return (buf_empty (connBuffer conn))) |
123 |
- else return (failMisc (show e))) |
124 |
- |
125 |
- bufferPutBlock :: BufferOp a -> Handle -> a -> IO (Result ()) |
126 |
- bufferPutBlock ops h b = |
127 |
-- Prelude.catch (buf_hPut ops h b >> hFlush h >> return (return ())) |
128 |
-- (\ e -> return (failMisc (show e))) |
129 |
-+ Control.Exception.catch (buf_hPut ops h b >> hFlush h >> return (return ())) |
130 |
-+ (\ (e :: Control.Exception.IOException) -> return (failMisc (show e))) |
131 |
- |
132 |
- bufferReadLine :: HStream a => HandleStream a -> IO (Result a) |
133 |
- bufferReadLine ref = onNonClosedDo ref $ \ conn -> do |
134 |
-@@ -385,13 +387,13 @@ |
135 |
- let (newl,b1) = buf_splitAt (connBuffer conn) 1 b0 |
136 |
- modifyMVar_ (getRef ref) (\ co -> return co{connInput=Just b1}) |
137 |
- return (return (buf_append (connBuffer conn) a newl)) |
138 |
-- _ -> Prelude.catch |
139 |
-+ _ -> Control.Exception.catch |
140 |
- (buf_hGetLine (connBuffer conn) (connHandle conn) >>= |
141 |
- return . return . appendNL (connBuffer conn)) |
142 |
- (\ e -> |
143 |
- if isEOFError e |
144 |
- then do |
145 |
-- when (connCloseEOF conn) $ catch (closeQuick ref) (\ _ -> return ()) |
146 |
-+ when (connCloseEOF conn) $ Control.Exception.catch (closeQuick ref) (\ (_ :: Control.Exception.IOException) -> return ()) |
147 |
- return (return (buf_empty (connBuffer conn))) |
148 |
- else return (failMisc (show e))) |
149 |
- where |
150 |
---- HTTP-4000.2.3-orig/Network/StreamSocket.hs 2012-04-13 06:39:31.000000000 +1000 |
151 |
-+++ HTTP-4000.2.3/Network/StreamSocket.hs 2012-09-12 22:27:16.119222147 +1000 |
152 |
-@@ -1,3 +1,4 @@ |
153 |
-+{-# LANGUAGE ScopedTypeVariables #-} |
154 |
- {-# OPTIONS_GHC -fno-warn-orphans #-} |
155 |
- ----------------------------------------------------------------------------- |
156 |
- -- | |
157 |
-@@ -36,7 +37,7 @@ |
158 |
- import Network.HTTP.Base ( catchIO ) |
159 |
- import Control.Monad (liftM) |
160 |
- import Control.Exception as Exception (IOException) |
161 |
--import System.IO.Error (catch, isEOFError) |
162 |
-+import System.IO.Error (isEOFError) |
163 |
- |
164 |
- -- | Exception handler for socket operations. |
165 |
- handleSocketError :: Socket -> IOException -> IO (Result a) |
166 |
-@@ -50,7 +51,7 @@ |
167 |
- myrecv :: Socket -> Int -> IO String |
168 |
- myrecv sock len = |
169 |
- let handler e = if isEOFError e then return [] else ioError e |
170 |
-- in System.IO.Error.catch (recv sock len) handler |
171 |
-+ in catchIO (recv sock len) handler |
172 |
- |
173 |
- instance Stream Socket where |
174 |
- readBlock sk n = readBlockSocket sk n |