Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/ppx_tools/files/
Date: Tue, 02 Feb 2021 21:38:48
Message-Id: 1612301906.02b07e9b214f989113ebf7deed19a16377255007.conikost@gentoo
1 commit: 02b07e9b214f989113ebf7deed19a16377255007
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Mon Feb 1 16:48:28 2021 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 21:38:26 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b07e9b
7
8 dev-ml/ppx_tools: remove unused patch(es)
9
10 Closes: https://github.com/gentoo/gentoo/pull/19295
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
13 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
14
15 dev-ml/ppx_tools/files/ocaml404.patch | 47 -----------------------------------
16 1 file changed, 47 deletions(-)
17
18 diff --git a/dev-ml/ppx_tools/files/ocaml404.patch b/dev-ml/ppx_tools/files/ocaml404.patch
19 deleted file mode 100644
20 index 8a2ccee071e..00000000000
21 --- a/dev-ml/ppx_tools/files/ocaml404.patch
22 +++ /dev/null
23 @@ -1,47 +0,0 @@
24 -Index: ppx_tools-5.0-4.03.0/ast_mapper_class.ml
25 -===================================================================
26 ---- ppx_tools-5.0-4.03.0.orig/ast_mapper_class.ml
27 -+++ ppx_tools-5.0-4.03.0/ast_mapper_class.ml
28 -@@ -335,6 +335,7 @@ module P = struct
29 - | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s)
30 - | Ppat_exception p -> exception_ ~loc ~attrs (sub # pat p)
31 - | Ppat_extension x -> extension ~loc ~attrs (sub # extension x)
32 -+ | Ppat_open (l, p) -> open_ ~loc ~attrs (map_loc sub l) (sub # pat p)
33 - end
34 -
35 - module CE = struct
36 -Index: ppx_tools-5.0-4.03.0/genlifter.ml
37 -===================================================================
38 ---- ppx_tools-5.0-4.03.0.orig/genlifter.ml
39 -+++ ppx_tools-5.0-4.03.0/genlifter.ml
40 -@@ -49,8 +49,8 @@ module Main : sig end = struct
41 - let rec gen ty =
42 - if Hashtbl.mem printed ty then ()
43 - else let tylid = Longident.parse ty in
44 -- let (_, td) =
45 -- try Env.lookup_type tylid env
46 -+ let td =
47 -+ try Env.find_type (Env.lookup_type tylid env) env
48 - with Not_found ->
49 - Format.eprintf "** Cannot resolve type %s@." ty;
50 - exit 2
51 -Index: ppx_tools-5.0-4.03.0/rewriter.ml
52 -===================================================================
53 ---- ppx_tools-5.0-4.03.0.orig/rewriter.ml
54 -+++ ppx_tools-5.0-4.03.0/rewriter.ml
55 -@@ -92,13 +92,13 @@ let () =
56 - | `Struct ->
57 - let pstr = Parse.implementation lexer in
58 - let pstr = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name
59 -- Config.ast_impl_magic_number pstr in
60 -+ Pparse.Structure pstr in
61 - Pprintast.structure fmt pstr;
62 - Format.pp_print_newline fmt ()
63 - | `Sig ->
64 - let psig = Parse.interface lexer in
65 - let psig = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name
66 -- Config.ast_intf_magic_number psig in
67 -+ Pparse.Signature psig in
68 - Pprintast.signature fmt psig;
69 - Format.pp_print_newline fmt ())
70 - with exn ->