| 1 |
commit: 45b650a0f158ec844470ff81cb64999c93196cfd |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 21 21:25:33 2015 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 21 21:27:36 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45b650a0 |
| 7 |
|
| 8 |
dev-haskell/testpack: tweak for QuickCheck-2.8, bug #561010 |
| 9 |
|
| 10 |
Reported-by: Toralf Förster |
| 11 |
Bug: https://bugs.gentoo.org/561010 |
| 12 |
|
| 13 |
Package-Manager: portage-2.2.20 |
| 14 |
|
| 15 |
dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch | 13 +++++++++++++ |
| 16 |
dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch | 2 +- |
| 17 |
dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild | 1 + |
| 18 |
3 files changed, 15 insertions(+), 1 deletion(-) |
| 19 |
|
| 20 |
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..599615a |
| 23 |
--- /dev/null |
| 24 |
+++ b/dev-haskell/testpack/files/testpack-2.1.3.0-HUnit-1.3.patch |
| 25 |
@@ -0,0 +1,13 @@ |
| 26 |
+diff --git a/src/Test/HUnit/Tools.hs b/src/Test/HUnit/Tools.hs |
| 27 |
+index a24a510..6b8a25e 100644 |
| 28 |
+--- a/src/Test/HUnit/Tools.hs |
| 29 |
++++ b/src/Test/HUnit/Tools.hs |
| 30 |
+@@ -97,3 +97,7 @@ runVerbTestText (HU.PutText put us) t = do |
| 31 |
+ reportFailure = reportProblem "Failure:" "Failure in: " |
| 32 |
+- reportProblem p0 p1 msg ss us = put line True us |
| 33 |
++ reportProblem p0 p1 |
| 34 |
++#if MIN_VERSION_HUnit(1,3,0) |
| 35 |
++ _loc |
| 36 |
++#endif |
| 37 |
++ msg ss us = put line True us |
| 38 |
+ where line = "### " ++ kind ++ path' ++ '\n' : msg |
| 39 |
|
| 40 |
diff --git a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch |
| 41 |
index 1bc9537..4ca1848 100644 |
| 42 |
--- a/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch |
| 43 |
+++ b/dev-haskell/testpack/files/testpack-2.1.3.0-qc28.patch |
| 44 |
@@ -116,7 +116,7 @@ index 712c9bf..506686f 100644 |
| 45 |
- reason = "Result: expected " ++ show expected ++ ", got " ++ show actual, |
| 46 |
- stamp = [], callbacks = []} |
| 47 |
- |
| 48 |
-+ P.result { P.ok = Just (expected == actual) |
| 49 |
++ P.failed { P.ok = Just (expected == actual) |
| 50 |
+ , P.reason = "Result: expected " ++ show expected ++ ", got " ++ show actual |
| 51 |
+ } |
| 52 |
{- | Like '@=?', but with args in a different order. -} |
| 53 |
|
| 54 |
diff --git a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild |
| 55 |
index a3fa62e..97ca628 100644 |
| 56 |
--- a/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild |
| 57 |
+++ b/dev-haskell/testpack/testpack-2.1.3.0-r1.ebuild |
| 58 |
@@ -30,4 +30,5 @@ DEPEND="${RDEPEND} |
| 59 |
|
| 60 |
src_prepare() { |
| 61 |
epatch "${FILESDIR}"/${P}-qc28.patch |
| 62 |
+ epatch "${FILESDIR}"/${P}-HUnit-1.3.patch |
| 63 |
} |
Archives