[arch-commits] Commit in unison/trunk (4.08-compatibility.patch PKGBUILD)

[Jürgen Hötzel]

    Date: Friday, August 16, 2019 @ 06:15:36
  Author: juergen
Revision: 359878

OCaml 4.08 rebuild

Added:
  unison/trunk/4.08-compatibility.patch
Modified:
  unison/trunk/PKGBUILD

--------------------------+
 4.08-compatibility.patch |   52 +++++++++++++++++++++++++++++++++++++++++++++
 PKGBUILD                 |    5 +++-
 2 files changed, 56 insertions(+), 1 deletion(-)

Added: 4.08-compatibility.patch
===================================================================
--- 4.08-compatibility.patch	                        (rev 0)
+++ 4.08-compatibility.patch	2019-08-16 06:15:36 UTC (rev 359878)
@@ -0,0 +1,52 @@
+From 29fa058c3127f3b47c347dcaa4a94f4c0e888308 Mon Sep 17 00:00:00 2001
+From: Jaap Boender <jaapb at 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(-)
+
+diff --git a/src/files.ml b/src/files.ml
+index ba42ad57..5babf21e 100644
+--- a/src/files.ml
++++ b/src/files.ml
+@@ -722,7 +722,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
+diff --git a/src/recon.ml b/src/recon.ml
+index 5ed358d7..0df2cfe4 100644
+--- a/src/recon.ml
++++ b/src/recon.ml
+@@ -651,8 +651,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 =
+diff --git a/src/system/system_generic.ml b/src/system/system_generic.ml
+index ed8e18f3..0e28a781 100755
+--- a/src/system/system_generic.ml
++++ b/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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-16 06:07:13 UTC (rev 359877)
+++ PKGBUILD	2019-08-16 06:15:36 UTC (rev 359878)
@@ -3,7 +3,7 @@
 
 pkgname=unison
 pkgver=2.51.2
-pkgrel=3
+pkgrel=4
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'
@@ -13,9 +13,11 @@
 makedepends=('ocaml' 'emacs' 'lablgtk2')
 source=("https://github.com/bcpierce00/unison/archive/v${pkgver}.tar.gz"
         'large.patch'
+	'4.08-compatibility.patch'
         'desktop')
 sha256sums=('a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e'
             '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
+	    '7c97ac4a13d6865dad0b447d519566dba3adaa777d2c2aa2014d4e5d7d8c0c13'
             'b497b1c23cceb8967e9c3f9a39720e3029d370304ae410795121224f96c234a3')
 
 options=('!makeflags')
@@ -24,6 +26,7 @@
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	sed 's/region_of_string/region_of_bytes/' -i src/uigtk2.ml
 	patch -p0 -i ../large.patch
+	patch -p1 -i ../4.08-compatibility.patch
 }
 
 build() {