[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlfuse/files/
commit: 357e185e7cbd85d89fb8baa0d56f043d48edd89f Author: Alfredo Tupone gentoo org> AuthorDate: Fri May 31 18:31:11 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri May 31 18:32:06 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=357e185e dev-ml/ocamlfuse: different fix for Wint Closes: https://bugs.gentoo.org/933214 Signed-off-by: Alfredo Tupone gentoo.org> .../ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch | 74 +++--- 1 file changed, 65 insertions(+), 9 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 index 94df1c01546a..8f1e7f405bf6 100644 --- a/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch +++ b/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch @@ -1,11 +1,67 @@ a/lib/Fuse_util.c 2024-05-30 14:46:19.594917120 +0200 -+++ b/lib/Fuse_util.c 2024-05-30 14:46:39.870690546 +0200 -@@ -354,7 +354,7 @@ +--- 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) - #define init_CALL_ARGS (conn) --#define init_RTYPE void * -+#define init_RTYPE int - #define init_CB vres=callback(*init_closure,Val_unit); - /* TODO: the result from init is wrong, it should return unit */ - #define init_RES +@@ -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) + } +
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlfuse/, dev-ml/ocamlfuse/files/
commit: 0f137461dbf0a9d09d67f597ec5060a5079f6471 Author: Alfredo Tupone gentoo org> AuthorDate: Thu May 30 12:50:49 2024 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu May 30 13:08:53 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f137461 dev-ml/ocamlfuse: -Wint-conversion Closes: https://bugs.gentoo.org/932194 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch | 11 +++ dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild| 7 +-- 2 files changed, 16 insertions(+), 2 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 new file mode 100644 index ..94df1c01546a --- /dev/null +++ b/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-Wint.patch @@ -0,0 +1,11 @@ +--- a/lib/Fuse_util.c 2024-05-30 14:46:19.594917120 +0200 b/lib/Fuse_util.c 2024-05-30 14:46:39.870690546 +0200 +@@ -354,7 +354,7 @@ + + #define init_ARGS (struct fuse_conn_info *conn) + #define init_CALL_ARGS (conn) +-#define init_RTYPE void * ++#define init_RTYPE int + #define init_CB vres=callback(*init_closure,Val_unit); + /* TODO: the result from init is wrong, it should return unit */ + #define init_RES diff --git a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild index 63891abc2fe4..ec2cd36592e8 100644 --- a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild +++ b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -31,7 +31,10 @@ BDEPEND=" dev-ml/opam " -PATCHES=( "${FILESDIR}"/${P}-unistd.patch ) +PATCHES=( + "${FILESDIR}"/${P}-unistd.patch + "${FILESDIR}"/${P}-Wint.patch +) src_compile() { tc-export CPP
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlfuse/files/, dev-ml/ocamlfuse/
commit: 2958fd6e3029daf53af53720cc85840d2374c6ec Author: Alfredo Tupone gentoo org> AuthorDate: Tue Sep 20 17:57:27 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Sep 20 17:57:27 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2958fd6e dev-ml/ocamlfuse: add unistd include Closes: https://bugs.gentoo.org/870685 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-unistd.patch | 10 ++ dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild | 2 ++ 2 files changed, 12 insertions(+) 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 new file mode 100644 index ..b13f906a5ef3 --- /dev/null +++ b/dev-ml/ocamlfuse/files/ocamlfuse-2.7.1_p7-unistd.patch @@ -0,0 +1,10 @@ +--- a/lib/Unix_util_stubs.c2022-09-20 19:53:44.445778566 +0200 b/lib/Unix_util_stubs.c2022-09-20 19:54:03.521504343 +0200 +@@ -24,6 +24,7 @@ + vincenzo...@yahoo.it + */ + ++#include + #include + #include + #include diff --git a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild index fdf08ccbc300..63891abc2fe4 100644 --- a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild +++ b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild @@ -31,6 +31,8 @@ BDEPEND=" dev-ml/opam " +PATCHES=( "${FILESDIR}"/${P}-unistd.patch ) + src_compile() { tc-export CPP dune_src_compile
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlfuse/
commit: 1ba9ee4001826febce8dfaf6692345de493e8e37 Author: Sam James gentoo org> AuthorDate: Sat Jul 23 04:11:36 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jul 23 04:11:36 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ba9ee40 dev-ml/ocamlfuse: [QA] fix dtd URL (HTTP->HTTPS) Signed-off-by: Sam James gentoo.org> dev-ml/ocamlfuse/metadata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlfuse/metadata.xml b/dev-ml/ocamlfuse/metadata.xml index c4853a8f842c..5d0251ea61f5 100644 --- a/dev-ml/ocamlfuse/metadata.xml +++ b/dev-ml/ocamlfuse/metadata.xml @@ -1,5 +1,5 @@ -http://www.gentoo.org/dtd/metadata.dtd;> +https://www.gentoo.org/dtd/metadata.dtd;> m...@gentoo.org
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlfuse/
commit: 83689e263e4b00dcf7b78603044d660fb91a5422 Author: Christoph Junghans gentoo org> AuthorDate: Wed Jul 13 01:26:25 2022 + Commit: Christoph Junghans gentoo org> CommitDate: Wed Jul 13 01:26:25 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=83689e26 dev-ml/ocamlfuse: initial commit Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Christoph Junghans gentoo.org> dev-ml/ocamlfuse/Manifest | 1 + dev-ml/ocamlfuse/metadata.xml | 23 + dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild | 37 +++ 3 files changed, 61 insertions(+) diff --git a/dev-ml/ocamlfuse/Manifest b/dev-ml/ocamlfuse/Manifest new file mode 100644 index ..3a0975208f94 --- /dev/null +++ b/dev-ml/ocamlfuse/Manifest @@ -0,0 +1 @@ +DIST ocamlfuse-2.7.1_p7-r1.tar.gz 21469 BLAKE2B fa587d19124c2e2d320091bb42b098644d3112e39652dbf621c88f701effdab0ce15372b6f2461709eb3afe628e2888db3a7a0c9abeab8b8a136d09c69c84ac4 SHA512 342a6ce8a81ac05d47d4458ef6e9aa750e4e7643a89d28705664852f0549e1932643e8db5d93225ba496611654b3f11fef6aca1e6e40e8d4b30064fc9c65f7fd diff --git a/dev-ml/ocamlfuse/metadata.xml b/dev-ml/ocamlfuse/metadata.xml new file mode 100644 index ..c4853a8f842c --- /dev/null +++ b/dev-ml/ocamlfuse/metadata.xml @@ -0,0 +1,23 @@ + +http://www.gentoo.org/dtd/metadata.dtd;> + + +m...@gentoo.org +ML + + This is a binding to FUSE for the OCaml programming language, enabling +you to write multithreaded filesystems in the OCaml language. It has +been designed with simplicity as a goal, as you can see by looking at +example/fusexmp.ml. Efficiency has also been a separate goal. The +Bigarray library is used for read and writes, allowing the library to +do zero-copy in OCaml land. + +https://github.com/astrada/ocamlfuse/issues +astrada/ocamlfuse +ocamlfuse + + Alessandro Strada + alessandro.str...@gmail.com + + + diff --git a/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild new file mode 100644 index ..fdf08ccbc300 --- /dev/null +++ b/dev-ml/ocamlfuse/ocamlfuse-2.7.1_p7-r1.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit dune toolchain-funcs + +MYPV="${PV/_p/_cvs}" + +DESCRIPTION="OCaml binding for fuse" +HOMEPAGE=" + https://sourceforge.net/projects/ocamlfuse/ + https://github.com/astrada/ocamlfuse + https://opam.ocaml.org/packages/ocamlfuse +" +SRC_URI="https://github.com/astrada/${PN}/archive/v${MYPV}.tar.gz -> ${PF}.tar.gz" +S="${WORKDIR}/${PN}-${MYPV}" + +LICENSE="GPL-2" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="ocamlopt" + +RDEPEND=" + dev-ml/camlidl:= + sys-fs/fuse:0 +" +DEPEND="${RDEPEND}" +BDEPEND=" + dev-ml/dune-configurator + dev-ml/opam +" + +src_compile() { + tc-export CPP + dune_src_compile +}