commit: 3811948d072ac7e9f612c0d637ca1fe951c57eda Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Apr 27 19:22:57 2025 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Mon Apr 28 20:57:59 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3811948d
dev-ml/ocamlfuse: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/41798 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> .../ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch | 67 ---------------------- .../files/ocamlfuse-2.7.1_p7-unistd.patch | 10 ---- 2 files changed, 77 deletions(-) diff --git a/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch b/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch deleted file mode 100644 index 8f1e7f405bf6..000000000000 --- a/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/lib/Fuse_util.c 2024-05-31 19:58:34.910818884 +0200 -+++ b/lib/Fuse_util.c 2024-05-31 20:25:27.021700407 +0200 -@@ -293,7 +293,6 @@ - } - - #define FOR_ALL_OPS(MACRO) \ -- MACRO(init) \ - MACRO(getattr) \ - MACRO(readlink) \ - MACRO(readdir) \ -@@ -344,12 +343,14 @@ - #define SET_NULL_OP(OPNAME) .OPNAME = NULL, - - static struct fuse_operations ops = { -+ SET_NULL_OP(init) - FOR_ALL_OPS(SET_NULL_OP) - }; - - static value * ocaml_list_length=NULL; - - #define DECLARE_OP_CLOSURE(OPNAME) static value * OPNAME##_closure=NULL; -+DECLARE_OP_CLOSURE(init) - FOR_ALL_OPS(DECLARE_OP_CLOSURE) - - #define init_ARGS (struct fuse_conn_info *conn) -@@ -593,6 +594,33 @@ - #define removexattr_CB vpath = copy_string(path); vres=callback2(*removexattr_closure,vpath,copy_string(name)); - #define removexattr_RES - -+static void *gm281_ops_init(struct fuse_conn_info *conn) -+{ -+ CAMLparam0(); -+ CAMLlocal4(vstring, vpath, vres, vtmp); -+ intptr_t res = -1; -+ vres=callback(*init_closure,Val_unit); -+ if (Tag_val(vres)==1) /* Result is not Bad */ -+ { -+ res=0; -+ } -+ else -+ { -+ if (Is_block(Field(vres,0))) /* This is EUNKNOWNERR of int in ocaml */ -+ res=-Int_val(Field(Field(vres,0),0)); -+ else res=-ml2c_unix_error(Int_val(Field(vres,0))); -+ } -+ CAMLreturnT(void *, (void *)res); -+} -+ -+static void *ops_init(struct fuse_conn_info *conn) -+{ -+ leave_blocking_section(); -+ void *ret = gm281_ops_init(conn); -+ enter_blocking_section(); -+ return ret; -+} -+ - #define CALLBACK(OPNAME) \ - static OPNAME##_RTYPE gm281_ops_##OPNAME OPNAME##_ARGS \ - {\ -@@ -634,6 +662,7 @@ - - void set_fuse_operations(struct fuse_operation_names const *op) - { -+ SET_OPERATION(init) - FOR_ALL_OPS(SET_OPERATION) - } - diff --git a/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-unistd.patch b/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-unistd.patch deleted file mode 100644 index b13f906a5ef3..000000000000 --- a/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-unistd.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/lib/Unix_util_stubs.c 2022-09-20 19:53:44.445778566 +0200 -+++ b/lib/Unix_util_stubs.c 2022-09-20 19:54:03.521504343 +0200 -@@ -24,6 +24,7 @@ - [email protected] - */ - -+#include <unistd.h> - #include <stddef.h> - #include <string.h> - #include <errno.h>
