summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /dev-haskell/missingh/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'dev-haskell/missingh/files')
-rw-r--r--dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch47
1 files changed, 47 insertions, 0 deletions
diff --git a/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch b/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
new file mode 100644
index 000000000000..0b249462fa51
--- /dev/null
+++ b/dev-haskell/missingh/files/missingh-1.2.0.2-ghc-7.7.patch
@@ -0,0 +1,47 @@
+--- 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