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

[Felix Yan]

    Date: Wednesday, June 30, 2021 @ 10:22:34
  Author: felixonmars
Revision: 418788

upgpkg: unison 2.51.3-1

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

--------------------------+
 4.08-compatibility.patch |   52 ---------------------------------------------
 PKGBUILD                 |   13 ++++-------
 2 files changed, 5 insertions(+), 60 deletions(-)

Deleted: 4.08-compatibility.patch
===================================================================
--- 4.08-compatibility.patch	2021-06-30 02:15:56 UTC (rev 418787)
+++ 4.08-compatibility.patch	2021-06-30 10:22:34 UTC (rev 418788)
@@ -1,52 +0,0 @@
-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	2021-06-30 02:15:56 UTC (rev 418787)
+++ PKGBUILD	2021-06-30 10:22:34 UTC (rev 418788)
@@ -2,8 +2,8 @@
 #Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=unison
-pkgver=2.51.2
-pkgrel=10
+pkgver=2.51.3
+pkgrel=1
 pkgdesc='File-synchronization tool'
 #url='https://github.com/bcpierce00/unison/'
 url='https://www.cis.upenn.edu/~bcpierce/unison/'
@@ -13,12 +13,10 @@
 makedepends=('ocaml>=4.11.0' 'emacs' 'lablgtk2')
 source=("https://github.com/bcpierce00/unison/archive/v${pkgver}.tar.gz"
         'large.patch'
-	'4.08-compatibility.patch'
         'desktop')
-sha256sums=('a2efcbeab651be6df69cc9b253011a07955ecb91fb407a219719451197849d5e'
-            '2a971cf17e0a7303e99a793829e2b7b03533d17041e3b2ebba53555a5bd62284'
-            '7c97ac4a13d6865dad0b447d519566dba3adaa777d2c2aa2014d4e5d7d8c0c13'
-            '2dc5c53386cc065706e6c901d1a1a205808e449dc9676320d1de7a5dd673e174')
+sha512sums=('202bc592cf18d3ac76d7e29ec71add5d6e33a96b4b885e0e2add9a5a621db2290184f268c70e4f05e4884d6cdfed09f6fcd3dde85681c39628a10ea552917c8f'
+            'e2f7a5e6e832ee9c694f36e399178652456d2047b22cba86603982cd6f6caf54e520fc87a8bde1940b2da46102cf3aa89f3e062c965efc77cd840b47e01b4d2f'
+            '74526b1f583f49b3e1c68b72c9ab3d5875796b8b371c1388cf3b5b25aef8a0304023e9bb960b2ff9aec2eb989f712e99b2c049b8075529074f62ef9ffd6c1cdd')
 
 options=('!makeflags')
 
@@ -26,7 +24,6 @@
 	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() {