diff options
Diffstat (limited to '')
39 files changed, 196 insertions, 201 deletions
diff --git a/www/deno/files/patch-Cargo.toml b/www/deno/files/patch-Cargo.toml deleted file mode 100644 index 9e38f233b83b..000000000000 --- a/www/deno/files/patch-Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -Disable using V8 custom libcxx. - ---- Cargo.toml.orig -+++ Cargo.toml -@@ -51,7 +51,7 @@ deno_ast = { version = "=0.46.2", features = ["transpi - - [workspace.dependencies] - deno_ast = { version = "=0.46.2", features = ["transpiling"] } --deno_core = { version = "0.343.0" } -+deno_core = { version = "0.343.0", default-features = false, features = ["include_icu_data"] } - - deno_cache_dir = "=0.18.0" - deno_config = { version = "=0.52.0", features = ["workspace"] } diff --git a/www/deno/files/patch-build_config_BUILD.gn b/www/deno/files/patch-build_config_BUILD.gn index d0ebaba2bf84..36ed68d119cf 100644 --- a/www/deno/files/patch-build_config_BUILD.gn +++ b/www/deno/files/patch-build_config_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/config/BUILD.gn.orig 2024-07-30 11:12:21 UTC -+++ cargo-crates/v8-135.1.0/build/config/BUILD.gn +--- cargo-crates/v8-137.2.1/build/config/BUILD.gn.orig 2024-07-30 11:12:21 UTC ++++ cargo-crates/v8-137.2.1/build/config/BUILD.gn @@ -123,7 +123,7 @@ config("debug") { # builds, and we have to tell it to turn it off. defines += [ "_HAS_ITERATOR_DEBUGGING=0" ] diff --git a/www/deno/files/patch-build_config_BUILDCONFIG.gn b/www/deno/files/patch-build_config_BUILDCONFIG.gn index f59e9ac8013a..2f3820c1c6c1 100644 --- a/www/deno/files/patch-build_config_BUILDCONFIG.gn +++ b/www/deno/files/patch-build_config_BUILDCONFIG.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/config/BUILDCONFIG.gn.orig 2024-05-21 18:07:39 UTC -+++ cargo-crates/v8-135.1.0/build/config/BUILDCONFIG.gn +--- cargo-crates/v8-137.2.1/build/config/BUILDCONFIG.gn.orig 2024-05-21 18:07:39 UTC ++++ cargo-crates/v8-137.2.1/build/config/BUILDCONFIG.gn @@ -136,7 +136,7 @@ declare_args() { is_official_build = false @@ -9,7 +9,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -234,6 +234,8 @@ if (host_toolchain == "") { +@@ -235,6 +235,8 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -18,7 +18,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -278,6 +280,8 @@ if (target_os == "android") { +@@ -279,6 +281,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -27,7 +27,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -312,11 +316,14 @@ is_ios = current_os == "ios" +@@ -313,12 +317,14 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" @@ -35,10 +35,10 @@ +is_linux = current_os == "linux" || current_os == "freebsd" is_mac = current_os == "mac" is_nacl = current_os == "nacl" + is_wasm = current_os == "emscripten" is_watchos = current_os == "watchos" is_win = current_os == "win" || current_os == "winuwp" +is_freebsd = current_os == "freebsd" -+is_openbsd = current_os == "openbsd" +is_bsd = is_freebsd is_apple = is_ios || is_mac || is_watchos diff --git a/www/deno/files/patch-build_config_clang_BUILD.gn b/www/deno/files/patch-build_config_clang_BUILD.gn index 51bfe40da094..9f27b3e6cafd 100644 --- a/www/deno/files/patch-build_config_clang_BUILD.gn +++ b/www/deno/files/patch-build_config_clang_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/config/clang/BUILD.gn.orig 2024-07-30 11:12:21 UTC -+++ cargo-crates/v8-135.1.0/build/config/clang/BUILD.gn +--- cargo-crates/v8-137.2.1/build/config/clang/BUILD.gn.orig 2024-07-30 11:12:21 UTC ++++ cargo-crates/v8-137.2.1/build/config/clang/BUILD.gn @@ -224,7 +224,7 @@ clang_lib("compiler_builtins") { libname = "ios" } diff --git a/www/deno/files/patch-build_config_compiler_BUILD.gn b/www/deno/files/patch-build_config_compiler_BUILD.gn index 446cabbe618a..5ab5b3d7bb9f 100644 --- a/www/deno/files/patch-build_config_compiler_BUILD.gn +++ b/www/deno/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- cargo-crates/v8-135.1.0/build/config/compiler/BUILD.gn.orig 2006-07-24 01:21:28 UTC -+++ cargo-crates/v8-135.1.0/build/config/compiler/BUILD.gn -@@ -198,7 +198,7 @@ declare_args() { +--- cargo-crates/v8-137.2.1/build/config/compiler/BUILD.gn.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/v8-137.2.1/build/config/compiler/BUILD.gn +@@ -197,7 +197,7 @@ declare_args() { # This greatly reduces the size of debug builds, at the cost of # debugging information which is required by some specialized # debugging tools. @@ -9,7 +9,7 @@ # Limits the debuginfo that gets generated in "minimal symbols" mode to just # line tables. This flag only has any effect when `symbol_level` is set to 1. -@@ -267,13 +267,16 @@ config("no_unresolved_symbols") { +@@ -266,13 +266,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -56,21 +56,6 @@ cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ] if (save_reproducers_on_lld_crash && use_lld) { ldflags += [ -@@ -1235,10 +1242,10 @@ config("compiler_cpu_abi") { - ] - } - } else if (current_cpu == "arm") { -- if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { -- cflags += [ "--target=arm-linux-gnueabihf" ] -- ldflags += [ "--target=arm-linux-gnueabihf" ] -- } -+# if (is_clang && !is_android && !is_nacl && !is_chromeos_device) { -+# cflags += [ "--target=arm-linux-gnueabihf" ] -+# ldflags += [ "--target=arm-linux-gnueabihf" ] -+# } - if (!is_nacl) { - cflags += [ - "-march=$arm_arch", @@ -1249,7 +1256,7 @@ config("compiler_cpu_abi") { cflags += [ "-mtune=$arm_tune" ] } @@ -98,7 +83,7 @@ # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167) asmflags = [ "-Wa,-fdebug-compilation-dir,." ] } -@@ -1643,7 +1650,7 @@ config("clang_revision") { +@@ -1643,7 +1650,7 @@ config("compiler_deterministic") { config("clang_revision") { if (is_clang && clang_base_path == default_clang_base_path && @@ -107,16 +92,7 @@ update_args = [ "--print-revision", "--verify-version=$clang_version", -@@ -1980,7 +1987,7 @@ config("default_warnings") { - "-Wno-thread-safety-reference-return", - - # TODO(crbug.com/376641662): Fix and re-enable. -- "-Wno-nontrivial-memcall", -+ # "-Wno-nontrivial-memcall", - ] - - cflags_cc += [ -@@ -2299,7 +2306,7 @@ config("thin_archive") { +@@ -2359,7 +2366,7 @@ config("export_dynamic") { # 2. Remove the thin_archive config, so that the .a file actually contains all # .o files, instead of just references to .o files in the build directoy config("thin_archive") { @@ -125,7 +101,7 @@ # The macOS and iOS linker ld64.ldd doesn't support thin archive without # symbol table, gcc on linux also throws the error `archive has no index`. # AIX does support -s option, not -S option. -@@ -2754,7 +2761,7 @@ config("afdo") { +@@ -2809,7 +2816,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -134,7 +110,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2781,7 +2788,7 @@ config("afdo") { +@@ -2836,7 +2843,7 @@ config("afdo") { cflags += [ "-Wno-backend-plugin" ] inputs = [ _clang_sample_profile ] } @@ -143,7 +119,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2885,7 +2892,7 @@ config("symbols") { +@@ -2940,7 +2947,7 @@ config("symbols") { # Keeping -g2 for saigo as it's the only toolchain whose artifacts that are # part of chromium release (other nacl toolchains are used only for tests). if ((!is_nacl || is_nacl_saigo) && current_os != "zos") { @@ -152,16 +128,16 @@ } if (!is_nacl && is_clang && !is_tsan && !is_asan) { -@@ -2920,7 +2927,7 @@ config("symbols") { +@@ -2975,7 +2982,7 @@ config("symbols") { # DWARF info may be corrupt; offsets in a range list entry are in different # sections" there. Maybe just a bug in nacl_switch_32.S. _enable_gdb_index = - symbol_level == 2 && !is_apple && !is_nacl && current_cpu != "x86" && + symbol_level == 2 && !is_apple && !is_bsd && !is_nacl && current_cpu != "x86" && - current_os != "zos" && use_lld && + current_os != "zos" && use_lld && !is_wasm && # Disable on non-fission 32-bit Android because it pushes # libcomponents_unittests over the 4gb size limit. -@@ -2958,7 +2965,7 @@ config("symbols") { +@@ -3013,7 +3020,7 @@ config("symbols") { cflags += [ "-gomit-unreferenced-methods" ] } diff --git a/www/deno/files/patch-build_config_linux_BUILD.gn b/www/deno/files/patch-build_config_linux_BUILD.gn index 2860c2622142..5536478c0c54 100644 --- a/www/deno/files/patch-build_config_linux_BUILD.gn +++ b/www/deno/files/patch-build_config_linux_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/config/linux/BUILD.gn.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-135.1.0/build/config/linux/BUILD.gn +--- cargo-crates/v8-137.2.1/build/config/linux/BUILD.gn.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-137.2.1/build/config/linux/BUILD.gn @@ -40,10 +40,6 @@ config("runtime_library") { defines = [ "OS_CHROMEOS" ] } diff --git a/www/deno/files/patch-build_config_linux_pkg-config.py b/www/deno/files/patch-build_config_linux_pkg-config.py index 519ab7b7414a..aba5f43520ea 100644 --- a/www/deno/files/patch-build_config_linux_pkg-config.py +++ b/www/deno/files/patch-build_config_linux_pkg-config.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/config/linux/pkg-config.py.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-135.1.0/build/config/linux/pkg-config.py +--- cargo-crates/v8-137.2.1/build/config/linux/pkg-config.py.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-137.2.1/build/config/linux/pkg-config.py @@ -108,7 +108,7 @@ def main(): # If this is run on non-Linux platforms, just return nothing and indicate # success. This allows us to "kind of emulate" a Linux build from other diff --git a/www/deno/files/patch-build_config_v8__target__cpu.gni b/www/deno/files/patch-build_config_v8__target__cpu.gni index dd54e32f3a7a..a206053cc168 100644 --- a/www/deno/files/patch-build_config_v8__target__cpu.gni +++ b/www/deno/files/patch-build_config_v8__target__cpu.gni @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/config/v8_target_cpu.gni.orig 2022-02-07 13:39:41 UTC -+++ cargo-crates/v8-135.1.0/build/config/v8_target_cpu.gni +--- cargo-crates/v8-137.2.1/build/config/v8_target_cpu.gni.orig 2022-02-07 13:39:41 UTC ++++ cargo-crates/v8-137.2.1/build/config/v8_target_cpu.gni @@ -36,6 +36,8 @@ declare_args() { if (v8_target_cpu == "") { if (current_toolchain == "//build/toolchain/linux:clang_x64_v8_arm64") { diff --git a/www/deno/files/patch-build_detect__host__arch.py b/www/deno/files/patch-build_detect__host__arch.py index db8850de73a3..4983e63d9234 100644 --- a/www/deno/files/patch-build_detect__host__arch.py +++ b/www/deno/files/patch-build_detect__host__arch.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/detect_host_arch.py.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-135.1.0/build/detect_host_arch.py +--- cargo-crates/v8-137.2.1/build/detect_host_arch.py.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-137.2.1/build/detect_host_arch.py @@ -24,6 +24,8 @@ def HostArch(): host_arch = 'arm' elif host_arch.startswith('aarch64'): diff --git a/www/deno/files/patch-build_gn__run__binary.py b/www/deno/files/patch-build_gn__run__binary.py index 84cb24d79f47..597067e4b838 100644 --- a/www/deno/files/patch-build_gn__run__binary.py +++ b/www/deno/files/patch-build_gn__run__binary.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/gn_run_binary.py.orig 2020-06-26 16:27:54 UTC -+++ cargo-crates/v8-135.1.0/build/gn_run_binary.py +--- cargo-crates/v8-137.2.1/build/gn_run_binary.py.orig 2020-06-26 16:27:54 UTC ++++ cargo-crates/v8-137.2.1/build/gn_run_binary.py @@ -23,7 +23,7 @@ if not os.path.isabs(path): # The rest of the arguments are passed directly to the executable. args = [path] + sys.argv[2:] diff --git a/www/deno/files/patch-build_linux_chrome.map b/www/deno/files/patch-build_linux_chrome.map index 7e1985ae6779..87fcbef9b188 100644 --- a/www/deno/files/patch-build_linux_chrome.map +++ b/www/deno/files/patch-build_linux_chrome.map @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/linux/chrome.map.orig 2021-02-25 20:45:34 UTC -+++ cargo-crates/v8-135.1.0/build/linux/chrome.map +--- cargo-crates/v8-137.2.1/build/linux/chrome.map.orig 2021-02-25 20:45:34 UTC ++++ cargo-crates/v8-137.2.1/build/linux/chrome.map @@ -20,6 +20,10 @@ global: # Program entry point. _start; diff --git a/www/deno/files/patch-build_linux_unbundle_libusb.gn b/www/deno/files/patch-build_linux_unbundle_libusb.gn index cd1a30d1d8cb..e75515c657df 100644 --- a/www/deno/files/patch-build_linux_unbundle_libusb.gn +++ b/www/deno/files/patch-build_linux_unbundle_libusb.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/linux/unbundle/libusb.gn.orig 2020-07-22 09:52:14 UTC -+++ cargo-crates/v8-135.1.0/build/linux/unbundle/libusb.gn +--- cargo-crates/v8-137.2.1/build/linux/unbundle/libusb.gn.orig 2020-07-22 09:52:14 UTC ++++ cargo-crates/v8-137.2.1/build/linux/unbundle/libusb.gn @@ -1,3 +1,27 @@ +# Copyright 2016 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be diff --git a/www/deno/files/patch-build_toolchain_freebsd_BUILD.gn b/www/deno/files/patch-build_toolchain_freebsd_BUILD.gn index a7d0a8f3daed..894f27a04483 100644 --- a/www/deno/files/patch-build_toolchain_freebsd_BUILD.gn +++ b/www/deno/files/patch-build_toolchain_freebsd_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/toolchain/freebsd/BUILD.gn.orig 2022-02-07 13:39:41 UTC -+++ cargo-crates/v8-135.1.0/build/toolchain/freebsd/BUILD.gn +--- cargo-crates/v8-137.2.1/build/toolchain/freebsd/BUILD.gn.orig 2022-02-07 13:39:41 UTC ++++ cargo-crates/v8-137.2.1/build/toolchain/freebsd/BUILD.gn @@ -0,0 +1,66 @@ +# Copyright 2013 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be diff --git a/www/deno/files/patch-build_toolchain_gcc__solink__wrapper.py b/www/deno/files/patch-build_toolchain_gcc__solink__wrapper.py index 66683e5991aa..4efbbff3fb7a 100644 --- a/www/deno/files/patch-build_toolchain_gcc__solink__wrapper.py +++ b/www/deno/files/patch-build_toolchain_gcc__solink__wrapper.py @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/toolchain/gcc_solink_wrapper.py.orig 2022-02-07 13:39:41 UTC -+++ cargo-crates/v8-135.1.0/build/toolchain/gcc_solink_wrapper.py +--- cargo-crates/v8-137.2.1/build/toolchain/gcc_solink_wrapper.py.orig 2022-02-07 13:39:41 UTC ++++ cargo-crates/v8-137.2.1/build/toolchain/gcc_solink_wrapper.py @@ -39,7 +39,7 @@ def CollectDynSym(args): """Replaces: nm --format=posix -g -D -p $sofile | cut -f1-2 -d' '""" toc = '' diff --git a/www/deno/files/patch-build_toolchain_gcc__toolchain.gni b/www/deno/files/patch-build_toolchain_gcc__toolchain.gni index 4070f15393b6..dfbb61cf84b7 100644 --- a/www/deno/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/deno/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/toolchain/gcc_toolchain.gni.orig 1970-01-01 01:00:00 UTC -+++ cargo-crates/v8-135.1.0/build/toolchain/gcc_toolchain.gni +--- cargo-crates/v8-137.2.1/build/toolchain/gcc_toolchain.gni.orig 1970-01-01 01:00:00 UTC ++++ cargo-crates/v8-137.2.1/build/toolchain/gcc_toolchain.gni @@ -56,6 +56,12 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") } diff --git a/www/deno/files/patch-build_toolchain_rbe.gni b/www/deno/files/patch-build_toolchain_rbe.gni deleted file mode 100644 index 47c9a2991470..000000000000 --- a/www/deno/files/patch-build_toolchain_rbe.gni +++ /dev/null @@ -1,19 +0,0 @@ ---- cargo-crates/v8-135.1.0/build/toolchain/rbe.gni.orig 2025-03-21 11:19:10 UTC -+++ cargo-crates/v8-135.1.0/build/toolchain/rbe.gni -@@ -28,16 +28,6 @@ use_reclient_default = false - } - - use_reclient_default = false --if (path_exists(rebase_path(".reproxy_tmp", ".", root_build_dir))) { -- # Use reclient if build dir used reclient before (.reproxy_tmp exists). -- use_reclient_default = true --} else if (use_remoteexec) { -- if (use_siso) { -- use_reclient_default = use_reclient_on_siso -- } else { -- use_reclient_default = use_reclient_on_ninja -- } --} - - declare_args() { - # Set to true to use re-client. diff --git a/www/deno/files/patch-build_toolchain_toolchain.gni b/www/deno/files/patch-build_toolchain_toolchain.gni index 113de9a66121..8815d9f19480 100644 --- a/www/deno/files/patch-build_toolchain_toolchain.gni +++ b/www/deno/files/patch-build_toolchain_toolchain.gni @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/toolchain/toolchain.gni.orig 2024-03-22 08:19:40 UTC -+++ cargo-crates/v8-135.1.0/build/toolchain/toolchain.gni +--- cargo-crates/v8-137.2.1/build/toolchain/toolchain.gni.orig 2024-03-22 08:19:40 UTC ++++ cargo-crates/v8-137.2.1/build/toolchain/toolchain.gni @@ -72,7 +72,7 @@ if (host_os == "mac") { host_shlib_extension = ".dylib" } else if (host_os == "win") { diff --git a/www/deno/files/patch-cargo-crates_build.rs b/www/deno/files/patch-cargo-crates_build.rs index 9f0293549a5c..135b3d3b2364 100644 --- a/www/deno/files/patch-cargo-crates_build.rs +++ b/www/deno/files/patch-cargo-crates_build.rs @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build.rs.orig 2006-07-24 03:21:28 UTC -+++ cargo-crates/v8-135.1.0/build.rs +--- cargo-crates/v8-137.2.1/build.rs.orig 2006-07-24 03:21:28 UTC ++++ cargo-crates/v8-137.2.1/build.rs @@ -254,16 +254,10 @@ fn build_v8(is_asan: bool) { // cross-compilation setup if target_arch == "aarch64" { diff --git a/www/deno/files/patch-cli_Cargo.toml b/www/deno/files/patch-cli_Cargo.toml index 1945e545118c..9267f3b98373 100644 --- a/www/deno/files/patch-cli_Cargo.toml +++ b/www/deno/files/patch-cli_Cargo.toml @@ -3,7 +3,7 @@ deno's upgrade feature cannot work on FreeBSD, directly disable it Index: cli/Cargo.toml --- cli/Cargo.toml.orig +++ cli/Cargo.toml -@@ -32,7 +32,7 @@ harness = false +@@ -32,7 +32,7 @@ path = "./bench/lsp_bench_standalone.rs" path = "./bench/lsp_bench_standalone.rs" [features] @@ -12,3 +12,12 @@ Index: cli/Cargo.toml # A feature that enables heap profiling with dhat on Linux. # 1. Compile with `cargo build --profile=release-with-debug --features=dhat-heap` # 2. Run the executable. It will output a dhat-heap.json file. +@@ -133,7 +133,7 @@ jupyter_runtime = { package = "runtimelib", version = + jsonc-parser = { workspace = true, features = ["cst", "serde"] } + jupyter-protocol = "0.8.0" + jupyter_runtime = { package = "runtimelib", version = "=0.28.0", default-features = false, features = ["tokio-runtime", "aws-lc-rs"] } +-keyring = { version = "3.6.3", features = ["apple-native", "sync-secret-service", "windows-native", "vendored"] } ++keyring = { version = "3.6.3", features = ["apple-native", "sync-secret-service", "windows-native"] } + lazy-regex.workspace = true + libc.workspace = true + libz-sys.workspace = true diff --git a/www/deno/files/patch-cli_lib_version.rs b/www/deno/files/patch-cli_lib_version.rs index 1dafeec45bc6..f46706939172 100644 --- a/www/deno/files/patch-cli_lib_version.rs +++ b/www/deno/files/patch-cli_lib_version.rs @@ -9,16 +9,16 @@ Index: cli/lib/version.rs pub static DENO_VERSION_INFO: std::sync::LazyLock<DenoVersionInfo> = std::sync::LazyLock::new(|| { -+ #[cfg(not(target_os="openbsd"))] ++ #[cfg(not(target_os="freebsd"))] let release_channel = libsui::find_section("denover") - .and_then(|buf| std::str::from_utf8(buf).ok()) - .and_then(|str_| ReleaseChannel::deserialize(str_).ok()) -@@ -35,6 +36,9 @@ pub static DENO_VERSION_INFO: std::sync::LazyLock<Deno + .ok() + .flatten() +@@ -37,6 +38,9 @@ pub static DENO_VERSION_INFO: std::sync::LazyLock<Deno ReleaseChannel::Stable } }); + -+ #[cfg(target_os="openbsd")] ++ #[cfg(target_os="freebsd")] + let release_channel = ReleaseChannel::Stable; DenoVersionInfo { diff --git a/www/deno/files/patch-cli_task_runner.rs b/www/deno/files/patch-cli_task_runner.rs index 76acf2d2c1c5..80552ae82f98 100644 --- a/www/deno/files/patch-cli_task_runner.rs +++ b/www/deno/files/patch-cli_task_runner.rs @@ -1,17 +1,27 @@ Index: cli/task_runner.rs --- cli/task_runner.rs.orig +++ cli/task_runner.rs -@@ -243,7 +243,8 @@ impl ShellCommand for NpmCommand { +@@ -248,7 +248,8 @@ impl ShellCommand for NpmCommand { ); return ExecutableCommand::new( "deno".to_string(), - std::env::current_exe().unwrap(), + std::env::current_exe() -+ .unwrap_or_else(|_| PathBuf::from("LOCALBASE/bin/deno")), ++ .unwrap_or_else(|_| PathBuf::from("PREFIX/bin/deno")), ) .execute(ShellCommandContext { args, -@@ -307,12 +308,16 @@ impl ShellCommand for NodeCommand { +@@ -277,7 +278,8 @@ impl Default for DenoCommand { + fn default() -> Self { + Self(ExecutableCommand::new( + "deno".to_string(), +- std::env::current_exe().unwrap(), ++ std::env::current_exe() ++ .unwrap_or_else(|_| PathBuf::from("PREFIX/bin/deno")), + )) + } + } +@@ -326,12 +328,16 @@ impl ShellCommand for NodeCommand { OsStr::new(USE_PKG_JSON_HIDDEN_ENV_VAR_NAME), OsStr::new("1"), ); @@ -24,7 +34,7 @@ Index: cli/task_runner.rs + ExecutableCommand::new( + "deno".to_string(), + std::env::current_exe() -+ .unwrap_or_else(|_| PathBuf::from("LOCALBASE/bin/deno")), ++ .unwrap_or_else(|_| PathBuf::from("PREFIX/bin/deno")), + ) + .execute(ShellCommandContext { + args, @@ -34,23 +44,23 @@ Index: cli/task_runner.rs } } -@@ -400,7 +405,8 @@ impl ShellCommand for NpmPackageBinCommand { +@@ -425,7 +431,8 @@ impl ShellCommand for NpmPackageBinCommand { args.extend(context.args); let executable_command = deno_task_shell::ExecutableCommand::new( "deno".to_string(), - std::env::current_exe().unwrap(), + std::env::current_exe() -+ .unwrap_or_else(|_| PathBuf::from("LOCALBASE/bin/deno")), ++ .unwrap_or_else(|_| PathBuf::from("PREFIX/bin/deno")), ); executable_command.execute(ShellCommandContext { args, ..context }) } -@@ -427,7 +433,8 @@ impl ShellCommand for NodeModulesFileRunCommand { +@@ -452,7 +459,8 @@ impl ShellCommand for NodeModulesFileRunCommand { args.extend(context.args); let executable_command = deno_task_shell::ExecutableCommand::new( "deno".to_string(), - std::env::current_exe().unwrap(), + std::env::current_exe() -+ .unwrap_or_else(|_| PathBuf::from("LOCALBASE/bin/deno")), ++ .unwrap_or_else(|_| PathBuf::from("PREFIX/bin/deno")), ); // set this environment variable so that the launched process knows the npm command name context.state.apply_env_var( diff --git a/www/deno/files/patch-cli_tools_bundle_esbuild.rs b/www/deno/files/patch-cli_tools_bundle_esbuild.rs new file mode 100644 index 000000000000..7e975caacf5d --- /dev/null +++ b/www/deno/files/patch-cli_tools_bundle_esbuild.rs @@ -0,0 +1,18 @@ +Index: cli/tools/bundle/esbuild.rs +--- cli/tools/bundle/esbuild.rs.orig ++++ cli/tools/bundle/esbuild.rs +@@ -22,10 +22,14 @@ pub const ESBUILD_VERSION: &str = "0.25.5"; + + fn esbuild_platform() -> &'static str { + match (std::env::consts::ARCH, std::env::consts::OS) { ++ ("x86_64", "freebsd") => "freebsd-x64", ++ ("aarch64", "freebsd") => "freebsd-arm64", + ("x86_64", "linux") => "linux-x64", + ("aarch64", "linux") => "linux-arm64", + ("x86_64", "macos" | "apple") => "darwin-x64", + ("aarch64", "macos" | "apple") => "darwin-arm64", ++ ("x86_64", "openbsd") => "openbsd-x64", ++ ("aarch64", "openbsd") => "openbsd-arm64", + ("x86_64", "windows") => "win32-x64", + ("aarch64", "windows") => "win32-arm64", + _ => panic!( diff --git a/www/deno/files/patch-cli_tools_jupyter_install.rs b/www/deno/files/patch-cli_tools_jupyter_install.rs index ab54a03e9f00..bbc6e132aa95 100644 --- a/www/deno/files/patch-cli_tools_jupyter_install.rs +++ b/www/deno/files/patch-cli_tools_jupyter_install.rs @@ -1,12 +1,27 @@ Index: cli/tools/jupyter/install.rs --- cli/tools/jupyter/install.rs.orig +++ cli/tools/jupyter/install.rs -@@ -51,7 +51,7 @@ pub fn install() -> Result<(), AnyError> { +@@ -1,6 +1,5 @@ + // Copyright 2018-2025 the Deno authors. MIT license. + +-use std::env::current_exe; + use std::io::Write; + use std::path::Path; + use std::path::PathBuf; +@@ -89,15 +88,11 @@ pub fn install( + } + + let display_name = maybe_display_name.unwrap_or("Deno"); +- let current_exe_path = current_exe() +- .context("Failed to get current executable path")? +- .to_string_lossy() +- .into_owned(); + + // TODO(bartlomieju): add remaining fields as per // https://jupyter-client.readthedocs.io/en/stable/kernels.html#kernel-specs - // FIXME(bartlomieju): replace `current_exe` before landing? let json_data = json!({ -- "argv": [current_exe().unwrap().to_string_lossy(), "jupyter", "--kernel", "--conn", "{connection_file}"], -+ "argv": ["LOCALBASE/bin/deno", "jupyter", "--kernel", "--conn", "{connection_file}"], - "display_name": "Deno", +- "argv": [current_exe_path, "jupyter", "--kernel", "--conn", "{connection_file}"], ++ "argv": ["PREFIX/bin/deno", "jupyter", "--kernel", "--conn", "{connection_file}"], + "display_name": display_name, "language": "typescript", }); diff --git a/www/deno/files/patch-deno_core_Cargo.toml b/www/deno/files/patch-deno_core_Cargo.toml deleted file mode 100644 index 15a8891b4f9b..000000000000 --- a/www/deno/files/patch-deno_core_Cargo.toml +++ /dev/null @@ -1,12 +0,0 @@ ---- cargo-crates/deno_core-0.343.0/Cargo.toml.orig -+++ cargo-crates/deno_core-0.343.0/Cargo.toml -@@ -28,8 +28,7 @@ resolver = "2" - - [features] - default = [ -- "include_icu_data", -- "v8_use_custom_libcxx", -+ "include_icu_data" - ] - include_icu_data = ["deno_core_icudata"] - include_js_files_for_snapshotting = [] diff --git a/www/deno/files/patch-ext_ffi_Cargo.toml b/www/deno/files/patch-ext_ffi_Cargo.toml new file mode 100644 index 000000000000..1ddb700a76b4 --- /dev/null +++ b/www/deno/files/patch-ext_ffi_Cargo.toml @@ -0,0 +1,13 @@ +Use devel/libffi from ports +Index: ext/ffi/Cargo.toml +--- ext/ffi/Cargo.toml.orig ++++ ext/ffi/Cargo.toml +@@ -22,7 +22,7 @@ deno_permissions.workspace = true + denort_helper.workspace = true + dlopen2.workspace = true + libffi.workspace = true +-libffi-sys.workspace = true ++libffi-sys = { workspace = true, features = ["system"] } + log.workspace = true + memmap2.workspace = true + num-bigint.workspace = true diff --git a/www/deno/files/patch-ext_node_ops_constant.rs b/www/deno/files/patch-ext_node_ops_constant.rs new file mode 100644 index 000000000000..2c351f556029 --- /dev/null +++ b/www/deno/files/patch-ext_node_ops_constant.rs @@ -0,0 +1,17 @@ +Index: ext/node/ops/constant.rs +--- ext/node/ops/constant.rs.orig ++++ ext/node/ops/constant.rs +@@ -226,6 +226,13 @@ fn common_unix_fs_constants() -> FsConstants { + } + } + ++#[cfg(target_os = "freebsd")] ++#[op2] ++#[serde] ++pub fn op_node_fs_constants() -> FsConstants { ++ common_unix_fs_constants() ++} ++ + #[cfg(target_os = "macos")] + #[op2] + #[serde] diff --git a/www/deno/files/patch-ext_os_lib.rs b/www/deno/files/patch-ext_os_lib.rs index 1bc4ef05b877..31692b2cd82d 100644 --- a/www/deno/files/patch-ext_os_lib.rs +++ b/www/deno/files/patch-ext_os_lib.rs @@ -1,27 +1,29 @@ --- ext/os/lib.rs.orig 2023-01-13 13:12:37 UTC +++ ext/os/lib.rs -@@ -3,6 +3,7 @@ +@@ -4,6 +4,7 @@ use std::env; use std::collections::HashMap; use std::collections::HashSet; use std::env; +use std::path::PathBuf; + use std::sync::Arc; use std::sync::atomic::AtomicI32; use std::sync::atomic::Ordering; - use std::sync::Arc; -@@ -155,7 +156,8 @@ pub enum OsError { - #[op2(stack_trace)] +@@ -112,7 +113,8 @@ fn op_exec_path() -> Result<String, OsError> { + #[op2] #[string] - fn op_exec_path(state: &mut OpState) -> Result<String, OsError> { + fn op_exec_path() -> Result<String, OsError> { - let current_exe = env::current_exe().unwrap(); -+ let current_exe -+ = env::current_exe().unwrap_or_else(|_| PathBuf::from("LOCALBASE/bin/deno")); - state - .borrow_mut::<PermissionsContainer>() - .check_read_blind(¤t_exe, "exec_path", "Deno.execPath()")?; -@@ -668,6 +668,46 @@ fn rss() -> usize { - } - } ++ let current_exe = ++ env::current_exe().unwrap_or_else(|_| PathBuf::from("PREFIX/bin/deno")); + // normalize path so it doesn't include '.' or '..' components + let path = normalize_path(Cow::Owned(current_exe)); +@@ -660,6 +662,46 @@ fn rss() -> u64 { + } else { + 0 + } ++} ++ +#[cfg(target_os = "freebsd")] +fn rss() -> usize { + // Uses FreeBSD's KERN_PROC_PID sysctl(2) @@ -60,8 +62,6 @@ + } else { + 0 + } -+} -+ + } + #[cfg(windows)] - fn rss() -> usize { - use winapi::shared::minwindef::DWORD; diff --git a/www/deno/files/patch-ext_os_signal.rs b/www/deno/files/patch-ext_os_signal.rs deleted file mode 100644 index 042f23bac51f..000000000000 --- a/www/deno/files/patch-ext_os_signal.rs +++ /dev/null @@ -1,21 +0,0 @@ ---- ext/os/signal.rs.orig 2024-12-13 09:29:06 UTC -+++ ext/os/signal.rs -@@ -8,8 +8,8 @@ pub struct InvalidSignalStrError(pub String); - #[cfg(any( - target_os = "android", - target_os = "linux", -+ target_os = "freebsd", - target_os = "openbsd", -- target_os = "openbsd", - target_os = "macos", - target_os = "solaris", - target_os = "illumos" -@@ -26,7 +26,7 @@ pub struct InvalidSignalIntError(pub libc::c_int); - #[cfg(any( - target_os = "android", - target_os = "linux", -- target_os = "openbsd", -+ target_os = "freebsd", - target_os = "openbsd", - target_os = "macos", - target_os = "solaris", diff --git a/www/deno/files/patch-v8_BUILD.gn b/www/deno/files/patch-v8_BUILD.gn index 90920324dc83..c101714ce750 100644 --- a/www/deno/files/patch-v8_BUILD.gn +++ b/www/deno/files/patch-v8_BUILD.gn @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/v8/BUILD.gn.orig 2021-01-19 00:12:40 UTC -+++ cargo-crates/v8-135.1.0/v8/BUILD.gn +--- cargo-crates/v8-137.2.1/v8/BUILD.gn.orig 2021-01-19 00:12:40 UTC ++++ cargo-crates/v8-137.2.1/v8/BUILD.gn @@ -974,6 +974,8 @@ external_v8_defines = [ "V8_TARGET_OS_MACOS", "V8_TARGET_OS_WIN", diff --git a/www/deno/files/patch-v8_build_config_sysroot.gni b/www/deno/files/patch-v8_build_config_sysroot.gni index f5c070d93cc3..9698ad7446ac 100644 --- a/www/deno/files/patch-v8_build_config_sysroot.gni +++ b/www/deno/files/patch-v8_build_config_sysroot.gni @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/build/config/sysroot.gni.orig -+++ cargo-crates/v8-135.1.0/build/config/sysroot.gni +--- cargo-crates/v8-137.2.1/build/config/sysroot.gni.orig ++++ cargo-crates/v8-137.2.1/build/config/sysroot.gni @@ -20,9 +20,11 @@ declare_args() { # Controls default is_linux sysroot. If set to true, and sysroot # is empty, default sysroot is calculated. diff --git a/www/deno/files/patch-v8_include_v8config.h b/www/deno/files/patch-v8_include_v8config.h index 4aee3199c328..187063ecfe6b 100644 --- a/www/deno/files/patch-v8_include_v8config.h +++ b/www/deno/files/patch-v8_include_v8config.h @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/v8/include/v8config.h.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-135.1.0/v8/include/v8config.h +--- cargo-crates/v8-137.2.1/v8/include/v8config.h.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-137.2.1/v8/include/v8config.h @@ -202,6 +202,7 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_IOS) \ && !defined(V8_TARGET_OS_LINUX) \ diff --git a/www/deno/files/patch-v8_src_api_api.cc b/www/deno/files/patch-v8_src_api_api.cc index c99edb77ed04..d4b129d44488 100644 --- a/www/deno/files/patch-v8_src_api_api.cc +++ b/www/deno/files/patch-v8_src_api_api.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/v8/src/api/api.cc.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-135.1.0/v8/src/api/api.cc +--- cargo-crates/v8-137.2.1/v8/src/api/api.cc.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-137.2.1/v8/src/api/api.cc @@ -153,7 +153,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY diff --git a/www/deno/files/patch-v8_src_base_cpu.cc b/www/deno/files/patch-v8_src_base_cpu.cc index 360d0f7a9930..bb103b35a716 100644 --- a/www/deno/files/patch-v8_src_base_cpu.cc +++ b/www/deno/files/patch-v8_src_base_cpu.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/v8/src/base/cpu.cc.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-135.1.0/v8/src/base/cpu.cc +--- cargo-crates/v8-137.2.1/v8/src/base/cpu.cc.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-137.2.1/v8/src/base/cpu.cc @@ -475,6 +475,7 @@ CPU::CPU() #if V8_OS_LINUX diff --git a/www/deno/files/patch-v8_src_base_platform_platform-freebsd.cc b/www/deno/files/patch-v8_src_base_platform_platform-freebsd.cc index d3cc6f81b281..28322452e089 100644 --- a/www/deno/files/patch-v8_src_base_platform_platform-freebsd.cc +++ b/www/deno/files/patch-v8_src_base_platform_platform-freebsd.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/v8/src/base/platform/platform-freebsd.cc.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-135.1.0/v8/src/base/platform/platform-freebsd.cc +--- cargo-crates/v8-137.2.1/v8/src/base/platform/platform-freebsd.cc.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-137.2.1/v8/src/base/platform/platform-freebsd.cc @@ -43,14 +43,10 @@ TimezoneCache* OS::CreateTimezoneCache() { return new PosixDefaultTimezoneCache(); } diff --git a/www/deno/files/patch-v8_src_base_platform_platform-posix.cc b/www/deno/files/patch-v8_src_base_platform_platform-posix.cc index c99e47303883..4d69dc37b8b7 100644 --- a/www/deno/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/deno/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/v8/src/base/platform/platform-posix.cc.orig 2020-06-26 16:28:04 UTC -+++ cargo-crates/v8-135.1.0/v8/src/base/platform/platform-posix.cc +--- cargo-crates/v8-137.2.1/v8/src/base/platform/platform-posix.cc.orig 2020-06-26 16:28:04 UTC ++++ cargo-crates/v8-137.2.1/v8/src/base/platform/platform-posix.cc @@ -57,7 +57,7 @@ #include <malloc/malloc.h> #elif V8_OS_OPENBSD diff --git a/www/deno/files/patch-v8_src_diagnostics_perf-jit.cc b/www/deno/files/patch-v8_src_diagnostics_perf-jit.cc index 6ba37bcb61f4..74bae7f11341 100644 --- a/www/deno/files/patch-v8_src_diagnostics_perf-jit.cc +++ b/www/deno/files/patch-v8_src_diagnostics_perf-jit.cc @@ -1,11 +1,12 @@ ---- cargo-crates/v8-135.1.0/v8/src/diagnostics/perf-jit.cc.orig -+++ cargo-crates/v8-135.1.0/v8/src/diagnostics/perf-jit.cc -@@ -31,7 +31,7 @@ +--- cargo-crates/v8-137.2.1/v8/src/diagnostics/perf-jit.cc.orig ++++ cargo-crates/v8-137.2.1/v8/src/diagnostics/perf-jit.cc +@@ -30,8 +30,7 @@ + #include "src/common/assert-scope.h" #include "src/flags/flags.h" - // Only compile the {LinuxPerfJitLogger} on Linux. --#if V8_OS_LINUX -+#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) +-// Only compile the {PerfJitLogger} on Linux & Darwin. +-#if V8_OS_LINUX || V8_OS_DARWIN ++#if 1 #include <fcntl.h> #include <sys/mman.h> diff --git a/www/deno/files/patch-v8_src_diagnostics_perf-jit.h b/www/deno/files/patch-v8_src_diagnostics_perf-jit.h index 57409bede7bc..b64bf37c68af 100644 --- a/www/deno/files/patch-v8_src_diagnostics_perf-jit.h +++ b/www/deno/files/patch-v8_src_diagnostics_perf-jit.h @@ -1,11 +1,12 @@ ---- cargo-crates/v8-135.1.0/v8/src/diagnostics/perf-jit.h.orig -+++ cargo-crates/v8-135.1.0/v8/src/diagnostics/perf-jit.h -@@ -31,7 +31,7 @@ +--- cargo-crates/v8-137.2.1/v8/src/diagnostics/perf-jit.h.orig ++++ cargo-crates/v8-137.2.1/v8/src/diagnostics/perf-jit.h +@@ -30,8 +30,7 @@ + #include "include/v8config.h" - // {LinuxPerfJitLogger} is only implemented on Linux. --#if V8_OS_LINUX -+#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) +-// {PerfJitLogger} is only implemented on Linux & Darwin. +-#if V8_OS_LINUX || V8_OS_DARWIN ++#if 1 #include "src/logging/log.h" diff --git a/www/deno/files/patch-v8_third__party_abseil-cpp_absl_base_config.h b/www/deno/files/patch-v8_third__party_abseil-cpp_absl_base_config.h index c94a979b274c..0f202e820e13 100644 --- a/www/deno/files/patch-v8_third__party_abseil-cpp_absl_base_config.h +++ b/www/deno/files/patch-v8_third__party_abseil-cpp_absl_base_config.h @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/third_party/abseil-cpp/absl/base/config.h.orig -+++ cargo-crates/v8-135.1.0/third_party/abseil-cpp/absl/base/config.h +--- cargo-crates/v8-137.2.1/third_party/abseil-cpp/absl/base/config.h.orig ++++ cargo-crates/v8-137.2.1/third_party/abseil-cpp/absl/base/config.h @@ -411,7 +411,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set diff --git a/www/deno/files/patch-v8_third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/deno/files/patch-v8_third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 4c220096da71..6ec42975f7a4 100644 --- a/www/deno/files/patch-v8_third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/deno/files/patch-v8_third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,5 +1,5 @@ ---- cargo-crates/v8-135.1.0/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig -+++ cargo-crates/v8-135.1.0/third_party/abseil-cpp/absl/base/internal/sysinfo.cc +--- cargo-crates/v8-137.2.1/third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig ++++ cargo-crates/v8-137.2.1/third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,7 +30,7 @@ #include <sys/syscall.h> #endif |