Hello community, here is the log from the commit of package ocaml-dune for openSUSE:Factory checked in at 2019-03-01 16:47:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ocaml-dune (Old) and /work/SRC/openSUSE:Factory/.ocaml-dune.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ocaml-dune" Fri Mar 1 16:47:26 2019 rev:5 rq:679989 version:1.7.3 Changes: -------- --- /work/SRC/openSUSE:Factory/ocaml-dune/ocaml-dune.changes 2019-02-25 17:58:50.354208849 +0100 +++ /work/SRC/openSUSE:Factory/.ocaml-dune.new.28833/ocaml-dune.changes 2019-03-01 16:47:29.465797588 +0100 @@ -1,0 +2,8 @@ +Thu Feb 28 02:11:16 UTC 2019 - [email protected] + +- Update to version 1.7.3: + * Fix interpretation of META files containing archives with / in + the filename. + * Make errors about menhir stanzas be located. + +------------------------------------------------------------------- Old: ---- ocaml-dune-1.7.2.tar.xz New: ---- ocaml-dune-1.7.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ocaml-dune.spec ++++++ --- /var/tmp/diff_new_pack.bJV0MR/_old 2019-03-01 16:47:30.093797349 +0100 +++ /var/tmp/diff_new_pack.bJV0MR/_new 2019-03-01 16:47:30.097797348 +0100 @@ -17,7 +17,7 @@ Name: ocaml-dune -Version: 1.7.2 +Version: 1.7.3 Release: 0 %{?ocaml_preserve_bytecode} Summary: A composable build system for OCaml ++++++ _service ++++++ --- /var/tmp/diff_new_pack.bJV0MR/_old 2019-03-01 16:47:30.121797338 +0100 +++ /var/tmp/diff_new_pack.bJV0MR/_new 2019-03-01 16:47:30.121797338 +0100 @@ -3,7 +3,7 @@ <param name="url">git://github.com/ocaml/dune.git</param> <param name="scm">git</param> <param name="versionformat">@PARENT_TAG@</param> - <param name="revision">1.7.2</param> + <param name="revision">1.7.3</param> <param name="filename">ocaml-dune</param> </service> <service name="recompress" mode="disabled"> ++++++ ocaml-dune-1.7.2.tar.xz -> ocaml-dune-1.7.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-1.7.2/CHANGES.md new/ocaml-dune-1.7.3/CHANGES.md --- old/ocaml-dune-1.7.2/CHANGES.md 2019-02-21 06:56:14.000000000 +0100 +++ new/ocaml-dune-1.7.3/CHANGES.md 2019-02-27 11:29:27.000000000 +0100 @@ -1,3 +1,13 @@ +1.7.3 (27/02/2019) +------------------ + +- Fix interpretation of `META` files containing archives with `/` in + the filename. For instance, this was causing llvm to be unusable + with dune (#1889, fix #1885, @diml) + +- Make errors about menhir stanzas be located (#1881, fix #1876, + @diml) + 1.7.2 (21/02/2019) ------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-1.7.2/src/dune_file.ml new/ocaml-dune-1.7.3/src/dune_file.ml --- old/ocaml-dune-1.7.2/src/dune_file.ml 2019-02-21 06:56:14.000000000 +0100 +++ new/ocaml-dune-1.7.3/src/dune_file.ml 2019-02-27 11:29:27.000000000 +0100 @@ -1689,6 +1689,7 @@ and infer = field_o_b "infer" ~check:(Syntax.since syntax (2, 0)) and menhir_syntax = Syntax.get_exn syntax and enabled_if = enabled_if + and loc = loc in let infer = match infer with @@ -1699,7 +1700,7 @@ ; flags ; modules ; mode - ; loc = Loc.none + ; loc ; infer ; enabled_if }) @@ -1717,12 +1718,14 @@ (let%map merge_into = field_o "merge_into" string and flags = field_oslu "flags" and modules = field "modules" (list string) - and mode = Rule.Mode.field in + and mode = Rule.Mode.field + and loc = loc + in { merge_into ; flags ; modules ; mode - ; loc = Loc.none + ; loc ; infer = false ; enabled_if = Blang.true_ }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ocaml-dune-1.7.2/src/dune_package.ml new/ocaml-dune-1.7.3/src/dune_package.ml --- old/ocaml-dune-1.7.2/src/dune_package.ml 2019-02-21 06:56:14.000000000 +0100 +++ new/ocaml-dune-1.7.3/src/dune_package.ml 2019-02-27 11:29:27.000000000 +0100 @@ -31,7 +31,12 @@ ~foreign_archives ~jsoo_runtime ~main_module_name ~sub_systems ~requires ~ppx_runtime_deps ~implements ~virtual_ ~modules ~modes ~version ~orig_src_dir ~dir = - let map_path p = Path.relative dir (Path.basename p) in + let map_path p = + if Path.is_managed p then + Path.relative dir (Path.basename p) + else + p + in let map_list = List.map ~f:map_path in let map_mode = Mode.Dict.map ~f:map_list in { loc
