From 9acf2182cd440d4080bb0eb2a2fbc7238d71e953 Mon Sep 17 00:00:00 2001 From: Magnus Larsen Date: Thu, 2 May 2024 16:21:07 +0000 Subject: servoshell: Upgrade `egui` and many other dependencies (#31278) * servoshell: Upgrade `egui` and many other dependencies This upgrades: - `core-graphics` - `core-text` - `egui` and friends - `font-kit` - `glow` and friends - `harfbuzz-sys` - `jni` - `nix` - `raqote` - `raw-window-handle` - `winit` * Downgrade jni until we can properly upgrade * Update some test results It's unclear why these are now passing, but they are. --------- Co-authored-by: Martin Robinson --- python/servo/command_base.py | 6 ------ 1 file changed, 6 deletions(-) (limited to 'python/servo/command_base.py') diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 74de8850164..2ad49d1097d 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -486,11 +486,6 @@ class CommandBase(object): if platform.is_macos: util.prepend_paths_to_env(env, "DYLD_LIBRARY_PATH", os.path.join(gstreamer_root, "lib")) - effective_target = self.cross_compile_target or servo.platform.host_triple() - if "msvc" in effective_target: - # Always build harfbuzz from source - env["HARFBUZZ_SYS_NO_PKG_CONFIG"] = "true" - if sys.platform != "win32": env.setdefault("CC", "clang") env.setdefault("CXX", "clang++") @@ -615,7 +610,6 @@ class CommandBase(object): env['OBJCOPY'] = to_ndk_bin("llvm-objcopy") env['YASM'] = to_ndk_bin("yasm") env['STRIP'] = to_ndk_bin("llvm-strip") - env['HARFBUZZ_SYS_NO_PKG_CONFIG'] = "true" env['RUST_FONTCONFIG_DLOPEN'] = "on" env["LIBCLANG_PATH"] = path.join(llvm_toolchain, "lib64") -- cgit v1.2.3