unison: rebuild and fix for ocaml-4.08.1
This commit is contained in:
parent
6affad6053
commit
5dfacb83b8
2 changed files with 47 additions and 1 deletions
46
srcpkgs/unison/patches/ocaml408.patch
Normal file
46
srcpkgs/unison/patches/ocaml408.patch
Normal file
|
@ -0,0 +1,46 @@
|
|||
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
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'unison'
|
||||
pkgname="unison"
|
||||
version=2.51.2
|
||||
revision=2
|
||||
revision=3
|
||||
hostmakedepends="ocaml"
|
||||
short_desc="A file-synchronization tool"
|
||||
maintainer="allan <mail@may.mooo.com>"
|
||||
|
|
Loading…
Reference in a new issue