From 216271205d598fa718139d99f53ca45c4473bbb9 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Mon, 25 Nov 2024 18:22:19 -0600 Subject: [PATCH 1/5] Build with dune. --- .../ocurl-windows/ocurl-windows.0.9.2/opam | 22 ++++++++++++++----- 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/packages/ocurl-windows/ocurl-windows.0.9.2/opam b/packages/ocurl-windows/ocurl-windows.0.9.2/opam index ef405976..477a2b5f 100644 --- a/packages/ocurl-windows/ocurl-windows.0.9.2/opam +++ b/packages/ocurl-windows/ocurl-windows.0.9.2/opam @@ -8,12 +8,22 @@ dev-repo: "git+https://github.com/ygrek/ocurl.git" bug-reports: "https://github.com/ygrek/ocurl/issues" tags: ["org:ygrek" "clib:curl"] build: [ - ["./configure" "--host=%{conf-gcc-windows:host}%" "--prefix=%{prefix}%" "OCAMLFIND_TOOLCHAIN=windows"] - ["env" "OCAMLFIND_TOOLCHAIN=windows" make "OCAMLOPT=ocamlfind ocamlopt" "OCAMLC=ocamlfind ocamlc"] -] -install: [ - ["env" "OCAMLFIND_TOOLCHAIN=windows" - make "install"] + [ "./configure" + "--host=%{conf-gcc-windows:host}%" + "--prefix=%{prefix}%" + "OCAMLFIND_TOOLCHAIN=windows" + ] + [ + "dune" + "build" + "-p" + "curl" + "-x" + "windows" + "-j" + jobs + "@install" + ] ] depends: [ "ocaml-windows" {>= "4.02.0"} From 35cbe0b98700020143fac47dedbe335eba0dc226 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Mon, 25 Nov 2024 22:51:38 -0600 Subject: [PATCH 2/5] Add dune. --- packages/ocurl-windows/ocurl-windows.0.9.2/opam | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/ocurl-windows/ocurl-windows.0.9.2/opam b/packages/ocurl-windows/ocurl-windows.0.9.2/opam index 477a2b5f..289a4386 100644 --- a/packages/ocurl-windows/ocurl-windows.0.9.2/opam +++ b/packages/ocurl-windows/ocurl-windows.0.9.2/opam @@ -27,6 +27,7 @@ build: [ ] depends: [ "ocaml-windows" {>= "4.02.0"} + "dune" "ocamlfind" {build} ] depopts: ["lwt" "lwt_ppx"] From 847f6d3d68bb031d1a44589da745ee782671b0fd Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Mon, 25 Nov 2024 23:20:20 -0600 Subject: [PATCH 3/5] Bump version. --- packages/curl-windows/curl-windows.0.9.2/opam | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/curl-windows/curl-windows.0.9.2/opam b/packages/curl-windows/curl-windows.0.9.2/opam index 6edc06a9..4e8cbd94 100644 --- a/packages/curl-windows/curl-windows.0.9.2/opam +++ b/packages/curl-windows/curl-windows.0.9.2/opam @@ -33,5 +33,5 @@ depexts: [ synopsis: "Bindings to libcurl" description: "libcurl is a client-side URL transfer library, supporting HTTP and a multitude of other network protocols (FTP/SMTP/RTSP/etc). This library wrap easy synchronous API (Curl), synchronous parallel and generic asynchronous API (Curl.Multi), and provides an Lwt-enabled asynchronous interface (Curl_lwt)." url { - src: "git+https://github.com/ygrek/ocurl.git#f0c6f47" + src: "git+https://github.com/ygrek/ocurl.git#1bc75b8" } From fc11e94cc37e9f93cb8ac09922bee77f587a045c Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Mon, 25 Nov 2024 23:34:34 -0600 Subject: [PATCH 4/5] Fix. --- packages/curl-windows/curl-windows.0.9.2/opam | 37 ------------------- .../ocurl-windows/ocurl-windows.0.9.2/opam | 8 +--- 2 files changed, 1 insertion(+), 44 deletions(-) delete mode 100644 packages/curl-windows/curl-windows.0.9.2/opam diff --git a/packages/curl-windows/curl-windows.0.9.2/opam b/packages/curl-windows/curl-windows.0.9.2/opam deleted file mode 100644 index 4e8cbd94..00000000 --- a/packages/curl-windows/curl-windows.0.9.2/opam +++ /dev/null @@ -1,37 +0,0 @@ -opam-version: "2.0" -maintainer: "ygrek@autistici.org" -homepage: "https://ygrek.org/p/ocurl" -license: "MIT" -authors: [ "Lars Nilsson" "ygrek" ] -doc: ["https://ygrek.org/p/ocurl/api/index.html"] -dev-repo: "git+https://github.com/ygrek/ocurl.git" -bug-reports: "https://github.com/ygrek/ocurl/issues" -tags: ["org:ygrek" "clib:curl"] -build: [ - ["./configure" "--host=%{conf-gcc-windows:host}%" "--prefix=%{prefix}%" "OCAMLFIND_TOOLCHAIN=windows"] - [ - "dune" - "build" - "-p" - "curl" - "-x" - "windows" - "-j" - jobs - "@install" - ] -] -depends: [ - "ocaml-windows" {>= "4.02.0"} - "ocamlfind" {build} -] -depopts: ["lwt" "lwt_ppx"] -conflicts: ["ocurl-windows"] -depexts: [ - ["curl"] {os-distribution = "mxe"} -] -synopsis: "Bindings to libcurl" -description: "libcurl is a client-side URL transfer library, supporting HTTP and a multitude of other network protocols (FTP/SMTP/RTSP/etc). This library wrap easy synchronous API (Curl), synchronous parallel and generic asynchronous API (Curl.Multi), and provides an Lwt-enabled asynchronous interface (Curl_lwt)." -url { - src: "git+https://github.com/ygrek/ocurl.git#1bc75b8" -} diff --git a/packages/ocurl-windows/ocurl-windows.0.9.2/opam b/packages/ocurl-windows/ocurl-windows.0.9.2/opam index 289a4386..8a1c8e15 100644 --- a/packages/ocurl-windows/ocurl-windows.0.9.2/opam +++ b/packages/ocurl-windows/ocurl-windows.0.9.2/opam @@ -37,11 +37,5 @@ depexts: [ synopsis: "Bindings to libcurl" description: "libcurl is a client-side URL transfer library, supporting HTTP and a multitude of other network protocols (FTP/SMTP/RTSP/etc). This library wrap easy synchronous API (Curl), synchronous parallel and generic asynchronous API (Curl.Multi), and provides an Lwt-enabled asynchronous interface (Curl_lwt)." url { - src: "https://ygrek.org/p/release/ocurl/ocurl-0.9.2.tar.gz" - checksum: [ - "md5=8a4149c6cfa79dabdfde24f308ad1f0c" - "sha256=e0359718c874dacd55c0b596e5dee1d23b4c394b9b5a604f1a6d618217d67763" - "sha512=5d670e32cdd492fa0e495b9b6b5171a9811542a520a777ed87d245ffc28cc5211d94a097750e632ee939ccc6eb91afd4b186b84d72168500e48790800b637400" - ] - mirrors: "https://github.com/ygrek/ocurl/releases/download/0.9.2/ocurl-0.9.2.tar.gz" + src: "git+https://github.com/ygrek/ocurl.git#1bc75b8" } From 276a39b987ca4a174d7e4a499dd4f8e46982ceb6 Mon Sep 17 00:00:00 2001 From: Romain Beauxis Date: Fri, 29 Nov 2024 23:16:30 -0600 Subject: [PATCH 5/5] Patch. --- .../flexdll-windows/flexdll-windows.0.42/opam | 2 +- .../files/patches/undef.patch | 18 ++++++++++++++++++ .../ocurl-windows/ocurl-windows.0.9.2/opam | 6 ++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 packages/ocurl-windows/ocurl-windows.0.9.2/files/patches/undef.patch diff --git a/packages/flexdll-windows/flexdll-windows.0.42/opam b/packages/flexdll-windows/flexdll-windows.0.42/opam index 04a43420..b3d43945 100644 --- a/packages/flexdll-windows/flexdll-windows.0.42/opam +++ b/packages/flexdll-windows/flexdll-windows.0.42/opam @@ -69,6 +69,6 @@ extra-files: [ ["patches/no-gcc_eh.patch" "md5=65bdd2a32d0777a9d8b315df91632166"] ] url { - src: "https://github.com/alainfrisch/flexdll/archive/0.42.tar.gz" + src: "https://github.com/ocaml/flexdll/archive/0.42.tar.gz" checksum: "9464ae7a7e566ba7c96336cf2f34cc73" } diff --git a/packages/ocurl-windows/ocurl-windows.0.9.2/files/patches/undef.patch b/packages/ocurl-windows/ocurl-windows.0.9.2/files/patches/undef.patch new file mode 100644 index 00000000..fc2b3902 --- /dev/null +++ b/packages/ocurl-windows/ocurl-windows.0.9.2/files/patches/undef.patch @@ -0,0 +1,18 @@ +diff --git a/curl-helper.c b/curl-helper.c +index 6e3c748..9558cfa 100644 +--- a/curl-helper.c ++++ b/curl-helper.c +@@ -3329,10 +3329,13 @@ SETOPT_LONG( BUFFERSIZE) + SETOPT_STRING( AWS_SIGV4) + #endif + ++#undef TCP_KEEPALIVE + SETOPT_BOOL( TCP_KEEPALIVE) + ++#undef TCP_KEEPIDLE + SETOPT_LONG( TCP_KEEPIDLE) + ++#undef TCP_KEEPINTVL + SETOPT_LONG( TCP_KEEPINTVL) + + /** diff --git a/packages/ocurl-windows/ocurl-windows.0.9.2/opam b/packages/ocurl-windows/ocurl-windows.0.9.2/opam index 8a1c8e15..30127e4c 100644 --- a/packages/ocurl-windows/ocurl-windows.0.9.2/opam +++ b/packages/ocurl-windows/ocurl-windows.0.9.2/opam @@ -25,6 +25,12 @@ build: [ "@install" ] ] +patches: [ + "patches/undef.patch" +] +extra-files: [ + ["patches/undef.patch" "md5=6a9b6d85af9f73c6c22ae918baa36ed9"] +] depends: [ "ocaml-windows" {>= "4.02.0"} "dune"