Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-ml/async_unix/files/
Date: Wed, 12 Apr 2017 09:34:56
Message-Id: 1491989685.3b3a969325345eae47d52878c3f2040ef896a39b.aballier@gentoo
1 commit: 3b3a969325345eae47d52878c3f2040ef896a39b
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Apr 12 09:33:23 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Wed Apr 12 09:34:45 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b3a9693
7
8 dev-ml/async_unix: remove stray patch
9
10 Package-Manager: Portage-2.3.5, Repoman-2.3.2
11
12 dev-ml/async_unix/files/oc43.patch | 87 --------------------------------------
13 1 file changed, 87 deletions(-)
14
15 diff --git a/dev-ml/async_unix/files/oc43.patch b/dev-ml/async_unix/files/oc43.patch
16 deleted file mode 100644
17 index 8d8cc176281..00000000000
18 --- a/dev-ml/async_unix/files/oc43.patch
19 +++ /dev/null
20 @@ -1,87 +0,0 @@
21 -diff -uNr async_unix-113.33.00/_oasis async_unix-113.33.00+4.03/_oasis
22 ---- async_unix-113.33.00/_oasis 2016-03-09 16:44:52.000000000 +0100
23 -+++ async_unix-113.33.00+4.03/_oasis 2016-03-22 15:13:48.000000000 +0100
24 -@@ -1,8 +1,8 @@
25 - OASISFormat: 0.4
26 --OCamlVersion: >= 4.02.3
27 -+OCamlVersion: >= 4.03.0
28 - FindlibVersion: >= 1.3.2
29 - Name: async_unix
30 --Version: 113.33.00
31 -+Version: 113.33.00+4.03
32 - Synopsis: Monadic concurrency library
33 - Authors: Jane Street Group, LLC <opensource@××××××××××.com>
34 - Copyrights: (C) 2008-2016 Jane Street Group LLC <opensource@××××××××××.com>
35 -diff -uNr async_unix-113.33.00/opam async_unix-113.33.00+4.03/opam
36 ---- async_unix-113.33.00/opam 2016-03-18 12:08:01.000000000 +0100
37 -+++ async_unix-113.33.00+4.03/opam 2016-03-22 17:51:33.000000000 +0100
38 -@@ -26,4 +26,4 @@
39 - "typerep"
40 - "variantslib"
41 - ]
42 --available: [ ocaml-version >= "4.02.3" ]
43 -+available: [ ocaml-version >= "4.03.0" ]
44 -diff -uNr async_unix-113.33.00/src/raw_scheduler.ml async_unix-113.33.00+4.03/src/raw_scheduler.ml
45 ---- async_unix-113.33.00/src/raw_scheduler.ml 2016-03-09 16:44:52.000000000 +0100
46 -+++ async_unix-113.33.00+4.03/src/raw_scheduler.ml 2016-03-22 15:13:48.000000000 +0100
47 -@@ -587,7 +587,7 @@
48 -
49 - let sync_changed_fds_to_file_descr_watcher t =
50 - let module F = (val t.file_descr_watcher : File_descr_watcher.S) in
51 -- let make_file_descr_watcher_agree_with (fd : Fd.t) =
52 -+ let make_file_descr_watcher_agree_with = (fun (fd : Fd.t) ->
53 - fd.watching_has_changed <- false;
54 - let desired =
55 - Read_write.mapi fd.watching ~f:(fun read_or_write watching ->
56 -@@ -607,7 +607,7 @@
57 - with exn ->
58 - failwiths "sync_changed_fds_to_file_descr_watcher unable to set fd"
59 - (desired, fd, exn, t) [%sexp_of: bool Read_write.t * Fd.t * exn * t]
60 -- in
61 -+ ) [@inline always] in
62 - let changed = t.fds_whose_watching_has_changed in
63 - t.fds_whose_watching_has_changed <- [];
64 - List.iter changed ~f:make_file_descr_watcher_agree_with;
65 -diff -uNr async_unix-113.33.00/src/std.ml async_unix-113.33.00+4.03/src/std.ml
66 ---- async_unix-113.33.00/src/std.ml 2016-03-09 16:44:52.000000000 +0100
67 -+++ async_unix-113.33.00+4.03/src/std.ml 2016-03-22 15:13:48.000000000 +0100
68 -@@ -60,10 +60,9 @@
69 -
70 - module Overwrite_ = struct
71 - let overwrite1 (`This_is_async__Think_about_blocking as x) = x
72 -- let wrap f `This_is_async__Think_about_blocking = f
73 -- let overwrite2 = wrap overwrite1
74 -- let overwrite3 = wrap overwrite2
75 -- let overwrite4 = wrap overwrite3
76 -+ let overwrite2 `This_is_async__Think_about_blocking = overwrite1
77 -+ let overwrite3 `This_is_async__Think_about_blocking = overwrite2
78 -+ let overwrite4 `This_is_async__Think_about_blocking = overwrite3
79 - let overwritef f = ksprintf (fun _ -> `This_is_async__Think_about_blocking) f
80 - end
81 - open Overwrite_
82 -diff -uNr async_unix-113.33.00/src/unix_syscalls.ml async_unix-113.33.00+4.03/src/unix_syscalls.ml
83 ---- async_unix-113.33.00/src/unix_syscalls.ml 2016-03-09 16:44:52.000000000 +0100
84 -+++ async_unix-113.33.00+4.03/src/unix_syscalls.ml 2016-03-22 15:13:48.000000000 +0100
85 -@@ -365,8 +365,8 @@
86 - ;;
87 -
88 - (* symlinks *)
89 --let symlink ~src ~dst =
90 -- In_thread.syscall_exn ~name:"symlink" (fun () -> Unix.symlink ~src ~dst)
91 -+let symlink ?to_dir ~src ~dst =
92 -+ In_thread.syscall_exn ~name:"symlink" (fun () -> Unix.symlink ?to_dir ~src ~dst)
93 - ;;
94 -
95 - let readlink filename =
96 -diff -uNr async_unix-113.33.00/src/unix_syscalls.mli async_unix-113.33.00+4.03/src/unix_syscalls.mli
97 ---- async_unix-113.33.00/src/unix_syscalls.mli 2016-03-09 16:44:52.000000000 +0100
98 -+++ async_unix-113.33.00+4.03/src/unix_syscalls.mli 2016-03-22 15:13:48.000000000 +0100
99 -@@ -223,7 +223,7 @@
100 - -> string
101 - -> unit Deferred.t
102 -
103 --val symlink : src:string -> dst:string -> unit Deferred.t
104 -+val symlink : ?to_dir:bool -> src:string -> dst:string -> unit Deferred.t
105 -
106 - val readlink : string -> string Deferred.t
107 -