commit: 02b07e9b214f989113ebf7deed19a16377255007 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> AuthorDate: Mon Feb 1 16:48:28 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Feb 2 21:38:26 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02b07e9b
dev-ml/ppx_tools: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/19295 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> dev-ml/ppx_tools/files/ocaml404.patch | 47 ----------------------------------- 1 file changed, 47 deletions(-) diff --git a/dev-ml/ppx_tools/files/ocaml404.patch b/dev-ml/ppx_tools/files/ocaml404.patch deleted file mode 100644 index 8a2ccee071e..00000000000 --- a/dev-ml/ppx_tools/files/ocaml404.patch +++ /dev/null @@ -1,47 +0,0 @@ -Index: ppx_tools-5.0-4.03.0/ast_mapper_class.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/ast_mapper_class.ml -+++ ppx_tools-5.0-4.03.0/ast_mapper_class.ml -@@ -335,6 +335,7 @@ module P = struct - | Ppat_unpack s -> unpack ~loc ~attrs (map_loc sub s) - | Ppat_exception p -> exception_ ~loc ~attrs (sub # pat p) - | Ppat_extension x -> extension ~loc ~attrs (sub # extension x) -+ | Ppat_open (l, p) -> open_ ~loc ~attrs (map_loc sub l) (sub # pat p) - end - - module CE = struct -Index: ppx_tools-5.0-4.03.0/genlifter.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/genlifter.ml -+++ ppx_tools-5.0-4.03.0/genlifter.ml -@@ -49,8 +49,8 @@ module Main : sig end = struct - let rec gen ty = - if Hashtbl.mem printed ty then () - else let tylid = Longident.parse ty in -- let (_, td) = -- try Env.lookup_type tylid env -+ let td = -+ try Env.find_type (Env.lookup_type tylid env) env - with Not_found -> - Format.eprintf "** Cannot resolve type %s@." ty; - exit 2 -Index: ppx_tools-5.0-4.03.0/rewriter.ml -=================================================================== ---- ppx_tools-5.0-4.03.0.orig/rewriter.ml -+++ ppx_tools-5.0-4.03.0/rewriter.ml -@@ -92,13 +92,13 @@ let () = - | `Struct -> - let pstr = Parse.implementation lexer in - let pstr = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name -- Config.ast_impl_magic_number pstr in -+ Pparse.Structure pstr in - Pprintast.structure fmt pstr; - Format.pp_print_newline fmt () - | `Sig -> - let psig = Parse.interface lexer in - let psig = Pparse.apply_rewriters (* ~restore:true *) ~tool_name:!tool_name -- Config.ast_intf_magic_number psig in -+ Pparse.Signature psig in - Pprintast.signature fmt psig; - Format.pp_print_newline fmt ()) - with exn ->
