From 23a6b93fcc200004b222811fbb5adc23814e9eda Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 29 Nov 2023 11:39:01 +0100
Subject: [PATCH] Build libcurl with meson.

---
 kiwixbuild/dependencies/libcurl.py | 74 +++++++++++++++---------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/kiwixbuild/dependencies/libcurl.py b/kiwixbuild/dependencies/libcurl.py
index f63ef7b..9044259 100644
--- a/kiwixbuild/dependencies/libcurl.py
+++ b/kiwixbuild/dependencies/libcurl.py
@@ -3,7 +3,7 @@ import os
 from .base import (
     Dependency,
     ReleaseDownload,
-    MakeBuilder,
+    MesonBuilder,
 )
 
 from kiwixbuild.utils import Remotefile, pj, Defaultdict, SkipCommand, run_command
@@ -15,44 +15,44 @@ class LibCurl(Dependency):
 
     class Source(ReleaseDownload):
         name = "libcurl"
-        archive = Remotefile(
-            "curl-7.67.0.tar.xz",
-            "f5d2e7320379338c3952dcc7566a140abb49edb575f9f99272455785c40e536c",
-            "https://curl.haxx.se/download/curl-7.67.0.tar.xz",
+        src_archive = Remotefile(
+            "curl-8.4.0.tar.xz",
+            "16c62a9c4af0f703d28bda6d7bbf37ba47055ad3414d70dec63e2e6336f2a82d",
+            "https://curl.se/download/curl-8.4.0.tar.xz",
         )
+        meson_archive = Remotefile(
+            "curl_8.4.0-2_patch.zip",
+            "bbb6ae75225c36ef9bb336cface729794c7c070c623a003fff40bd416042ff6e",
+            "https://public.kymeria.fr/KIWIX/curl_8.4.0-2_patch.zip",
+        )
+        archives = [src_archive, meson_archive]
 
-    class Builder(MakeBuilder):
+    class Builder(MesonBuilder):
         dependencies = ["zlib"]
         configure_options = [
-            *[
-                f"--without-{p}"
-                for p in (
-                    "libssh2",
-                    "ssl",
-                    "libmetalink",
-                    "librtmp",
-                    "nghttp2",
-                    "libidn2",
-                    "brotli",
-                )
-            ],
-            *[
-                f"--disable-{p}"
-                for p in (
-                    "ftp",
-                    "file",
-                    "ldap",
-                    "ldaps",
-                    "rtsp",
-                    "dict",
-                    "telnet",
-                    "tftp",
-                    "pop3",
-                    "imap",
-                    "smb",
-                    "smtp",
-                    "gopher",
-                    "manual",
-                )
-            ],
+            f"-D{p}=disabled"
+            for p in (
+                "ssh",
+                "ssl",
+                "rtmp",
+                "http2",
+                "idn",
+                "brotli",
+                "ftp",
+                "file",
+                "ldap",
+                "ldaps",
+                "rtsp",
+                "dict",
+                "telnet",
+                "tftp",
+                "pop3",
+                "imap",
+                "smb",
+                "smtp",
+                "gopher",
+            )
         ]
+
+        def _test(self, context):
+            context.skip("No Test")