| 1 |
commit: d7ad273c456d1563cbb0abc12d9b7b9bb5ef6736 |
| 2 |
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 1 18:21:57 2016 +0000 |
| 4 |
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 09:13:52 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7ad273c |
| 7 |
|
| 8 |
dev-ml/ppx_type_conv: use more recent upstream patch for ocaml 4.03 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> |
| 12 |
|
| 13 |
dev-ml/ppx_type_conv/files/oc43.patch | 43 +++++++++++++++++++++++++++++------ |
| 14 |
1 file changed, 36 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/dev-ml/ppx_type_conv/files/oc43.patch b/dev-ml/ppx_type_conv/files/oc43.patch |
| 17 |
index ac3a1df..f9df3e1 100644 |
| 18 |
--- a/dev-ml/ppx_type_conv/files/oc43.patch |
| 19 |
+++ b/dev-ml/ppx_type_conv/files/oc43.patch |
| 20 |
@@ -1,6 +1,18 @@ |
| 21 |
-diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.00+4.03/_oasis |
| 22 |
+diff -uNr ppx_type_conv-113.33.00/js-utils/gen_install.ml ppx_type_conv-113.33.01+4.03/js-utils/gen_install.ml |
| 23 |
+--- ppx_type_conv-113.33.00/js-utils/gen_install.ml 2016-03-09 16:44:55.000000000 +0100 |
| 24 |
++++ ppx_type_conv-113.33.01+4.03/js-utils/gen_install.ml 2016-04-18 12:11:00.000000000 +0200 |
| 25 |
+@@ -31,7 +31,7 @@ |
| 26 |
+ |> List.map (fun line -> Scanf.sscanf line "%[^=]=%S" (fun k v -> (k, v))) |
| 27 |
+ |
| 28 |
+ let remove_cwd = |
| 29 |
+- let prefix = Sys.getcwd () ^ "/" in |
| 30 |
++ let prefix = Sys.getcwd () ^ Filename.dir_sep in |
| 31 |
+ let len_prefix = String.length prefix in |
| 32 |
+ fun fn -> |
| 33 |
+ let len = String.length fn in |
| 34 |
+diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.01+4.03/_oasis |
| 35 |
--- ppx_type_conv-113.33.00/_oasis 2016-03-09 16:44:55.000000000 +0100 |
| 36 |
-+++ ppx_type_conv-113.33.00+4.03/_oasis 2016-03-22 15:13:51.000000000 +0100 |
| 37 |
++++ ppx_type_conv-113.33.01+4.03/_oasis 2016-04-18 12:11:00.000000000 +0200 |
| 38 |
@@ -1,8 +1,8 @@ |
| 39 |
OASISFormat: 0.4 |
| 40 |
-OCamlVersion: >= 4.02.3 |
| 41 |
@@ -8,22 +20,39 @@ diff -uNr ppx_type_conv-113.33.00/_oasis ppx_type_conv-113.33.00+4.03/_oasis |
| 42 |
FindlibVersion: >= 1.3.2 |
| 43 |
Name: ppx_type_conv |
| 44 |
-Version: 113.33.00 |
| 45 |
-+Version: 113.33.00+4.03 |
| 46 |
++Version: 113.33.01+4.03 |
| 47 |
Synopsis: Support Library for type-driven code generators |
| 48 |
Authors: Jane Street Group, LLC <opensource@××××××××××.com> |
| 49 |
Copyrights: (C) 2015-2016 Jane Street Group LLC <opensource@××××××××××.com> |
| 50 |
-diff -uNr ppx_type_conv-113.33.00/opam ppx_type_conv-113.33.00+4.03/opam |
| 51 |
+diff -uNr ppx_type_conv-113.33.00/opam ppx_type_conv-113.33.01+4.03/opam |
| 52 |
--- ppx_type_conv-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100 |
| 53 |
-+++ ppx_type_conv-113.33.00+4.03/opam 2016-03-22 17:51:38.000000000 +0100 |
| 54 |
++++ ppx_type_conv-113.33.01+4.03/opam 2016-04-18 12:27:13.000000000 +0200 |
| 55 |
@@ -17,4 +17,4 @@ |
| 56 |
"ppx_driver" |
| 57 |
"ppx_tools" {>= "0.99.3"} |
| 58 |
] |
| 59 |
-available: [ ocaml-version >= "4.02.3" ] |
| 60 |
+available: [ ocaml-version >= "4.03.0" ] |
| 61 |
-diff -uNr ppx_type_conv-113.33.00/src/type_conv.ml ppx_type_conv-113.33.00+4.03/src/type_conv.ml |
| 62 |
+diff -uNr ppx_type_conv-113.33.00/src/ignore_unused_warning.ml ppx_type_conv-113.33.01+4.03/src/ignore_unused_warning.ml |
| 63 |
+--- ppx_type_conv-113.33.00/src/ignore_unused_warning.ml 2016-03-09 16:44:55.000000000 +0100 |
| 64 |
++++ ppx_type_conv-113.33.01+4.03/src/ignore_unused_warning.ml 2016-04-18 12:11:00.000000000 +0200 |
| 65 |
+@@ -30,11 +30,11 @@ |
| 66 |
+ List.fold_left vbs ~init:[] ~f:(fun acc vb -> vars_of#pattern vb.pvb_pat acc) |
| 67 |
+ in |
| 68 |
+ let ign = |
| 69 |
+- pstr_value ~loc Nonrecursive |
| 70 |
++ pstr_value_list ~loc Nonrecursive |
| 71 |
+ (List.rev_map vars ~f:(fun v -> |
| 72 |
+ underscore_binding (pexp_ident ~loc:v.loc v))) |
| 73 |
+ in |
| 74 |
+- loop rest (ign :: item :: acc) |
| 75 |
++ loop rest (ign @ (item :: acc)) |
| 76 |
+ | item :: rest -> |
| 77 |
+ loop rest (item :: acc) |
| 78 |
+ in |
| 79 |
+diff -uNr ppx_type_conv-113.33.00/src/type_conv.ml ppx_type_conv-113.33.01+4.03/src/type_conv.ml |
| 80 |
--- ppx_type_conv-113.33.00/src/type_conv.ml 2016-03-09 16:44:55.000000000 +0100 |
| 81 |
-+++ ppx_type_conv-113.33.00+4.03/src/type_conv.ml 2016-03-22 15:13:51.000000000 +0100 |
| 82 |
++++ ppx_type_conv-113.33.01+4.03/src/type_conv.ml 2016-04-18 12:11:00.000000000 +0200 |
| 83 |
@@ -472,9 +472,10 @@ |
| 84 |
Ast_pattern.( |
| 85 |
let label = |
Archives