| 1 |
gienah 13/09/28 02:45:40 |
| 2 |
|
| 3 |
Added: missingh-1.2.0.2-ghc-7.7.patch |
| 4 |
Log: |
| 5 |
Bump missingh to 1.2.0.2, patched for ghc 6.12, ghc 7.7.20130927 development snapshot, and hopefully ghc 7.8.1 when it is released |
| 6 |
|
| 7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 618E971F) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: missingh-1.2.0.2-ghc-7.7.patch |
| 16 |
=================================================================== |
| 17 |
--- MissingH-1.2.0.2-orig/src/System/Cmd/Utils.hs 2013-08-22 00:35:27.000000000 +1000 |
| 18 |
+++ MissingH-1.2.0.2/src/System/Cmd/Utils.hs 2013-09-28 01:17:29.697333968 +1000 |
| 19 |
@@ -325,7 +325,11 @@ |
| 20 |
Just (Exited (ExitSuccess)) -> return () |
| 21 |
Just (Exited (ExitFailure fc)) -> |
| 22 |
cmdfailed funcname fp args fc |
| 23 |
+#if (__GLASGOW_HASKELL__ >= 707) |
| 24 |
+ Just (Terminated sig _) -> |
| 25 |
+#else |
| 26 |
Just (Terminated sig) -> |
| 27 |
+#endif |
| 28 |
warnfail fp args $ "Terminated by signal " ++ show sig |
| 29 |
Just (Stopped sig) -> |
| 30 |
warnfail fp args $ "Stopped by signal " ++ show sig |
| 31 |
@@ -351,7 +355,11 @@ |
| 32 |
case ec of |
| 33 |
Exited ExitSuccess -> return () |
| 34 |
Exited (ExitFailure fc) -> cmdfailed "safeSystem" command args fc |
| 35 |
+#if (__GLASGOW_HASKELL__ >= 707) |
| 36 |
+ Terminated s _ -> cmdsignalled "safeSystem" command args s |
| 37 |
+#else |
| 38 |
Terminated s -> cmdsignalled "safeSystem" command args s |
| 39 |
+#endif |
| 40 |
Stopped s -> cmdsignalled "safeSystem" command args s |
| 41 |
#endif |
| 42 |
|
| 43 |
--- MissingH-1.2.0.2-orig/testsrc/Eithertest.hs 2013-08-22 00:35:27.000000000 +1000 |
| 44 |
+++ MissingH-1.2.0.2/testsrc/Eithertest.hs 2013-09-28 01:19:32.177332800 +1000 |
| 45 |
@@ -6,6 +6,7 @@ |
| 46 |
For license and copyright information, see the file LICENSE |
| 47 |
|
| 48 |
-} |
| 49 |
+{-# LANGUAGE CPP #-} |
| 50 |
|
| 51 |
module Eithertest(tests) where |
| 52 |
import Test.HUnit |
| 53 |
@@ -13,8 +14,10 @@ |
| 54 |
import Test.HUnit.Tools |
| 55 |
import Control.Exception |
| 56 |
|
| 57 |
+#if (__GLASGOW_HASKELL__ < 707) |
| 58 |
instance Eq ErrorCall where |
| 59 |
(ErrorCall x) == (ErrorCall y) = x == y |
| 60 |
+#endif |
| 61 |
|
| 62 |
test_maybeToEither = |
| 63 |
let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp inp in |
Archives