diff options
author | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-12-05 13:48:18 +0100 |
---|---|---|
committer | Sören Tempel <soeren+git@soeren-tempel.net> | 2019-12-05 14:00:21 +0100 |
commit | 4f59e233fd428b738739a0e608daf1f8b1f60632 (patch) | |
tree | b578966124988011c8d60e67f749e4b36f2dd3fe /community/unison | |
parent | f0caea17a987cfc40be2c0c6958f03a89420aec3 (diff) | |
download | aports-4f59e233fd428b738739a0e608daf1f8b1f60632.tar.bz2 aports-4f59e233fd428b738739a0e608daf1f8b1f60632.tar.xz |
community/unison: fix compatibility with OCaml 4.08
Diffstat (limited to 'community/unison')
-rw-r--r-- | community/unison/APKBUILD | 6 | ||||
-rw-r--r-- | community/unison/ocaml-4.08.patch | 47 |
2 files changed, 51 insertions, 2 deletions
diff --git a/community/unison/APKBUILD b/community/unison/APKBUILD index 970e9ec147..42cc4d334f 100644 --- a/community/unison/APKBUILD +++ b/community/unison/APKBUILD @@ -17,7 +17,8 @@ subpackages="$pkgname-gui" source="$pkgname-$_pkgver.tar.gz::https://github.com/bcpierce00/$pkgname/archive/v$_pkgver.tar.gz fix-inotify-check.patch makefile-fix-clean.patch - fix-for-lablgtk-2.18.6.patch" + fix-for-lablgtk-2.18.6.patch + ocaml-4.08.patch" # TODO: Enable check once this issue is fixed: # https://github.com/bcpierce00/unison/issues/73 options="!check" @@ -69,4 +70,5 @@ gui() { sha512sums="658b37fd18d8dee517e88ad707f7e80c1731542a0e07e6a8d56e6598e38bcf405cdb8db224274bf9b3319ed87efc45057d1f79e6437c4ca53afe9cec4afe6c78 unison-2.48.15v4.tar.gz 53ef0b9bd5632509cad69d60924da36836017574a59cd373aa44710c2d82b1329ab406753f430c98be8527428bd9a4847dde372dc5074781eb4a83de4e300d77 fix-inotify-check.patch cd8b9b6edc22c586f8f3fa566224c465a007b46b86766c25c2348f1a8eadb8faf28d6a8e4747611f8550f938ed52cb62de00cd9ca175e27b57cd81d6c286229a makefile-fix-clean.patch -b7ffd449ff54f03f4f7ca11dfeb1cd4ebb757f60bd924797c4fb48e63bbc99188e353b53e240043e99d4915bf1c2ed54444bfe7c4b0393c5ad010b8ac16249e2 fix-for-lablgtk-2.18.6.patch" +b7ffd449ff54f03f4f7ca11dfeb1cd4ebb757f60bd924797c4fb48e63bbc99188e353b53e240043e99d4915bf1c2ed54444bfe7c4b0393c5ad010b8ac16249e2 fix-for-lablgtk-2.18.6.patch +302d070003e396982c35260ee8dd1569b272a5c17f21eabd92ae41bd6fe8570a117e769f5e26a26bf9f4a7a418c016a73c1edf8a11f552c7b8eaf9dadd4113ac ocaml-4.08.patch" diff --git a/community/unison/ocaml-4.08.patch b/community/unison/ocaml-4.08.patch new file mode 100644 index 0000000000..9a42a7f856 --- /dev/null +++ b/community/unison/ocaml-4.08.patch @@ -0,0 +1,47 @@ +This patches fixes compatibility with OCaml 4.08 + +See: + + * https://github.com/bcpierce00/unison/issues/277 + * https://github.com/bcpierce00/unison/commit/23fa129254a3304902739fc989950cc747d1e0b3 + +diff -upr unison-2.48.15v4.orig/files.ml unison-2.48.15v4/files.ml +--- unison-2.48.15v4.orig/files.ml 2019-12-05 13:42:09.566446355 +0100 ++++ unison-2.48.15v4/files.ml 2019-12-05 13:42:19.469777627 +0100 +@@ -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 +Only in unison-2.48.15v4/src: files.ml.orig +diff -upr unison-2.48.15v4.orig/recon.ml unison-2.48.15v4/recon.ml +--- unison-2.48.15v4.orig/recon.ml 2019-12-05 13:42:09.569779688 +0100 ++++ unison-2.48.15v4/recon.ml 2019-12-05 13:42:19.469777627 +0100 +@@ -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 = +Only in unison-2.48.15v4/src: recon.ml.orig +diff -upr unison-2.48.15v4.orig/system/system_generic.ml unison-2.48.15v4/system/system_generic.ml +--- unison-2.48.15v4.orig/system/system_generic.ml 2019-12-05 13:42:09.573113020 +0100 ++++ unison-2.48.15v4/system/system_generic.ml 2019-12-05 13:42:19.469777627 +0100 +@@ -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 |