Changed from meson icu wrap to local installation.

meson.build

@@ -12,27 +12,9 @@ gtest_dep = gtest.get_variable('gtest_dep')
 gmock_dep = gtest.get_variable('gmock_dep')
 gmock_main_dep = gtest.get_variable('gmock_main_dep')
 
-
-
 # Try to find ICU in the system first
-icu_dep = dependency('icu-uc', required: false)
-icu_i18_dep = dependency('icu-i18n', required: false)
-icu_data_dep = dependency('icu-data', required: false)
-
-# Fall back to subproject if system ICU is not found
-if not icu_dep.found() or not icu_i18_dep.found() or not icu_data_dep.found()
-  icu = subproject('icu', default_options: ['default_library=static'])
-  icu_dep = icu.get_variable('icuuc_dep')
-  icu_i18_dep = icu.get_variable('icui18n_dep')
-  icu_data_dep = icu.get_variable('icudata_dep')
-  icu_includes = [icu.get_variable('i18ninc')]
-else
-  icu_includes = []
-endif
-
-icu_includes = [
-  icu.get_variable('i18ninc')
-]
+icu_dep = dependency('icu-uc', required: true)
+icu_i18_dep = dependency('icu-i18n', required: true)
 
 subdir('src')
 subdir('tests')

src/faust-lib/parser/meson.build

@@ -3,5 +3,5 @@ faust_parser_src = files('parser.cpp', 'lexer.cpp', 'faustLexer.cpp')
 
 faust_parser_lib = static_library('faust-parser', 
                                   sources: [faust_parser_header, faust_parser_src], 
-                                  dependencies: [icu_dep, icu_i18_dep, icu_data_dep], 
-                                  include_directories: [faust_src_root_include, icu_includes])
+                                  dependencies: [icu_dep, icu_i18_dep], 
+                                  include_directories: [faust_src_root_include])

src/programs/compiler/meson.build

@@ -5,5 +5,5 @@ message(faust_parser_lib.path())
 executable('faustc', 
            faust_compiler_src,
            include_directories: faust_src_root_include,
-           dependencies: [icu_dep, icu_i18_dep, icu_data_dep], 
+           dependencies: [icu_dep, icu_i18_dep], 
            link_with: faust_parser_lib)

subprojects/icu.wrap

@@ -1,16 +0,0 @@
-[wrap-file]
-directory = icu
-source_url = https://github.com/unicode-org/icu/releases/download/release-76-1/icu4c-76_1-src.tgz
-source_filename = icu4c-76_1-src.tgz
-source_hash = dfacb46bfe4747410472ce3e1144bf28a102feeaa4e3875bac9b4c6cf30f4f3e
-patch_filename = icu_76.1-2_patch.zip
-patch_url = https://wrapdb.mesonbuild.com/v2/icu_76.1-2/get_patch
-patch_hash = aa53ee7a3f742be81b597a7066d21777fcf9ab8f8793fa91b0565848854c27d6
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/icu_76.1-2/icu4c-76_1-src.tgz
-wrapdb_version = 76.1-2
-
-[provide]
-icu-uc = icuuc_dep
-icu-io = icuio_dep
-icu-i18n = icui18n_dep
-program_names = genbrk, genccode, gencmn

tests/meson.build

@@ -1,5 +1,5 @@
 test_exe = executable('test_gtest', 'mainTest.cpp',
-                      dependencies: [gmock_main_dep, gtest_dep, gmock_dep, icu_dep, icu_i18_dep, icu_data_dep],
+                      dependencies: [gmock_main_dep, gtest_dep, gmock_dep, icu_dep, icu_i18_dep],
                       link_with: faust_parser_lib,
                       include_directories: faust_src_root_include)
 test('GTest Suite', test_exe)