From e81707d24e90598ea275b98a30227faad2d9f17a Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 16 Sep 2022 11:39:59 -0400 Subject: why --- www-client/chromium/Manifest | 2 +- .../chromium/files/chromium-107-compiler.patch | 34 ++++++++++++++-------- 2 files changed, 23 insertions(+), 13 deletions(-) (limited to 'www-client') diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 63a7c75..7e62e9b 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -7,7 +7,7 @@ AUX chromium-105-webrtc-aec3-include.patch 990 BLAKE2B f0347dbb8eea840c5812bafbc AUX chromium-106-browser-ui-include.patch 396 BLAKE2B c086dd3aec25e32775cf81592a989b5de11cc53e5d597b7b0cb54eb6be756d5105452484239004e2b0f04a0f07d5c30676aa1ae2a95173cfc23d77d63741d3a5 SHA512 c92c784d0c57e451cfdd4553f59b9a189668f8c99c37a941eb52d1523610883aca6d1c099b39ebfdea4aa7b9e26d3500f261597238b198a7183a043f22cd148c AUX chromium-106-minizip.patch 6861 BLAKE2B 062d8398e9ebd9815ea9bb081a358af70560c15f571e13a691f208f7416055680088954c9f33dce46b9d425cf6eef66fbe17b67b7b6ddfa5807a44b1dba522cc SHA512 bfce692e2d140c1aaf1f6d82edc0f607993aac79a929bdc98b3a6901249faa5511ebbe85a429ca07b90d3d40e8e0a851f74a538b9741c6932d2bfea091748352 AUX chromium-106-power_bookmarks-include.patch 690 BLAKE2B eb5764731fd9529ef731472b811235f77cdc1ff82d8d373426906aae82bdb9d985311dd280f1c660dd81a7c0f43159c02c1fedfaadabfaf785c2beafeffdcd4c SHA512 f12e719d1297bc718985e7ffede7d6437b245cc23e0d7af6f4c8efb9e9a37351b5e0aba2870a80ce312ca1dea4bdbc9179a2b8b276714b1eac206cf6b217f3ed -AUX chromium-107-compiler.patch 7489 BLAKE2B 20d7d5b9be993ae2b77907411ef3846a87ce287d729b729aec80394c9c0afe059897b2f24c298388aeb2644b494750dd9ecddb0d2cd86176a990e27044996294 SHA512 6c3f6053b7481526f59e95db52fa069381ead75a624d0f423a47e45aeb1f96b79a3ac28c0f652e69145c3e68d4826c45b8121372442a97c0f201f58ba28afcd8 +AUX chromium-107-compiler.patch 7756 BLAKE2B befc3633921c913bf115c6c2a3562a0a4d4f096f07cdd2c451581f34c8303ff5b98efd8fd5741ccc6d1214dd1d99e60f87c3aff3d09568cdd4b9d6bec7f21de6 SHA512 26def8aea2a36122ca68ca3aa2474a991820f6a57f9ea057d984bb02928bd4bc26bf89ce4054f5f4782dee6b4f1b0d2388215a3968c9e5909f0a0c4cf5b0dcb5 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff AUX chromium-98-EnumTable-crash.patch 2854 BLAKE2B 4478e14e7f0c0d251b659546c2e4b83b712b072317c35f63376d7d58e2fa3563f0518b4cc333c5902140cfcd333b5860737d4c7ccbb3680fee1b60de25ad0917 SHA512 a1b55b04da7218cda037a38a543032aa741a589d2f0691d69f28eb173ffeff284d2f4da2cab1708335ecfc0a3c12ecbd57c4c48dee3eca44d659d9a3f9a7dff6 diff --git a/www-client/chromium/files/chromium-107-compiler.patch b/www-client/chromium/files/chromium-107-compiler.patch index ac28240..1d059c4 100644 --- a/www-client/chromium/files/chromium-107-compiler.patch +++ b/www-client/chromium/files/chromium-107-compiler.patch @@ -1,5 +1,5 @@ diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 665b42c3b..8d73754a0 100644 +index 665b42c3b..26b141903 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -274,9 +274,7 @@ config("compiler") { @@ -98,7 +98,17 @@ index 665b42c3b..8d73754a0 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 goma cache entries. -@@ -1616,7 +1542,7 @@ config("chromium_code") { +@@ -1310,7 +1236,8 @@ config("compiler_deterministic") { + } + } + +-config("clang_revision") { ++config("clang_revision") { } ++config("xclang_revision") { + if (is_clang && clang_base_path == default_clang_base_path) { + update_args = [ + "--print-revision", +@@ -1616,7 +1543,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -107,7 +117,7 @@ index 665b42c3b..8d73754a0 100644 if (treat_warnings_as_errors) { cflags += [ "-Werror" ] -@@ -1625,10 +1551,6 @@ config("chromium_code") { +@@ -1625,10 +1552,6 @@ config("chromium_code") { # well. ldflags = [ "-Werror" ] } @@ -118,7 +128,7 @@ index 665b42c3b..8d73754a0 100644 # In Chromium code, we define __STDC_foo_MACROS in order to get the # C99 macros on Mac and Linux. -@@ -1637,16 +1559,6 @@ config("chromium_code") { +@@ -1637,16 +1560,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -135,7 +145,7 @@ index 665b42c3b..8d73754a0 100644 if (is_mac) { cflags_objc = [ "-Wobjc-missing-property-synthesis" ] cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -2041,7 +1953,8 @@ config("default_stack_frames") { +@@ -2041,7 +1954,8 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -145,7 +155,7 @@ index 665b42c3b..8d73754a0 100644 if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -2086,7 +1999,8 @@ config("optimize") { +@@ -2086,7 +2000,8 @@ config("optimize") { } # Turn off optimizations. @@ -155,7 +165,7 @@ index 665b42c3b..8d73754a0 100644 if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2126,7 +2040,8 @@ config("no_optimize") { +@@ -2126,7 +2041,8 @@ config("no_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -165,7 +175,7 @@ index 665b42c3b..8d73754a0 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2159,7 +2074,8 @@ config("optimize_max") { +@@ -2159,7 +2075,8 @@ config("optimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -175,7 +185,7 @@ index 665b42c3b..8d73754a0 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2185,7 +2101,8 @@ config("optimize_speed") { +@@ -2185,7 +2102,8 @@ config("optimize_speed") { } } @@ -185,7 +195,7 @@ index 665b42c3b..8d73754a0 100644 cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2305,7 +2222,8 @@ config("win_pdbaltpath") { +@@ -2305,7 +2223,8 @@ config("win_pdbaltpath") { } # Full symbols. @@ -195,7 +205,7 @@ index 665b42c3b..8d73754a0 100644 if (is_win) { if (is_clang) { cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2430,7 +2348,8 @@ config("symbols") { +@@ -2430,7 +2349,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. @@ -205,7 +215,7 @@ index 665b42c3b..8d73754a0 100644 if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2502,7 +2421,8 @@ config("minimal_symbols") { +@@ -2502,7 +2422,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. -- cgit v1.2.3