diff options
| author | Magnus Larsen <golgothasTerror101@gmail.com> | 2024-05-02 16:21:07 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-02 16:21:07 +0000 |
| commit | 9acf2182cd440d4080bb0eb2a2fbc7238d71e953 (patch) | |
| tree | af88b6ac8fb66d07f3598394d49e57da342c6f63 /python/servo/command_base.py | |
| parent | 556bfb7dff48f64e9e02872dba29fbdabc8c6ad0 (diff) | |
| download | servo-9acf2182cd440d4080bb0eb2a2fbc7238d71e953.tar.gz servo-9acf2182cd440d4080bb0eb2a2fbc7238d71e953.zip | |
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 <mrobinson@igalia.com>
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 6 |
1 files changed, 0 insertions, 6 deletions
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") |