From 2e4193e41ba78c860991582ee6901f93c314be65 Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Wed, 29 Nov 2023 14:42:03 +0100
Subject: [PATCH] Build icu4c using meson on Windows.

---
 kiwixbuild/dependencies/icu4c.py | 91 +++++++++++++++++++-------------
 1 file changed, 53 insertions(+), 38 deletions(-)

diff --git a/kiwixbuild/dependencies/icu4c.py b/kiwixbuild/dependencies/icu4c.py
index 55492b64..6f7cc01d 100644
--- a/kiwixbuild/dependencies/icu4c.py
+++ b/kiwixbuild/dependencies/icu4c.py
@@ -1,13 +1,14 @@
 from .base import (
     Dependency,
     ReleaseDownload,
-    MakeBuilder
+    MakeBuilder, MesonBuilder
 )
 
 from kiwixbuild.utils import pj, SkipCommand, Remotefile, extract_archive
 from kiwixbuild._global import get_target_step, neutralEnv
 import os, shutil
 import fileinput
+import platform
 
 class Icu(Dependency):
     name = "icu4c"
@@ -19,9 +20,12 @@ class Source(ReleaseDownload):
         archive_data = Remotefile('icu4c-73_2-data.zip',
                                   'ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701',
                                   'https://github.com/unicode-org/icu/releases/download/release-73-2/icu4c-73_2-data.zip')
+        meson_patch = Remotefile('icu_73.2-2_patch.zip',
+                                  '',
+                                  'https://wrapdb.mesonbuild.com/v2/icu_73.2-2/get_patch')
 
 
-        archives = [archive_src, archive_data]
+        archives = [archive_src, archive_data, meson_patch]
 
         def _extract(self, context):
             context.try_skip(self.extract_path)
@@ -39,6 +43,12 @@ def _extract(self, context):
                 topdir='data',
                 name='data'
             )
+            extract_archive(
+                pj(neutralEnv('archive_dir'), self.meson_patch.name),
+                neutralEnv('source_dir'),
+                topdir='icu',
+                name= self.source_dir
+            )
 
         patches = [
                    "icu4c_fix_static_lib_name_mingw.patch",
@@ -50,44 +60,49 @@ def _extract(self, context):
                    "icu4c_wasm.patch"
                   ]
 
+    if platform.system() == 'Windows':
+        class Builder(MesonBuilder):
+            def set_env(self, env):
+                env['ICU_DATA_FILTER_FILE'] = pj(os.path.dirname(os.path.realpath(__file__)), "icu4c_data_filter.json")
 
-    class Builder(MakeBuilder):
-        subsource_dir = "source"
-        make_install_targets = ["install"]
+    else:
+        class Builder(MakeBuilder):
+            subsource_dir = "source"
+            make_install_targets = ["install"]
 
-        @classmethod
-        def get_dependencies(cls, platformInfo, allDeps):
-            plt = 'native_static' if platformInfo.static else 'native_dyn'
-            return [(plt, 'icu4c')]
+            @classmethod
+            def get_dependencies(cls, platformInfo, allDeps):
+                plt = 'native_static' if platformInfo.static else 'native_dyn'
+                return [(plt, 'icu4c')]
 
-        @property
-        def configure_options(self):
-            yield "--disable-samples"
-            yield "--disable-tests"
-            yield "--disable-extras"
-            yield "--disable-dyload"
-            yield "--enable-rpath"
-            yield "--disable-icuio"
-            yield "--disable-layoutex"
-            platformInfo = self.buildEnv.platformInfo
-            if platformInfo.build != 'native':
-                icu_native_builder = get_target_step(
-                    'icu4c',
-                    'native_static' if platformInfo.static else 'native_dyn')
-                yield f"--with-cross-build={icu_native_builder.build_path}"
-                yield "--disable-tools"
-            if platformInfo.build in ('android', 'wasm'):
-                yield "--with-data-packaging=archive"
+            @property
+            def configure_options(self):
+                yield "--disable-samples"
+                yield "--disable-tests"
+                yield "--disable-extras"
+                yield "--disable-dyload"
+                yield "--enable-rpath"
+                yield "--disable-icuio"
+                yield "--disable-layoutex"
+                platformInfo = self.buildEnv.platformInfo
+                if platformInfo.build != 'native':
+                    icu_native_builder = get_target_step(
+                        'icu4c',
+                        'native_static' if platformInfo.static else 'native_dyn')
+                    yield f"--with-cross-build={icu_native_builder.build_path}"
+                    yield "--disable-tools"
+                if platformInfo.build in ('android', 'wasm'):
+                    yield "--with-data-packaging=archive"
 
-        def set_env(self, env):
-            env['ICU_DATA_FILTER_FILE'] = pj(os.path.dirname(os.path.realpath(__file__)), "icu4c_data_filter.json")
+            def set_env(self, env):
+                env['ICU_DATA_FILTER_FILE'] = pj(os.path.dirname(os.path.realpath(__file__)), "icu4c_data_filter.json")
 
-        def _post_configure_script(self, context):
-            if self.buildEnv.platformInfo.build != "wasm":
-                context.skip()
-            context.try_skip(self.build_path)
-            for line in fileinput.input(pj(self.build_path, 'Makefile'), inplace=True):
-                if line == "#DATASUBDIR = data\n":
-                    print("DATASUBDIR = data")
-                else:
-                    print(line, end="")
+            def _post_configure_script(self, context):
+                if self.buildEnv.platformInfo.build != "wasm":
+                    context.skip()
+                context.try_skip(self.build_path)
+                for line in fileinput.input(pj(self.build_path, 'Makefile'), inplace=True):
+                    if line == "#DATASUBDIR = data\n":
+                        print("DATASUBDIR = data")
+                    else:
+                        print(line, end="")