| 1 |
commit: 550762d9c6c54ae40e01e0cb5396e08843edb64b |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Mar 31 20:31:29 2017 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Mar 31 20:33:48 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=550762d9 |
| 7 |
|
| 8 |
dev-haskell/zlib: workaround zlib test failures, bug #613532 |
| 9 |
|
| 10 |
zlib does not really support windows size of 8 bits |
| 11 |
|
| 12 |
Reported-by: eroen |
| 13 |
Bug: https://github.com/haskell/zlib/issues/11 |
| 14 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=613532 |
| 15 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 16 |
|
| 17 |
.../zlib/files/zlib-0.6.1.2-fix-w8-tests.patch | 26 ++++++++++++++++++++++ |
| 18 |
dev-haskell/zlib/zlib-0.6.1.2.ebuild | 4 +++- |
| 19 |
2 files changed, 29 insertions(+), 1 deletion(-) |
| 20 |
|
| 21 |
diff --git a/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch b/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..5b4cb5a6eca |
| 24 |
--- /dev/null |
| 25 |
+++ b/dev-haskell/zlib/files/zlib-0.6.1.2-fix-w8-tests.patch |
| 26 |
@@ -0,0 +1,26 @@ |
| 27 |
+zlib does not really support windows size of 8 bits: |
| 28 |
+ |
| 29 |
+Reported by eroen |
| 30 |
+ |
| 31 |
+https://github.com/haskell/zlib/issues/11 |
| 32 |
+https://bugs.gentoo.org/show_bug.cgi?id=613532 |
| 33 |
+diff --git a/test/Test.hs b/test/Test.hs |
| 34 |
+index bbd8b94..81bd260 100644 |
| 35 |
+--- a/test/Test.hs |
| 36 |
++++ b/test/Test.hs |
| 37 |
+@@ -66,2 +66,3 @@ prop_decompress_after_compress w cp dp = |
| 38 |
+ -- of the zlib source code. |
| 39 |
++ compressWindowBits cp /= WindowBits 8 && |
| 40 |
+ (decompressWindowBits dp > compressWindowBits cp || decompressWindowBits dp > WindowBits 8) && |
| 41 |
+@@ -76,2 +77,3 @@ prop_gziporzlib1 cp dp = |
| 42 |
+ decompressWindowBits dp > compressWindowBits cp && |
| 43 |
++ compressWindowBits cp /= WindowBits 8 && |
| 44 |
+ decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==> |
| 45 |
+@@ -85,2 +87,3 @@ prop_gziporzlib2 cp dp = |
| 46 |
+ decompressWindowBits dp >= compressWindowBits cp && |
| 47 |
++ compressWindowBits cp /= WindowBits 8 && |
| 48 |
+ decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==> |
| 49 |
+@@ -94,2 +97,3 @@ prop_gzip_concat cp dp input = |
| 50 |
+ decompressWindowBits dp >= compressWindowBits cp && |
| 51 |
++ compressWindowBits cp /= WindowBits 8 && |
| 52 |
+ decompressBufferSize dp > 0 && compressBufferSize cp > 0 ==> |
| 53 |
|
| 54 |
diff --git a/dev-haskell/zlib/zlib-0.6.1.2.ebuild b/dev-haskell/zlib/zlib-0.6.1.2.ebuild |
| 55 |
index 38ea3031959..4187ff78db0 100644 |
| 56 |
--- a/dev-haskell/zlib/zlib-0.6.1.2.ebuild |
| 57 |
+++ b/dev-haskell/zlib/zlib-0.6.1.2.ebuild |
| 58 |
@@ -1,4 +1,4 @@ |
| 59 |
-# Copyright 1999-2016 Gentoo Foundation |
| 60 |
+# Copyright 1999-2017 Gentoo Foundation |
| 61 |
# Distributed under the terms of the GNU General Public License v2 |
| 62 |
|
| 63 |
EAPI=6 |
| 64 |
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND} |
| 65 |
>=dev-haskell/tasty-quickcheck-0.8 <dev-haskell/tasty-quickcheck-0.9 ) |
| 66 |
" |
| 67 |
|
| 68 |
+PATCHES=("${FILESDIR}"/${P}-fix-w8-tests.patch) |
| 69 |
+ |
| 70 |
src_configure() { |
| 71 |
haskell-cabal_src_configure \ |
| 72 |
$(cabal_flag non-blocking-ffi non-blocking-ffi) |
Archives