From d8b4d24d7f86f5dc46c363924b6a4deed8327111 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Fri, 23 Aug 2024 18:07:50 +0200
Subject: [PATCH] Add more dependencies is base dependencies on Windows

---
 kiwixbuild/dependencies/all_dependencies.py | 68 +++++++++++++--------
 kiwixbuild/versions.py                      |  2 +-
 2 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/kiwixbuild/dependencies/all_dependencies.py b/kiwixbuild/dependencies/all_dependencies.py
index 25dba4f..3a364c7 100644
--- a/kiwixbuild/dependencies/all_dependencies.py
+++ b/kiwixbuild/dependencies/all_dependencies.py
@@ -13,32 +13,50 @@ class AllBaseDependencies(Dependency):
     class Builder(NoopBuilder):
         @classmethod
         def get_dependencies(cls, configInfo, allDeps):
-            if neutralEnv("distname") == "Windows":
-                return ["zlib", "zstd", "icu4c", "zim-testing-suite", "xapian-core"]
             if configInfo.build == "wasm" or environ.get("OS_NAME") == "manylinux":
                 return ["zlib", "lzma", "zstd", "icu4c", "xapian-core"]
 
-            base_deps = [
-                "zlib",
-                "lzma",
-                "zstd",
-                "xapian-core",
-                "pugixml",
-                "libcurl",
-                "icu4c",
-                "mustache",
-                "libmicrohttpd",
-                "zim-testing-suite",
-            ]
-            # Add specific dependencies depending of the config
-            if configInfo.build not in ("android", "iOS"):
-                # For zimtools
-                base_deps += ["docoptcpp"]
-                if configInfo.build != "win32":
-                    # zimwriterfs
-                    base_deps += ["libmagic", "gumbo"]
-                if configInfo.build == "native" and neutralEnv("distname") != "Darwin":
-                    # We compile kiwix-desktop only on native and not on `Darwin`
-                    # So we need aria2 only there
-                    base_deps += ["aria2"]
+            if neutralEnv("distname") == "Windows":
+                base_deps = [
+                    "zlib",
+                    "zstd",
+                    "xapian-core",
+                    "zim-testing-suite",
+                    "icu4c",
+                ]
+
+                if not configInfo.name.endswith("_dyn"):
+                    base_deps += [
+                        "pugixml",
+                        "libcurl",
+                        "mustache",
+                        "libmicrohttpd",
+                    ]
+            else:
+                base_deps = [
+                    "zlib",
+                    "lzma",
+                    "zstd",
+                    "xapian-core",
+                    "pugixml",
+                    "libcurl",
+                    "icu4c",
+                    "mustache",
+                    "libmicrohttpd",
+                    "zim-testing-suite",
+                ]
+                # Add specific dependencies depending of the config
+                if configInfo.build not in ("android", "iOS"):
+                    # For zimtools
+                    base_deps += ["docoptcpp"]
+                    if configInfo.build != "win32":
+                        # zimwriterfs
+                        base_deps += ["libmagic", "gumbo"]
+                    if (
+                        configInfo.build == "native"
+                        and neutralEnv("distname") != "Darwin"
+                    ):
+                        # We compile kiwix-desktop only on native and not on `Darwin`
+                        # So we need aria2 only there
+                        base_deps += ["aria2"]
             return base_deps
diff --git a/kiwixbuild/versions.py b/kiwixbuild/versions.py
index feabcc1..e1ad695 100644
--- a/kiwixbuild/versions.py
+++ b/kiwixbuild/versions.py
@@ -39,7 +39,7 @@ release_versions = {
 
 # This is the "version" of the whole base_deps_versions dict.
 # Change this when you change base_deps_versions.
-base_deps_meta_version = "04"
+base_deps_meta_version = "05"
 
 base_deps_versions = {
     "zlib": "1.2.12",