diff --git a/conan/conan-skia/recipes/skia/all/conanfile.py b/conan/conan-skia/recipes/skia/all/conanfile.py index 197d62f..ec8d0dd 100644 --- a/conan/conan-skia/recipes/skia/all/conanfile.py +++ b/conan/conan-skia/recipes/skia/all/conanfile.py @@ -425,7 +425,7 @@ class ConanSkia(ConanFile): self.requires("expat/[>=2.5.0]") if self.options.use_icu and self.options.use_system_icu and self.options.use_conan_icu: - self.requires("icu/[>=77.1]") + self.requires("icu/77.1") if (self.options.use_libpng_decode or self.options.use_libpng_encode) and self.options.use_system_libpng and self.options.use_conan_libpng: self.requires("libpng/[>=1.6.32]") @@ -537,7 +537,7 @@ class ConanSkia(ConanFile): if self.options.use_icu and self.options.use_system_icu and self.options.use_conan_icu: replace_in_file(self, join(self.source_folder, "third_party", "icu", "BUILD.gn"), # icu-data must come after other components, otherwise it leaves an undefined symbol in shared library. - "libs = [ \"icuuc\" ]", f"libs = {json.dumps(self._link_libs('icu', components=['icu-uc','icu-data']))}", + "libs = [ \"icuuc\" ]", f"libs = {json.dumps(self._link_libs('icu', components=['icu-uc']))}", # 'icu-data' removed strict=False) if (self.options.use_libjpeg_turbo_encode or self.options.use_libjpeg_turbo_decode) and self.options.use_system_libjpeg_turbo and self.options.use_conan_libjpeg_turbo: diff --git a/data/icudt77l-small.dat b/data/icudt77l-small.dat new file mode 100755 index 0000000..3c53ac2 Binary files /dev/null and b/data/icudt77l-small.dat differ diff --git a/data/icudt77l.dat b/data/icudt77l.dat deleted file mode 100755 index dc8b8ea..0000000 Binary files a/data/icudt77l.dat and /dev/null differ diff --git a/src/main.cpp b/src/main.cpp index 8ad78a4..56a8b94 100755 --- a/src/main.cpp +++ b/src/main.cpp @@ -389,11 +389,11 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char **argv) { switch_cwd(); UErrorCode uerr = U_ZERO_ERROR; - icudt = read_file_to_string("data/icudt77l.dat"); + icudt = read_file_to_string("data/icudt77l-small.dat"); udata_setCommonData((void *) icudt.data(), &uerr); if (U_FAILURE(uerr)) { char* errorName = const_cast(u_errorName(uerr)); - std::cout << "Failed to load icudt77l.dat" << std::endl; + std::cout << "Failed to load icudt77l-small.dat" << std::endl; std::cout << errorName << std::endl; }