[patch] Patch for unison-2.51

unison-2.51.2-ocaml-4.08.patch (text/plain), 1.66 KB, created by Petr Zima on 2020-03-17 16:22:06 UTC

diff -ur src.orig/files.ml src/files.ml
--- src.orig/files.ml	2018-01-27 21:53:44.000000000 +0100
+++ src/files.ml	2019-12-11 16:12:40.005712137 +0100
@@ -734,7 +734,7 @@
   with End_of_file ->
     dirh.System.closedir ()
   end;
-  Sort.list (<) !files
+  List.sort compare !files
 
 let ls dir pattern =
   Util.convertUnixErrorsToTransient
diff -ur src.orig/recon.ml src/recon.ml
--- src.orig/recon.ml	2018-01-27 21:53:44.000000000 +0100
+++ src/recon.ml	2019-12-11 16:12:40.005712137 +0100
@@ -661,8 +661,8 @@
 
 (* 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
+    (fun (p1, _) (p2, _) -> Path.compare p1 p2)
     pathUpdatesList
 
 let rec enterPath p1 p2 t =
diff -ur src.orig/system/system_generic.ml src/system/system_generic.ml
--- src.orig/system/system_generic.ml	2018-01-27 21:53:44.000000000 +0100
+++ src/system/system_generic.ml	2019-12-11 16:12:40.005712137 +0100
@@ -47,7 +47,7 @@
 let chmod = Unix.chmod
 let chown = Unix.chown
 let utimes = Unix.utimes
-let link = Unix.link
+let link s1 s2 = Unix.link s1 s2
 let openfile = Unix.openfile
 let opendir f =
   let h = Unix.opendir f in
diff -ur src.orig/uigtk2.ml src/uigtk2.ml
--- src.orig/uigtk2.ml	2018-01-27 21:53:44.000000000 +0100
+++ src/uigtk2.ml	2019-12-11 16:12:40.005712137 +0100
@@ -94,7 +94,7 @@
 let icon =
   let p = GdkPixbuf.create ~width:48 ~height:48 ~has_alpha:true () in
   Gpointer.blit
-    (Gpointer.region_of_string Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
+    (Gpointer.region_of_bytes Pixmaps.icon_data) (GdkPixbuf.get_pixels p);
   p
 
 let leftPtrWatch =