diff options
Diffstat (limited to 'www/ungoogled-chromium')
-rw-r--r-- | www/ungoogled-chromium/Makefile | 2 | ||||
-rw-r--r-- | www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs | 17 | ||||
-rw-r--r-- | www/ungoogled-chromium/files/patch-net_dns_BUILD.gn | 18 |
3 files changed, 32 insertions, 5 deletions
diff --git a/www/ungoogled-chromium/Makefile b/www/ungoogled-chromium/Makefile index 17385625a63f..c0d58a5566d7 100644 --- a/www/ungoogled-chromium/Makefile +++ b/www/ungoogled-chromium/Makefile @@ -1,6 +1,6 @@ PORTNAME= ungoogled-chromium PORTVERSION= 137.0.7151.103 -PORTREVISION= 4 +PORTREVISION= 5 PULSEMV= 16 PULSEV= ${PULSEMV}.1 UGVERSION= ${DISTVERSION}-1 diff --git a/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs b/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs new file mode 100644 index 000000000000..508b657a5761 --- /dev/null +++ b/www/ungoogled-chromium/files/patch-build_rust_allocator_lib.rs @@ -0,0 +1,17 @@ +https://chromium.googlesource.com/chromium/src/+/8393b61ba876c8e1614275c97767f9b06b889f48 +https://chromium.googlesource.com/chromium/src/+/6aae0e2353c857d98980ff677bf304288d7c58de + +--- build/rust/allocator/lib.rs.orig 2025-06-18 14:17:42.000000000 +0200 ++++ build/rust/allocator/lib.rs 2025-08-24 10:57:12.002293000 +0200 +@@ -89,9 +89,8 @@ mod both_allocators { + /// As part of rustc's contract for using `#[global_allocator]` without + /// rustc-generated shims we must define this symbol, since we are opting in + /// to unstable functionality. See https://github.com/rust-lang/rust/issues/123015 +- #[no_mangle] +- #[linkage = "weak"] +- static __rust_no_alloc_shim_is_unstable: u8 = 0; ++ #[rustc_std_internal_symbol] ++ fn __rust_no_alloc_shim_is_unstable_v2() {} + + // Mangle the symbol name as rustc expects. + #[rustc_std_internal_symbol] diff --git a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn index 6646c9edc97b..e1fd322aea84 100644 --- a/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn +++ b/www/ungoogled-chromium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2025-02-20 09:59:21 UTC +--- net/dns/BUILD.gn.orig 2025-03-29 00:50:57 UTC +++ net/dns/BUILD.gn -@@ -140,7 +140,7 @@ source_set("dns") { +@@ -138,7 +138,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,17 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -181,6 +181,7 @@ source_set("dns") { +@@ -172,6 +172,9 @@ source_set("dns") { + } + + deps = [ "//net:net_deps" ] ++ if (is_bsd) { ++ deps += [ "//services/screen_ai/buildflags" ] ++ } + + public_deps = [ + ":dns_client", +@@ -179,6 +182,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", @@ -17,7 +27,7 @@ ] allow_circular_includes_from = [ -@@ -450,9 +451,9 @@ source_set("tests") { +@@ -447,9 +451,9 @@ source_set("tests") { if (is_android) { sources += [ "dns_config_service_android_unittest.cc" ] |