Date: Thursday, May 18, 2023 @ 10:37:32 Author: juergen Revision: 478001
OCaml 5.0.0 rebuild: Fix Pervasives deprecation Added: facile/trunk/ocaml5.patch Modified: facile/trunk/PKGBUILD --------------+ PKGBUILD | 17 ++++++++++--- ocaml5.patch | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 4 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2023-05-18 05:21:36 UTC (rev 478000) +++ PKGBUILD 2023-05-18 10:37:32 UTC (rev 478001) @@ -2,16 +2,25 @@ pkgname=facile pkgver=1.1.4 -pkgrel=3 +pkgrel=4 pkgdesc="A Functional Constraint Library" arch=(x86_64) url="http://www.recherche.enac.fr/opti/facile/"; license=("LGPL") -makedepends=('ocaml>=4.14.0' 'ocaml-compiler-libs') +makedepends=('ocaml' 'ocaml-compiler-libs') depends=() -source=(https://github.com/Emmanuel-PLF/facile/archive/$pkgver/$pkgname-$pkgver.tar.gz) -sha256sums=('f35cbc3c8022120c01a7b3844b279f032f37856bff1c9801c410f2520e786502') +source=(https://github.com/Emmanuel-PLF/facile/archive/$pkgver/$pkgname-$pkgver.tar.gz ocaml5.patch) +sha256sums=('f35cbc3c8022120c01a7b3844b279f032f37856bff1c9801c410f2520e786502' + '57d511db86373dd7ef3732fa09c7d6f24c03105873e1c01392f98b0212993a80') + +prepare() { + cd $pkgname-$pkgver/lib + patch -Np1 -i ../../ocaml5.patch +} + + + build() { cd $pkgname-$pkgver/lib make Added: ocaml5.patch =================================================================== --- ocaml5.patch (rev 0) +++ ocaml5.patch 2023-05-18 10:37:32 UTC (rev 478001) @@ -0,0 +1,74 @@ +diff -ub lib/fcl_cstr.ml lib.sic/fcl_cstr.ml +--- lib/fcl_cstr.ml 2017-11-30 20:24:10.000000000 +0100 ++++ lib.sic/fcl_cstr.ml 2023-05-18 12:20:58.691033891 +0200 +@@ -50,7 +50,7 @@ + and nb_solved = Fcl_stak.ref 0 in + let update i = + if update i then +- if Pervasives.not solved.(i) then begin ++ if Stdlib.not solved.(i) then begin + Fcl_stak.set nb_solved (Fcl_stak.get nb_solved + 1); + array_set_true solved i + end in +diff -ub lib/fcl_fdArray.ml lib.sic/fcl_fdArray.ml +--- lib/fcl_fdArray.ml 2017-11-30 20:24:10.000000000 +0100 ++++ lib.sic/fcl_fdArray.ml 2023-05-18 12:22:34.355125486 +0200 +@@ -299,7 +299,7 @@ + let (mi, ma) = + Array.fold_left + (fun (mi, ma) e -> +- (Pervasives.min mi (Fd.min e), Pervasives.max ma (Fd.max e))) ++ (Stdlib.min mi (Fd.min e), Stdlib.max ma (Fd.max e))) + (max_int, min_int) array in + if mi = ma then Fd.int mi else + let value = Fd.create (Fcl_domain.interval mi ma) in +diff -ub lib/fcl_misc.ml lib.sic/fcl_misc.ml +--- lib/fcl_misc.ml 2017-11-30 20:24:10.000000000 +0100 ++++ lib.sic/fcl_misc.ml 2023-05-18 12:20:22.631984218 +0200 +@@ -50,9 +50,9 @@ + x - y + *) + +- let (+) = Pervasives.(+) +- let (-) = Pervasives.(-) +- let ( * ) = Pervasives.( * ) ++ let (+) = Stdlib.(+) ++ let (-) = Stdlib.(-) ++ let ( * ) = Stdlib.( * ) + + let (=+) x y = x := !x + y + let (=+.) x y = x := !x +. y +diff -ub lib/fcl_nonlinear.ml lib.sic/fcl_nonlinear.ml +--- lib/fcl_nonlinear.ml 2017-11-30 20:24:10.000000000 +0100 ++++ lib.sic/fcl_nonlinear.ml 2023-05-18 12:22:26.218697740 +0200 +@@ -274,7 +274,7 @@ + let min_max_of_remainder x y = + let r_abs_max = + let min_y, max_y = Fd.min_max y in +- max (Pervasives.abs min_y) (Pervasives.abs max_y) - 1 in ++ max (Stdlib.abs min_y) (Stdlib.abs max_y) - 1 in + if Fd.min x >= 0 then (0, r_abs_max) + else if Fd.max x <= 0 then ((0 - r_abs_max), 0) + else ((0 - r_abs_max), r_abs_max) +diff -ub lib/fcl_sorting.ml lib.sic/fcl_sorting.ml +--- lib/fcl_sorting.ml 2017-11-30 20:24:10.000000000 +0100 ++++ lib.sic/fcl_sorting.ml 2023-05-18 12:22:07.745882402 +0200 +@@ -355,7 +355,7 @@ + else + let inf, sup = + Array.fold_left +- (fun (inf, sup) x -> Pervasives.min (Fd.min x) inf, Pervasives.max (Fd.max x) sup) (max_int, min_int) a in ++ (fun (inf, sup) x -> Stdlib.min (Fd.min x) inf, Stdlib.max (Fd.max x) sup) (max_int, min_int) a in + let d = Fd.array n inf sup + and p = Fd.array n 0 (n - 1) in + Fcl_cstr.post (cstr a ~p:(Some p) d); +@@ -368,7 +368,7 @@ + else + let inf, sup = + Array.fold_left +- (fun (inf, sup) x -> Pervasives.min (Fd.min x) inf, Pervasives.max (Fd.max x) sup) (max_int, min_int) a in ++ (fun (inf, sup) x -> Stdlib.min (Fd.min x) inf, Stdlib.max (Fd.max x) sup) (max_int, min_int) a in + let d = Fd.array n inf sup in + Fcl_cstr.post (cstr a d); + d;; +
