diff options
| -rw-r--r-- | www-client/chromium/Manifest | 2 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-137-compiler.patch | 73 |
2 files changed, 48 insertions, 27 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 49683f1..d7026ef 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -29,7 +29,7 @@ AUX chromium-135-mv2-ungoogled.patch 8653 BLAKE2B 21947e2a25bb5306c63c93de772c41 AUX chromium-135-protobuf-RepeatedPtrField-export.patch 812 BLAKE2B ba7d6eca5967bfe7324b384bea5b80feb2fdf9013bc32a618ab3fa18b6c143c889e1691c7a9fff501fe8d6c9794e28a2b3541e9aac97614bd1f4a4891e78ca89 SHA512 8d9ba3b598ce70d20635372427d7134d6ebf7951e9015124d8cf928e745b1f234c199929adcdfa738583fabb87800e154ef2219f15a9489f5b64a1e477b3930e AUX chromium-136-glic-comma.patch 656 BLAKE2B 7f28fb8872100b6ae945e320cdde71252bc0b97c84196eae0fe20fa413bda58b9116b31888c69f383296627b80afe9cb5b42d698831243c9be2dc228e9678eaa SHA512 2d98c41a30883ccd3b59a38ec1b7972ea402035e0b1914d4244bc59ba6c63dc4628e218ab07013f30237b1af840c6c87f5d9979a1ab5ca0e12b661fe9719c1e0 AUX chromium-136-mv2-ungoogled.patch 8658 BLAKE2B a16b2f4b7d4bf94f342cd797b9ee1198840b6c270dc55266650232476513765758fa462ae76c0dfd61e9251842fc6c956a0175ee975129004b14a82ae91074d1 SHA512 a33324c4e20d97d8e6f9750050bacf0de32335a26d334a1374e2c246cbb2581dff74dbb1ff856550f49b1264f6ab01ffeb2edf4530c8f77f52594a57b5e9079f -AUX chromium-137-compiler.patch 13139 BLAKE2B 8c4ec14d601cefc0f0387948fc6a934458151b0728735a557a01c83c99681329f66267f7ce26f09965fd844c9399fb8203701b142ff6b991973bb854d49310ae SHA512 f170d98f324d35896eefaa27b582f0e2db787d061f20f803c588e90c4cc64b2a7679446201789115ac9ba4f0a28372c50d8a2bdfe21ed87a07fa1a7f9a2dc2d7 +AUX chromium-137-compiler.patch 14061 BLAKE2B 867840bd18ddec81b22c5e497468ef1076d3801ce09c26a4f3cef431991504df755e50e8ab3728fd206e77538f148258e6e81d28566d51a858741038592f0045 SHA512 e8dca91544f0ef81270721aaf2038bc736ea18d16a47444f9caa74b336aff70b3d59c7fa68ccbe495c260e7a68b57f9679df9f5a3ac7348a0713ca2678b44d1a AUX chromium-137-mv2-ungoogled.patch 8708 BLAKE2B a7c664c5b5789aa87a02b135a54365c28b4e23fa3299a8375e4d7d94b4414d6a5e4884d86df4f425efbbfe70f7ecdfbdd8937b12e9bc85e52b425b6e0a1d2ceb SHA512 427f9af6ffba70aab476389159672a0b19e328b1b67f38237ac4f13514b493741e07a3db830cdc90ea46ce355fcd9e1117bf45edc5c6214adc8d4b0b503056d1 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca AUX chromium-cross-compile.patch 323 BLAKE2B 8d5091ce5287422c9688ede2563360a96b8bd34b9750dc1c8f0b6ca9aeff2c066fac2da169396baa131d971c087c78f9af53999df0e102d1f57176f5e8d3dd57 SHA512 06d3afc1aa19e57daac0e4bad37e1f365a68408240430e5e818e5a4f12e3b7519214eafa463633e447e7029f4ae13ea864ca347ad1fac117702a0be88718a954 diff --git a/www-client/chromium/files/chromium-137-compiler.patch b/www-client/chromium/files/chromium-137-compiler.patch index b9935ec..b60d49f 100644 --- a/www-client/chromium/files/chromium-137-compiler.patch +++ b/www-client/chromium/files/chromium-137-compiler.patch @@ -1,8 +1,8 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 0aa2d1e5c8..2f3ac56cb4 100644 +index 0aa2d1e5c8..88a7a2eb96 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -307,9 +307,6 @@ config("compiler") { +@@ -307,12 +307,8 @@ config("compiler") { configs += [ # See the definitions below. @@ -11,8 +11,11 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 - ":compiler_cpu_abi", ":compiler_codegen", ":compiler_deterministic", - ":clang_warning_suppression", -@@ -492,6 +489,9 @@ config("compiler") { +- ":clang_warning_suppression", + ] + + # Here we enable -fno-delete-null-pointer-checks, which makes various nullptr +@@ -492,6 +488,9 @@ config("compiler") { ldflags += [ "-fPIC" ] rustflags += [ "-Crelocation-model=pic" ] @@ -22,7 +25,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 if (!is_clang) { # Use pipes for communicating between sub-processes. Faster. # (This flag doesn't do anything with Clang.) -@@ -567,62 +567,6 @@ config("compiler") { +@@ -567,62 +566,6 @@ config("compiler") { ldflags += [ "-Wl,-z,keep-text-section-prefix" ] } @@ -85,7 +88,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 # C11/C++11 compiler flags setup. # --------------------------- if (is_linux || is_chromeos || is_android || (is_nacl && is_clang) || -@@ -1033,20 +977,6 @@ config("compiler") { +@@ -1033,20 +976,6 @@ config("compiler") { # `-nodefaultlibs` from the linker invocation from Rust, which would be used # to compile dylibs on Android, such as for constructing unit test APKs. "-Cdefault-linker-libraries", @@ -106,7 +109,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 ] if (!is_win || force_rustc_color_output) { -@@ -1095,7 +1025,7 @@ config("compiler") { +@@ -1095,7 +1024,7 @@ config("compiler") { # Don't allow unstable features to be enabled by `#![feature()]` without # additional command line flags. config("disallow_unstable_features") { @@ -115,7 +118,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 } config("libcxx_hardening") { -@@ -1554,52 +1484,6 @@ config("compiler_deterministic") { +@@ -1554,52 +1483,6 @@ config("compiler_deterministic") { } } @@ -168,7 +171,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 # Tells the compiler not to use absolute paths when passing the default # paths to the tools it invokes. We don't want this because we don't # really need it and it can mess up the RBE cache entries. -@@ -1618,28 +1502,6 @@ config("compiler_deterministic") { +@@ -1618,65 +1501,6 @@ config("compiler_deterministic") { } } @@ -194,13 +197,31 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 - } -} - - # Controls the usage of a warning suppression mapping (WSM) file to suppress - # warnings based on the path of the file they come from. It's controlled by the - # `clang_warning_suppression_file` gn argument , which points to a text file -@@ -1665,18 +1527,6 @@ config("clang_warning_suppression") { - } - } - +-# Controls the usage of a warning suppression mapping (WSM) file to suppress +-# warnings based on the path of the file they come from. It's controlled by the +-# `clang_warning_suppression_file` gn argument , which points to a text file +-# defining which warnings should be suppressed where. +-# See //build/config/warning_suppression.txt for an example file; this is the +-# file used by Chromium. +-# +-# To use a different file, or to use this functionality outside of chromium, +-# set the `clang_warning_suppression_file` argument to point to the new file, +-# e.g. by setting in the the project's .gn file. +-config("clang_warning_suppression") { +- # Some build configs use older versions of clang that don't support WSMs +- if (!is_nacl && default_toolchain != "//build/toolchain/cros:target" && +- !llvm_android_mainline && is_clang && +- clang_warning_suppression_file != "") { +- from_build_root = +- rebase_path(clang_warning_suppression_file, root_build_dir) +- inputs = [ clang_warning_suppression_file ] +- cflags = [ +- "-Xclang", +- "--warning-suppression-mappings=" + from_build_root, +- ] +- } +-} +- -config("rustc_revision") { - if (rustc_revision != "") { - # Similar to the above config, this is here so that all files get recompiled @@ -216,7 +237,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 config("compiler_arm_fpu") { if (current_cpu == "arm" && !is_ios && !is_nacl) { cflags = [ "-mfpu=$arm_fpu" ] -@@ -2116,11 +1966,7 @@ config("chromium_code") { +@@ -2116,11 +1940,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -229,7 +250,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 # In Chromium code, we define __STDC_foo_MACROS in order to get the # C99 macros on Mac and Linux. -@@ -2129,24 +1975,6 @@ config("chromium_code") { +@@ -2129,24 +1949,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -254,7 +275,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 if (is_apple) { cflags_objc = [ "-Wimplicit-retain-self" ] cflags_objcc = [ "-Wimplicit-retain-self" ] -@@ -2566,7 +2394,8 @@ config("default_stack_frames") { +@@ -2566,7 +2368,8 @@ config("default_stack_frames") { # [0]: https://pinpoint-dot-chromeperf.appspot.com/job/147634a8be0000 # [1]: https://pinpoint-dot-chromeperf.appspot.com/job/132bc772be0000 # [2]: https://crrev.com/c/5447532 @@ -264,7 +285,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 if (is_win) { # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for # consistency with the other platforms. -@@ -2615,7 +2444,8 @@ config("optimize") { +@@ -2615,7 +2418,8 @@ config("optimize") { } # Turn off optimizations. @@ -274,7 +295,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2650,7 +2480,8 @@ config("no_optimize") { +@@ -2650,7 +2454,8 @@ config("no_optimize") { # Turns up the optimization level. Used to explicitly enable -O2 instead of # -Os for select targets on platforms that use optimize_for_size. No-op # elsewhere. @@ -284,7 +305,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2683,7 +2514,8 @@ config("optimize_max") { +@@ -2683,7 +2488,8 @@ config("optimize_max") { # # TODO(crbug.com/41259697) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -294,7 +315,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2712,7 +2544,8 @@ config("optimize_speed") { +@@ -2712,7 +2518,8 @@ config("optimize_speed") { } } @@ -304,7 +325,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2843,7 +2676,8 @@ config("win_pdbaltpath") { +@@ -2843,7 +2650,8 @@ config("win_pdbaltpath") { } # Full symbols. @@ -314,7 +335,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 rustflags = [] configs = [] if (is_win) { -@@ -3005,7 +2839,8 @@ config("symbols") { +@@ -3005,7 +2813,8 @@ config("symbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -324,7 +345,7 @@ index 0aa2d1e5c8..2f3ac56cb4 100644 rustflags = [] if (is_win) { # Functions, files, and line tables only. -@@ -3090,7 +2925,8 @@ config("minimal_symbols") { +@@ -3090,7 +2899,8 @@ config("minimal_symbols") { # This configuration contains function names only. That is, the compiler is # told to not generate debug information and the linker then just puts function # names in the final debug information. |