From a6aeb8761aaa1b43cefca8cc306a1d45f311a34f Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Mon, 11 Nov 2024 19:08:35 -0500 Subject: Trying to make it work with non-nightly rust compiler. --- www-client/chromium/Manifest | 2 +- .../chromium/files/chromium-132-compiler.patch | 24 +++++++++++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) (limited to 'www-client') diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index a217878..aed0c94 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -22,7 +22,7 @@ AUX chromium-131-EnumTable-crash.patch 3028 BLAKE2B 0fb49828493eb6a9e7647b643d16 AUX chromium-131-compiler.patch 11595 BLAKE2B 8a4e264140dfc64324d8007586a1c1d961bedc9937a8be73d7834703c37f55e1005ef732ffc994fe8bda7090a1ae41769dd400864db37aafb4415bbb05ba05c7 SHA512 dd2bbdee91e70eaeae4e4485833345edf606c1a12eab15ca3860d97d773f127c0674fb1edab970236d69d44ab81c7a0b058b6c21abc92ea08cd1caceb5572442 AUX chromium-131-text_codec_icu-system-icu.patch 1204 BLAKE2B 97bfcc1ef1e72da9fc3c9a473c32e0077a3eae9a19e7cac65b457ac8196075ea86c66d7ec13638abf617b18b53ab93fe6df4d6423acdedfb086497cadc2a3dff SHA512 f742b9f7b1c7d26e0b3795ad59d00c726e48e872233186cf880021609b27026882ab27e1cbcacfba882ed3381b08fe29912e5ea2553dbdbbe16730b4b63c1f96 AUX chromium-131-use-oauth2-client-switches-as-default.patch 1194 BLAKE2B 040f8161c659d015bfda3f8f2f9c3f904b0b1318233569550c80b4c1a6cfeca8e3d39998e8ebec87880948ec2444214fd0551f0a65111363c3c40fe3c0d717c8 SHA512 20621cc7ee69bb0e53d1806f6e78381357fb31c99d339ed9b385a669dcdc92b800f2b3c2d6833bb36e94348793afe790a6f3f3d5d2f330c57407305fa8095a5a -AUX chromium-132-compiler.patch 12093 BLAKE2B 839df6a7dd7a3c3f0aa82b85a1b324ee35b9ec18426b49159194e843e3d08a7cb5d10d9e6066d11d7aaf0e0c30792b2ad526df58c55fa0b21af7fc431404b974 SHA512 5535ab13069d32affe1c615ac94b9c6ae71c670f5514f5d47ef41050ab1ee0ac36a9aa46825947a0c936397c301491f23a78200b90b8a456cc11b568335987b1 +AUX chromium-132-compiler.patch 12901 BLAKE2B 37be5fc8b2c546cffc0976d5c9f7f0849e4b9475c06891adf67ab6b7921b3dc92c105f21d30c38bf5106bbb4471161579533413cd46969df1f775b6dd24f4ad9 SHA512 089053f70731cc9b0eaabefb14fee0f8571c515ab37f7be1dbd6a0b368e727cf985eae7be60c205ee19e0b3925286abdcdd87ae2bd48159f8fad9b24a9da6dae AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954 AUX chromium-launcher-r7.sh 1631 BLAKE2B ae28d758264446511fd2b64ba69fe920144b351e8833e0e98f43d00633e850094c288b5d97d1a84801ea13aceb294623692c86c1b9be5811b7b97fa8a07a1ecd SHA512 1e97f8394bd8bb4b29570b1b85176efe6258314a596f079bee1c4018113e0023aa54a93690ba8de2a00d127af10dbe2cc3fb3127b72b841c6f28f9e7bed820e0 diff --git a/www-client/chromium/files/chromium-132-compiler.patch b/www-client/chromium/files/chromium-132-compiler.patch index 65a24d8..f9cd8e3 100644 --- a/www-client/chromium/files/chromium-132-compiler.patch +++ b/www-client/chromium/files/chromium-132-compiler.patch @@ -1,5 +1,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index cb9bf8772d..9d459df611 100644 +index cb9bf8772d..9e36a487ba 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -309,9 +309,6 @@ config("compiler") { @@ -107,6 +107,15 @@ index cb9bf8772d..9d459df611 100644 ] if (!is_win || force_rustc_color_output) { +@@ -1107,7 +1036,7 @@ config("compiler") { + # Don't allow unstable features to be enabled by `#![feature()]` without + # additional command line flags. + config("disallow_unstable_features") { +- rustflags = [ "-Zallow-features=" ] ++ #rustflags = [ "-Zallow-features=" ] + } + + config("libcxx_hardening") { @@ -1583,52 +1512,6 @@ config("compiler_deterministic") { } } @@ -319,6 +328,19 @@ index cb9bf8772d..9d459df611 100644 if (is_win) { ldflags = [ "/DEBUG" ] +diff --git a/build/config/gcc/BUILD.gn b/build/config/gcc/BUILD.gn +index a659210b19..bde0e1b273 100644 +--- a/build/config/gcc/BUILD.gn ++++ b/build/config/gcc/BUILD.gn +@@ -32,7 +32,7 @@ declare_args() { + # See http://gcc.gnu.org/wiki/Visibility + config("symbol_visibility_hidden") { + cflags = [ "-fvisibility=hidden" ] +- rustflags = [ "-Zdefault-visibility=hidden" ] ++ # rustflags = [ "-Zdefault-visibility=hidden" ] + + # Visibility attribute is not supported on AIX. + if (current_os != "aix") { diff --git a/build/config/rust.gni b/build/config/rust.gni index 5b7807a1b8..4b3acd300e 100644 --- a/build/config/rust.gni -- cgit v1.2.3