| 1 |
commit: 94a16fb921f072d6f3d4cf776834ec316031ed51 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 3 17:40:06 2017 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 3 17:40:14 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94a16fb9 |
| 7 |
|
| 8 |
dev-ml/ocaml-containers: backport upstream test build fix with latest qcheck, bug #623664 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
| 11 |
|
| 12 |
dev-ml/ocaml-containers/files/qcheck.patch | 61 ++++++++++++++++++++++ |
| 13 |
.../ocaml-containers/ocaml-containers-1.2.ebuild | 2 + |
| 14 |
2 files changed, 63 insertions(+) |
| 15 |
|
| 16 |
diff --git a/dev-ml/ocaml-containers/files/qcheck.patch b/dev-ml/ocaml-containers/files/qcheck.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..c88ef31741a |
| 19 |
--- /dev/null |
| 20 |
+++ b/dev-ml/ocaml-containers/files/qcheck.patch |
| 21 |
@@ -0,0 +1,61 @@ |
| 22 |
+commit b2f8eb5b27a95f37509ab6345910ecd62b3c8a90 |
| 23 |
+Author: Simon Cruanes <simon.cruanes.2007@×××.org> |
| 24 |
+Date: Tue May 30 09:16:37 2017 +0200 |
| 25 |
+ |
| 26 |
+ update to qcheck 0.6 |
| 27 |
+ |
| 28 |
+diff --git a/src/core/CCList.ml b/src/core/CCList.ml |
| 29 |
+index ebdf7ce..ef4254e 100644 |
| 30 |
+--- a/src/core/CCList.ml |
| 31 |
++++ b/src/core/CCList.ml |
| 32 |
+@@ -688,9 +688,9 @@ let take_while p l = |
| 33 |
+ *) |
| 34 |
+ |
| 35 |
+ (*$Q |
| 36 |
+- Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \ |
| 37 |
+- let l1 = take_while f l in \ |
| 38 |
+- List.for_all f l1) |
| 39 |
++ Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \ |
| 40 |
++ let l1 = take_while (Q.Fn.apply f) l in \ |
| 41 |
++ List.for_all (Q.Fn.apply f) l1) |
| 42 |
+ *) |
| 43 |
+ |
| 44 |
+ let rec drop_while p l = match l with |
| 45 |
+@@ -698,8 +698,8 @@ let rec drop_while p l = match l with |
| 46 |
+ | x :: l' -> if p x then drop_while p l' else l |
| 47 |
+ |
| 48 |
+ (*$Q |
| 49 |
+- Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \ |
| 50 |
+- take_while f l @ drop_while f l = l) |
| 51 |
++ Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \ |
| 52 |
++ take_while (Q.Fn.apply f) l @ drop_while (Q.Fn.apply f) l = l) |
| 53 |
+ *) |
| 54 |
+ |
| 55 |
+ let take_drop_while p l = |
| 56 |
+@@ -720,9 +720,9 @@ let take_drop_while p l = |
| 57 |
+ direct direct_depth_default_ p l |
| 58 |
+ |
| 59 |
+ (*$Q |
| 60 |
+- Q.(pair (fun1 small_int bool) (list small_int)) (fun (f,l) -> \ |
| 61 |
+- let l1,l2 = take_drop_while f l in \ |
| 62 |
+- (l1 = take_while f l) && (l2 = drop_while f l)) |
| 63 |
++ Q.(pair (fun1 Observable.int bool) (list small_int)) (fun (f,l) -> \ |
| 64 |
++ let l1,l2 = take_drop_while (Q.Fn.apply f) l in \ |
| 65 |
++ (l1 = take_while (Q.Fn.apply f) l) && (l2 = drop_while (Q.Fn.apply f) l)) |
| 66 |
+ *) |
| 67 |
+ |
| 68 |
+ let last n l = |
| 69 |
+diff --git a/src/data/CCRAL.ml b/src/data/CCRAL.ml |
| 70 |
+index 0c00c3a..5d9aa24 100644 |
| 71 |
+--- a/src/data/CCRAL.ml |
| 72 |
++++ b/src/data/CCRAL.ml |
| 73 |
+@@ -151,7 +151,8 @@ let mapi ~f l = |
| 74 |
+ *) |
| 75 |
+ |
| 76 |
+ (*$Q |
| 77 |
+- Q.(pair (list small_int)(fun2 int int bool)) (fun (l,f) -> \ |
| 78 |
++ Q.(pair (list small_int)(fun2 Observable.int Observable.int bool)) (fun (l,f) -> \ |
| 79 |
++ let f = Q.Fn.apply f in \ |
| 80 |
+ mapi ~f (of_list l) |> to_list = List.mapi f l ) |
| 81 |
+ *) |
| 82 |
+ |
| 83 |
|
| 84 |
diff --git a/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild b/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild |
| 85 |
index 33e8871a4f7..30745be4f65 100644 |
| 86 |
--- a/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild |
| 87 |
+++ b/dev-ml/ocaml-containers/ocaml-containers-1.2.ebuild |
| 88 |
@@ -24,6 +24,8 @@ RDEPEND=" |
| 89 |
DEPEND="${RDEPEND} dev-ml/cppo |
| 90 |
test? ( dev-ml/iTeML dev-ml/ounit dev-ml/gen )" |
| 91 |
|
| 92 |
+PATCHES=( "${FILESDIR}/qcheck.patch" ) |
| 93 |
+ |
| 94 |
src_configure() { |
| 95 |
oasis_configure_opts=" |
| 96 |
--enable-unix |
Archives