From fbb1417d0b8c642a19868ab5f89c03ed8ba09b8d Mon Sep 17 00:00:00 2001 From: Chris Xiong Date: Fri, 16 Sep 2022 11:49:53 -0400 Subject: just compile please --- www-client/chromium/Manifest | 2 +- .../chromium/files/chromium-107-compiler.patch | 52 +++++++++++++++++++--- 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 7e62e9b..2bfde3b 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 7756 BLAKE2B befc3633921c913bf115c6c2a3562a0a4d4f096f07cdd2c451581f34c8303ff5b98efd8fd5741ccc6d1214dd1d99e60f87c3aff3d09568cdd4b9d6bec7f21de6 SHA512 26def8aea2a36122ca68ca3aa2474a991820f6a57f9ea057d984bb02928bd4bc26bf89ce4054f5f4782dee6b4f1b0d2388215a3968c9e5909f0a0c4cf5b0dcb5 +AUX chromium-107-compiler.patch 9377 BLAKE2B cdce870f1f9287ea1bc72a8a12023337b2365c0a496bf80416c6c7c5fa4a79c57c8a962e0203bbb709bc5d1ce4ab9ba9deb9bbe2041af46557e7422f8389a843 SHA512 1ef149dc4d88b9915dbc41c00fa89163cc527904dd3cd3e0cf9fe06955f69b4c38222ddc831cefccff8dd8124a2ea5f87733dfb597bd3e4081fe3d961708c679 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 1d059c4..279341e 100644 --- a/www-client/chromium/files/chromium-107-compiler.patch +++ b/www-client/chromium/files/chromium-107-compiler.patch @@ -1,5 +1,11 @@ +commit 82c9b35823a9dd186f2635f35a2e50f291732f69 +Author: Chris Xiong +Date: Fri Sep 16 11:39:08 2022 -0400 + + compiler take 2 + diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 665b42c3b..26b141903 100644 +index 665b42c3b..fb3091665 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn @@ -274,9 +274,7 @@ config("compiler") { @@ -98,16 +104,52 @@ index 665b42c3b..26b141903 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. -@@ -1310,7 +1236,8 @@ config("compiler_deterministic") { +@@ -1310,25 +1236,26 @@ config("compiler_deterministic") { } } -config("clang_revision") { +- if (is_clang && clang_base_path == default_clang_base_path) { +- update_args = [ +- "--print-revision", +- "--verify-version=$clang_version", +- ] +- if (llvm_force_head_revision) { +- update_args += [ "--llvm-force-head-revision" ] +- } +- clang_revision = exec_script("//tools/clang/scripts/update.py", +- update_args, +- "trim string") +- +- # This is here so that all files get recompiled after a clang roll and +- # when turning clang on or off. (defines are passed via the command line, +- # and build system rebuild things when their commandline changes). Nothing +- # should ever read this define. +- defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] +- } +config("clang_revision") { } +config("xclang_revision") { - if (is_clang && clang_base_path == default_clang_base_path) { - update_args = [ - "--print-revision", ++# if (is_clang && clang_base_path == default_clang_base_path) { ++# update_args = [ ++# "--print-revision", ++# "--verify-version=$clang_version", ++# ] ++# if (llvm_force_head_revision) { ++# update_args += [ "--llvm-force-head-revision" ] ++# } ++# clang_revision = exec_script("//tools/clang/scripts/update.py", ++# update_args, ++# "trim string") ++# ++# # This is here so that all files get recompiled after a clang roll and ++# # when turning clang on or off. (defines are passed via the command line, ++# # and build system rebuild things when their commandline changes). Nothing ++# # should ever read this define. ++# defines = [ "CR_CLANG_REVISION=\"$clang_revision\"" ] ++# } + } + + config("rustc_revision") { @@ -1616,7 +1543,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } -- cgit v1.2.3