control: tags -1 patch pending Patch uploaded.
G.
diff -Nru ppx-deriving-4.1/debian/changelog ppx-deriving-4.1/debian/changelog --- ppx-deriving-4.1/debian/changelog 2017-07-21 17:37:11.000000000 +0200 +++ ppx-deriving-4.1/debian/changelog 2017-10-28 13:37:32.000000000 +0200 @@ -1,3 +1,11 @@ +ppx-deriving (4.1-1.1) unstable; urgency=medium + + * Non-maintainer upload + * debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch: + - upstream fix for ocaml build failure (Closes: #876725) + + -- Gianfranco Costamagna <locutusofb...@debian.org> Sat, 28 Oct 2017 13:37:32 +0200 + ppx-deriving (4.1-1) unstable; urgency=medium * New upstream release diff -Nru ppx-deriving-4.1/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch ppx-deriving-4.1/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch --- ppx-deriving-4.1/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch 1970-01-01 01:00:00.000000000 +0100 +++ ppx-deriving-4.1/debian/patches/b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch 2017-10-28 13:37:32.000000000 +0200 @@ -0,0 +1,43 @@ +From b6b02c2ba051bde67c2b454724ff0bf36bc11060 Mon Sep 17 00:00:00 2001 +From: Jeremie Dimino <jdim...@janestreet.com> +Date: Wed, 7 Jun 2017 13:54:44 +0100 +Subject: [PATCH] Fix build with 4.05 + +--- + src/ppx_deriving.cppo.ml | 16 ++++++++++++++++ + 1 file changed, 16 insertions(+) + +Index: ppx-deriving/src/ppx_deriving.cppo.ml +=================================================================== +--- ppx-deriving.orig/src/ppx_deriving.cppo.ml ++++ ppx-deriving/src/ppx_deriving.cppo.ml +@@ -12,6 +12,21 @@ + open Ast_helper + open Ast_convenience + ++#if OCAML_VERSION >= (4, 05, 0) ++module Typ = struct ++ include Typ ++ ++ let poly ?(loc= !Ast_helper.default_loc) ?attrs vars ty = ++ let vars = List.map (fun txt -> { Asttypes.loc; txt }) vars in ++ Typ.poly ~loc ?attrs vars ty ++end ++ ++let rm_poly_locs = ++ List.map (fun x -> x.Asttypes.txt) ++#else ++let rm_poly_locs x = x ++#endif ++ + type deriver = { + name : string ; + core_type : (core_type -> expression) option; +@@ -310,6 +325,7 @@ + List.map free_in xs |> List.concat + | { ptyp_desc = Ptyp_alias (x, name) } -> [name] @ free_in x + | { ptyp_desc = Ptyp_poly (bound, x) } -> ++ let bound = rm_poly_locs bound in + List.filter (fun y -> not (List.mem y bound)) (free_in x) + | { ptyp_desc = Ptyp_variant (rows, _, _) } -> + List.map ( diff -Nru ppx-deriving-4.1/debian/patches/series ppx-deriving-4.1/debian/patches/series --- ppx-deriving-4.1/debian/patches/series 2017-07-21 17:35:39.000000000 +0200 +++ ppx-deriving-4.1/debian/patches/series 2017-10-28 13:37:32.000000000 +0200 @@ -1,2 +1,3 @@ 0001-Fix-install-target.patch 0002-Fix-typo-in-ppx_deriving_make.mllib.patch +b6b02c2ba051bde67c2b454724ff0bf36bc11060.patch
signature.asc
Description: OpenPGP digital signature