.gear/opam-port-to-dose3-6.0.1.patch | 146 +++++++++++++++++++++ .gear/opam.spec | 146 +++++++++++++++++++++ .gear/rules | 5 + .../tags/66b54031c76d5554a6417f8b9edc3f035bfbae75 | 6 + .gear/tags/list | 1 + 5 files changed, 304 insertions(+) diff --git a/.gear/opam-port-to-dose3-6.0.1.patch b/.gear/opam-port-to-dose3-6.0.1.patch new file mode 100644 index 00000000..c2082b17 --- /dev/null +++ b/.gear/opam-port-to-dose3-6.0.1.patch @@ -0,0 +1,146 @@ +From: Mehdi Dogguy +Date: Sun, 28 Feb 2021 19:27:24 +0100 +Subject: Port to Dose3 6.0.1 + +--- + src/client/opamAdminCheck.ml | 2 ++ + src/solver/opamBuiltinMccs.ml.real | 2 +- + src/solver/opamCudf.ml | 5 ++++- + src/solver/opamCudf.mli | 4 ++-- + src/solver/opamCudfSolver.ml | 4 ++-- + src/solver/opamSolver.ml | 4 +++- + 7 files changed, 16 insertions(+), 7 deletions(-) + +diff --git a/src/client/opamAdminCheck.ml b/src/client/opamAdminCheck.ml +index 05543a2..f23bfc4 100644 +--- a/src/client/opamAdminCheck.ml ++++ b/src/client/opamAdminCheck.ml +@@ -8,6 +8,8 @@ + (* *) + (**************************************************************************) + ++module Algo = Dose_algo ++ + open OpamTypes + open OpamPackage.Set.Op + +diff --git a/src/solver/opamBuiltinMccs.ml.real b/src/solver/opamBuiltinMccs.ml.real +index ab39ab3..2b41982 100644 +--- a/src/solver/opamBuiltinMccs.ml.real ++++ b/src/solver/opamBuiltinMccs.ml.real +@@ -42,7 +42,7 @@ let call solver_backend ext ~criteria ?t + ~verbose:OpamCoreConfig.(abs !r.debug_level >= 2) + ?timeout criteria cudf + with +- | None -> raise Common.CudfSolver.Unsat ++ | None -> raise Dose_common.CudfSolver.Unsat + | Some (preamble, univ) -> Some preamble, univ + | exception Mccs.Timeout -> raise (Timeout None) + +diff --git a/src/solver/opamCudf.ml b/src/solver/opamCudf.ml +index e07ff54..ad7293c 100644 +--- a/src/solver/opamCudf.ml ++++ b/src/solver/opamCudf.ml +@@ -9,6 +9,9 @@ + (* *) + (**************************************************************************) + ++module Common = Dose_common ++module Algo = Dose_algo ++ + open OpamTypes + open OpamTypesBase + +@@ -1315,7 +1318,7 @@ let call_external_solver ~version_map un + ignore (dump_cudf_request ~version_map cudf_request + criteria OpamSolverConfig.(!r.cudf_file)); + (* Wrap a return of exn Timeout through Depsolver *) +- let check_request_using ~call_solver ~criteria ~explain req = ++ let check_request_using ~call_solver ~explain req = + let timed_out = ref false in + let call_solver args = + try call_solver args with +@@ -1323,7 +1326,7 @@ let call_external_solver ~version_map un + | OpamCudfSolver.Timeout None -> raise (Timeout None) + in + let r = +- Algo.Depsolver.check_request_using ~call_solver ~criteria ~explain req ++ Algo.Depsolver.check_request_using ~call_solver ~explain req + in + if !timed_out then raise (Timeout (Some r)) else r + in +@@ -1335,7 +1338,7 @@ let call_external_solver ~version_map un + let r = + check_request_using + ~call_solver:(OpamSolverConfig.call_solver ~criteria) +- ~criteria ~explain:true cudf_request ++ ~explain:true cudf_request + in + log "Solver call done in %.3fs" (chrono ()); + r +diff --git a/src/solver/opamCudf.mli b/src/solver/opamCudf.mli +index cb8158d..c928ccf 100644 +--- a/src/solver/opamCudf.mli ++++ b/src/solver/opamCudf.mli +@@ -32,7 +32,7 @@ module Map: OpamStd.MAP with type key = Cudf.package + module Graph: sig + (** Graph of cudf packages *) + +- include module type of Algo.Defaultgraphs.PackageGraph.G ++ include module type of Dose_algo.Defaultgraphs.PackageGraph.G + + (** Build a graph from a CUDF universe. Warning: dependency edges are towards + the dependency, which is the reverse of what happens in the action +@@ -198,7 +198,7 @@ val string_of_vpkgs: Cudf_types.vpkg list -> string + + val make_conflicts: + version_map:int package_map -> Cudf.universe -> +- Algo.Diagnostic.diagnosis -> ('a, conflict) result ++ Dose_algo.Diagnostic.diagnosis -> ('a, conflict) result + val cycle_conflict: + version_map:int package_map -> Cudf.universe -> + string list list -> ('a, conflict) result +diff --git a/src/solver/opamCudfSolver.ml b/src/solver/opamCudfSolver.ml +index 03486f1..2651373 100644 +--- a/src/solver/opamCudfSolver.ml ++++ b/src/solver/opamCudfSolver.ml +@@ -57,7 +57,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = + in + OpamFilename.remove solver_in; + if not (OpamFilename.exists solver_out) then +- raise (Common.CudfSolver.Error "no output") ++ raise (Dose_common.CudfSolver.Error "no output") + else if + (let ic = OpamFilename.open_in solver_out in + try +@@ -65,7 +65,7 @@ let call_external_solver command ~criteria ?timeout (_, universe,_ as cudf) = + i = "FAIL" + with End_of_file -> close_in ic; false) + then +- raise Common.CudfSolver.Unsat ++ raise Dose_common.CudfSolver.Unsat + else + let r = + Cudf_parser.load_solution_from_file +diff --git a/src/solver/opamSolver.ml b/src/solver/opamSolver.ml +index 3748e75..bbf995f 100644 +--- a/src/solver/opamSolver.ml ++++ b/src/solver/opamSolver.ml +@@ -9,6 +9,8 @@ + (* *) + (**************************************************************************) + ++module Algo = Dose_algo ++ + open OpamTypes + open OpamTypesBase + open OpamPackage.Set.Op +@@ -90,7 +92,7 @@ let cudf_versions_map universe packages = + pmap OpamPackage.Map.empty + + let name_to_cudf name = +- Common.CudfAdd.encode (OpamPackage.Name.to_string name) ++ Dose_common.CudfAdd.encode (OpamPackage.Name.to_string name) + + let constraint_to_cudf version_map name (op,v) = + let nv = OpamPackage.create name v in diff --git a/.gear/opam.spec b/.gear/opam.spec new file mode 100644 index 00000000..4f41ce1d --- /dev/null +++ b/.gear/opam.spec @@ -0,0 +1,146 @@ +Name: opam +Version: 2.1.2 +Release: alt1 +Summary: A source-based package manager for OCaml +License: LGPLv3 +Group: Development/ML +Url: https://github.com/ocaml/opam +Source0: %name-%version.tar +Patch0: %name-%version-alt.patch +Patch1: opam-port-to-dose3-6.0.1.patch +BuildRequires: ocaml +BuildRequires: libacl-devel +BuildRequires: ocaml-opam-file-format-devel +BuildRequires: ocaml-cppo_ocamlbuild-devel +BuildRequires: ocaml-cppo +BuildRequires: ocaml-mccs-devel +BuildRequires: ocaml-findlib +BuildRequires: ocaml-ocamldoc +BuildRequires: ocaml-cudf-devel +BuildRequires: ocaml-ocamlgraph-devel +BuildRequires: ocaml-cmdliner-devel +BuildRequires: ocaml-re-devel +BuildRequires: ocaml-dose3-devel +BuildRequires: ocaml-extlib-devel +BuildRequires: ocaml-jsonm-devel +BuildRequires: ocaml-result-devel +BuildRequires: curl dune ocaml-omd gcc-c++ + +%description +OPAM stands for OCaml PAckage Manager. +It aims to suit to a vast number of users and use cases, +and has unique features: + + * Powerful handling of dependencies: + versions constraints, optional dependencies, conflicts, etc. + * Multiple repositories backends: HTTP, rsync, git + * Ease to create packages and repositories + * Ability to switch between different compiler versions + +Typically, OPAM will probably make your life easier if you recognize +yourself in at least one of these profiles: + + * You use multiple versions of the OCaml compiler, or you hack the + compiler yourself and needs to frequently switch between compiler + versions. + * You use or develop software that needs a specific and/or modified + version of the OCaml compiler to be installed. + * You use or develop software that depends on a specific version of an + OCaml library, or you just want to install a specific version of a + package, not just the latest one. + * You want to create your own packages yourself, put them on your own + repository, with minimal effort. + +%package doc +Summary: Documentation files for %name +Group: Documentation +Requires: %name = %version-%release + +%description doc +The %name-doc package contains documentation for using %name. + +%prep +%setup -q +%patch0 -p1 +%patch1 -p1 + +%build +%configure + +make + +%install +%makeinstall_std LIBINSTALL_DIR=%buildroot%_libdir/ocaml + +rm -rf %buildroot%prefix/doc + +%files +%doc README.md LICENSE CHANGES +%doc AUTHORS CONTRIBUTING.md +%_bindir/%name +%_bindir/%name-installer +%_mandir/man1/%name.1* +%_mandir/man1/%name-*.1* + +%files doc +%doc doc/ +%doc tests/ +%doc shell/ + +%changelog +* Fri Dec 31 2021 Anton Farygin 2.1.2-alt1 +- 2.1.2 +- built with posix ACL support + +* Wed Nov 03 2021 Anton Farygin 2.1.1-alt1 +- 2.1.1 +- added a patch from debian to support dose3 > 6.0.1 + +* Tue Aug 03 2021 Anton Farygin 2.1.0-alt1 +- 2.1.0 + +* Thu Jul 29 2021 Anton Farygin 2.0.9-alt1 +- 2.0.9 + +* Wed May 19 2021 Anton Farygin 2.0.8-alt2 +- removed ocaml-odoc from BR + +* Mon Apr 05 2021 Anton Farygin 2.0.8-alt1 +- 2.0.8 + +* Fri Apr 24 2020 Anton Farygin 2.0.7-alt1 +- 2.0.7 + +* Wed Apr 15 2020 Anton Farygin 2.0.6-alt2 +- applied upstream patch for build with dune 2.5 + +* Fri Jan 24 2020 Anton Farygin 2.0.6-alt1 +- 2.0.6 + +* Sat Aug 10 2019 Anton Farygin 2.0.5-alt1 +- 2.0.5 + +* Fri Aug 02 2019 Anton Farygin 2.0.4-alt2 +- rebuilt with ocaml-4.08 + +* Sat Apr 06 2019 Anton Farygin 2.0.4-alt1 +- 2.0.4 + +* Wed Feb 13 2019 Anton Farygin 2.0.3-alt1 +- 2.0.3 + +* Mon Jan 21 2019 Anton Farygin 2.0.2-alt1 +- 2.0.2 + +* Mon Oct 22 2018 Anton Farygin 2.0.1-alt1 +- 2.0.1 + +* Wed May 23 2018 Anton Farygin 2.0.0-alt1.rc +- 2.0.0-rc + +* Thu May 17 2018 Anton Farygin 1.3.1-alt2 +- fixed stubs libraries location + +* Thu Dec 21 2017 Anton Farygin 1.3.1-alt1 +- first build for ALT + diff --git a/.gear/rules b/.gear/rules new file mode 100644 index 00000000..980ad6fa --- /dev/null +++ b/.gear/rules @@ -0,0 +1,5 @@ +tar: @version@:. +diff: @version@:. . name=@name@-@version@-alt.patch +copy?: .gear/*.patch +spec: .gear/opam.spec + diff --git a/.gear/tags/66b54031c76d5554a6417f8b9edc3f035bfbae75 b/.gear/tags/66b54031c76d5554a6417f8b9edc3f035bfbae75 new file mode 100644 index 00000000..6ae7cc84 --- /dev/null +++ b/.gear/tags/66b54031c76d5554a6417f8b9edc3f035bfbae75 @@ -0,0 +1,6 @@ +object 1388025221bf807ae9cfe5c5bb274d1edee6a3c2 +type commit +tag 2.1.2 +tagger Kate 1638893437 +0000 + +2.1.2 diff --git a/.gear/tags/list b/.gear/tags/list new file mode 100644 index 00000000..6f26505b --- /dev/null +++ b/.gear/tags/list @@ -0,0 +1 @@ +66b54031c76d5554a6417f8b9edc3f035bfbae75 2.1.2