diff options
| -rw-r--r-- | net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch | 67 | ||||
| -rw-r--r-- | net-misc/unison/files/unison-2.48.4-Makefile-dep.patch | 20 |
2 files changed, 0 insertions, 87 deletions
diff --git a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch b/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch deleted file mode 100644 index 8a8205d3cfe3..000000000000 --- a/net-misc/unison/files/unison-2.48.15_p4-ocaml-4.08.patch +++ /dev/null @@ -1,67 +0,0 @@ -Reworked for v2.48.15v4 ( https://github.com/bcpierce00/unison/commit/29fa058 ) - -From: Stephane Glondu <steph@glondu.net> -Date: Mon, 25 Nov 2019 10:52:48 +0100 -Subject: Fix compilation with OCaml 4.08.1 - ---- - files.ml | 2 +- - recon.ml | 4 ++-- - system/system_generic.ml | 2 +- - uigtk2.ml | 2 +- - 5 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/Makefile.OCaml b/Makefile.OCaml -index 21610ce..7549907 100644 ---- a/files.ml -+++ b/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/recon.ml b/recon.ml -index 5ed358d..a8719c4 100644 ---- a/recon.ml -+++ b/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/system/system_generic.ml b/system/system_generic.ml -index 9230cdc..ee457c5 100755 ---- a/system/system_generic.ml -+++ b/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 -diff --git a/uigtk2.ml b/uigtk2.ml -index 206d8ad..b2a17e2 100644 ---- a/uigtk2.ml -+++ b/uigtk2.ml -@@ -94,7 +94,7 @@ let icon = - 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 = diff --git a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch b/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch deleted file mode 100644 index f65959dfb4ac..000000000000 --- a/net-misc/unison/files/unison-2.48.4-Makefile-dep.patch +++ /dev/null @@ -1,20 +0,0 @@ -Makefile.OCaml: fswatch.cmi depends on ubase/prefs.cmi. - - The dependency is needed to compile unison - in parallel. - -Reference: https://github.com/bcpierce00/unison/pull/100 - -diff --git a/Makefile.OCaml b/Makefile.OCaml -index 21610ce..84fe7ad 100644 ---- a/Makefile.OCaml -+++ b/Makefile.OCaml -@@ -426,6 +426,8 @@ win32rc/unison.res.lib: win32rc/unison.res - @echo "$(CAMLC): $< ---> $@" - $(CAMLC) $(CAMLFLAGS) -c $(CWD)/$< - -+fswatch.cmi : ubase/prefs.cmi -+ - %.cmo: %.ml - @echo "$(OCAMLC): $< ---> $@" - $(OCAMLC) $(CAMLFLAGS) -c $(CWD)/$< |