[gentoo-commits] gentoo-x86 commit in dev-haskell/missingh/files: missingh-1.2.0.2-ghc-7.7.patch

[gentoo-commits] gentoo-x86 commit in dev-haskell/missingh/files: missingh-1.2.0.2-ghc-7.7.patch

[Mark Wright (gienah)]

gienah      13/09/28 02:45:40

  Added:                missingh-1.2.0.2-ghc-7.7.patch
  Log:
  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
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 618E971F)

Revision  Changes    Path
1.1                  dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch

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
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

Index: missingh-1.2.0.2-ghc-7.7.patch
===================================================================
--- MissingH-1.2.0.2-orig/src/System/Cmd/Utils.hs	2013-08-22 00:35:27.000000000 +1000
+++ MissingH-1.2.0.2/src/System/Cmd/Utils.hs	2013-09-28 01:17:29.697333968 +1000
@@ -325,7 +325,11 @@
                 Just (Exited (ExitSuccess)) -> return ()
                 Just (Exited (ExitFailure fc)) ->
                     cmdfailed funcname fp args fc
+#if (__GLASGOW_HASKELL__ >= 707)
+                Just (Terminated sig _) ->
+#else
                 Just (Terminated sig) ->
+#endif
                     warnfail fp args $ "Terminated by signal " ++ show sig
                 Just (Stopped sig) ->
                     warnfail fp args $ "Stopped by signal " ++ show sig
@@ -351,7 +355,11 @@
        case ec of
             Exited ExitSuccess -> return ()
             Exited (ExitFailure fc) -> cmdfailed "safeSystem" command args fc
+#if (__GLASGOW_HASKELL__ >= 707)
+            Terminated s _ -> cmdsignalled "safeSystem" command args s
+#else
             Terminated s -> cmdsignalled "safeSystem" command args s
+#endif
             Stopped s -> cmdsignalled "safeSystem" command args s
 #endif
 
--- MissingH-1.2.0.2-orig/testsrc/Eithertest.hs	2013-08-22 00:35:27.000000000 +1000
+++ MissingH-1.2.0.2/testsrc/Eithertest.hs	2013-09-28 01:19:32.177332800 +1000
@@ -6,6 +6,7 @@
 For license and copyright information, see the file LICENSE
 
 -}
+{-# LANGUAGE CPP #-}
 
 module Eithertest(tests) where
 import Test.HUnit
@@ -13,8 +14,10 @@
 import Test.HUnit.Tools
 import Control.Exception
 
+#if (__GLASGOW_HASKELL__ < 707)
 instance Eq ErrorCall where
     (ErrorCall x) == (ErrorCall y) = x == y
+#endif
 
 test_maybeToEither =
     let f msg inp exp = TestLabel msg $ TestCase $ assertEqual "" exp inp in