| 1 |
commit: 520ce0cb598b20c344c4e8698f0c64fffdf8816a |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Sep 30 17:24:49 2021 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Sep 30 17:25:46 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=520ce0cb |
| 7 |
|
| 8 |
dev-ml/ppx_assert: fix ocaml-4.12 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/794895 |
| 11 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
.../ppx_assert/files/ppx_assert-0.14.0-4.12.patch | 30 ++++++++++++++++++++++ |
| 15 |
dev-ml/ppx_assert/metadata.xml | 4 +++ |
| 16 |
dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild | 2 ++ |
| 17 |
3 files changed, 36 insertions(+) |
| 18 |
|
| 19 |
diff --git a/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..80ff9fb1eb4 |
| 22 |
--- /dev/null |
| 23 |
+++ b/dev-ml/ppx_assert/files/ppx_assert-0.14.0-4.12.patch |
| 24 |
@@ -0,0 +1,30 @@ |
| 25 |
+--- a/runtime-lib/runtime.ml 2021-09-30 19:07:51.592766183 +0200 |
| 26 |
++++ b/runtime-lib/runtime.ml 2021-09-30 19:11:18.035634157 +0200 |
| 27 |
+@@ -71,7 +71,7 @@ |
| 28 |
+ end; |
| 29 |
+ `Fail (expect, got) |
| 30 |
+ |
| 31 |
+-let test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got = |
| 32 |
++let test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got = |
| 33 |
+ let pass = |
| 34 |
+ match equal with |
| 35 |
+ | None -> comparator got expect = 0 |
| 36 |
+@@ -89,7 +89,7 @@ |
| 37 |
+ ] |
| 38 |
+ |
| 39 |
+ let test_eq ~pos ~sexpifier ~comparator ~here ?message ?equal t1 t2 = |
| 40 |
+- match test_result_or_eq ~sexpifier ~comparator ?equal ~expect:t1 ~got:t2 with |
| 41 |
++ match test_result_or_eq ~sexpifier ~comparator ~equal ~expect:t1 ~got:t2 with |
| 42 |
+ | `Pass -> () |
| 43 |
+ | `Fail (t1, t2) -> test_eq_failed ~message ~pos ~here ~t1 ~t2 |
| 44 |
+ |
| 45 |
+@@ -99,7 +99,7 @@ |
| 46 |
+ Sexp.List [Sexp.Atom "got"; got]; |
| 47 |
+ ] |
| 48 |
+ |
| 49 |
+-let test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got = |
| 50 |
+- match test_result_or_eq ~sexpifier ~comparator ?equal ~expect ~got with |
| 51 |
++let[@warning "-16"] test_result ~pos ~sexpifier ~comparator ~here ?message ?equal ~expect ~got = |
| 52 |
++ match test_result_or_eq ~sexpifier ~comparator ~equal ~expect ~got with |
| 53 |
+ | `Pass -> () |
| 54 |
+ | `Fail (expect, got) -> test_result_failed ~message ~pos ~here ~expect ~got |
| 55 |
|
| 56 |
diff --git a/dev-ml/ppx_assert/metadata.xml b/dev-ml/ppx_assert/metadata.xml |
| 57 |
index d2c8c92d51d..d0d7bf7876c 100644 |
| 58 |
--- a/dev-ml/ppx_assert/metadata.xml |
| 59 |
+++ b/dev-ml/ppx_assert/metadata.xml |
| 60 |
@@ -1,6 +1,10 @@ |
| 61 |
<?xml version="1.0" encoding="UTF-8"?> |
| 62 |
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 63 |
<pkgmetadata> |
| 64 |
+ <maintainer type="project"> |
| 65 |
+ <email>ml@g.o</email> |
| 66 |
+ <name>ML</name> |
| 67 |
+ </maintainer> |
| 68 |
<maintainer type="person"> |
| 69 |
<email>gienah@g.o</email> |
| 70 |
<name>Mark Wright</name> |
| 71 |
|
| 72 |
diff --git a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild |
| 73 |
index 4db2bc4b592..0be3c6c2301 100644 |
| 74 |
--- a/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild |
| 75 |
+++ b/dev-ml/ppx_assert/ppx_assert-0.14.0.ebuild |
| 76 |
@@ -27,3 +27,5 @@ DEPEND=" |
| 77 |
dev-ml/cinaps:= |
| 78 |
" |
| 79 |
RDEPEND="${DEPEND}" |
| 80 |
+ |
| 81 |
+PATCHES=( "${FILESDIR}"/${P}-4.12.patch ) |
Archives