unison: update to 2.51.3.

This commit is contained in:
Andrew J. Hesford 2020-11-23 11:14:05 -05:00
parent 8121f8de38
commit 39eb24686a
2 changed files with 6 additions and 51 deletions

View file

@ -1,46 +0,0 @@
From 23fa129254a3304902739fc989950cc747d1e0b3 Mon Sep 17 00:00:00 2001
From: Jaap Boender <jaapb@kerguelen.org>
Date: Thu, 21 Mar 2019 12:26:51 +0000
Subject: [PATCH] Compatibility with OCaml 4.08
---
src/files.ml | 2 +-
src/recon.ml | 4 ++--
src/system/system_generic.ml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
--- src/files.ml
+++ src/files.ml
@@ -734,7 +734,7 @@ let get_files_in_directory dir =
with End_of_file ->
dirh.System.closedir ()
end;
- Sort.list (<) !files
+ List.sort String.compare !files
let ls dir pattern =
Util.convertUnixErrorsToTransient
--- src/recon.ml
+++ src/recon.ml
@@ -662,8 +662,8 @@ let rec reconcile
(* Sorts the paths so that they will be displayed in order *)
let sortPaths pathUpdatesList =
- Sort.list
- (fun (p1, _) (p2, _) -> Path.compare p1 p2 <= 0)
+ List.sort
+ Path.compare
pathUpdatesList
let rec enterPath p1 p2 t =
--- src/system/system_generic.ml
+++ src/system/system_generic.ml
@@ -47,7 +47,7 @@ let open_out_gen = open_out_gen
let chmod = Unix.chmod
let chown = Unix.chown
let utimes = Unix.utimes
-let link = Unix.link
+let link s d = Unix.link s d
let openfile = Unix.openfile
let opendir f =
let h = Unix.opendir f in

View file

@ -1,19 +1,20 @@
# Template file for 'unison'
pkgname="unison"
version=2.51.2
revision=6
version=2.51.3
revision=1
hostmakedepends="ocaml"
short_desc="A file-synchronization tool"
maintainer="allan <mail@may.mooo.com>"
license="GPL-3"
homepage="http://www.cis.upenn.edu/~bcpierce/unison/"
distfiles="https://github.com/bcpierce00/unison/archive/v${version}.tar.gz"
checksum=a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e
nocross=yes
checksum=0c287d17f52729440b2bdc28edf4d19b2d5ea5869983d78e780d501c5866914b
nocross="OCaml does not cross compile"
do_build() {
CFLAGS= make UISTYLE=text DEBUGGING=false THREADS=true
CFLAGS= make ${makejobs} UISTYLE=text DEBUGGING=false THREADS=true
}
do_install() {
vbin src/unison
vbin src/unison-fsmonitor