no rust

3 files changed, 95 insertions, 1 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 80bd253..9e19082 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -29,6 +29,7 @@ AUX chromium-120-compiler.patch 9228 BLAKE2B ccfe733c7528a0371d7cb6765e89567b6bf
 AUX chromium-120-safe_sprintf-nullptr-t.patch 1166 BLAKE2B f21d4b56f7b8fa33e88a6f70204a9d4ac79977addc41fcab919090f059be8e24dc13074236d1973c9f6cd17419e023d7b18c6f4bae23026062125ff3bf3c6fa4 SHA512 4f33f36293e07b809da36873d960066e03f2ab3960a50b5a797df9d0648a4c975d5535238602819ab4e21fc16bb67da4b8a79dfdcb66fc46090a4b1dff0f1fc4
 AUX chromium-120-speech-dispatcher-include.h 2233 BLAKE2B df78a67015752df51d8b851a83d810b252d5c9903aade30b5985411ffc38fbe772fd1e1a6e88a4df57aa81c87d9bb3e0fb440454f0351ddf974cc3b71e7fccdc SHA512 eadd8e2dc4d9f567dca2cd9b4da31f1976b3137e27fe191388531994187fa81cc6c50607a1334f9defd7a26b4f2d4995180e204dd4b6550d5d03b0bd8b89ae0d
 AUX chromium-121-blink_libxml2_downgrade.patch 1306 BLAKE2B 0b92ec706b32bd54e5c26793b7775c60952c452dc323ca706b0bf4bc90f599a1395258350c2acdd8bcd1e0af7e410b9e7469a0cf8be931a787b726acd3c9fc0a SHA512 0829d6c840cd6a371f7e47d8e350be0b928970ac8ea8b6131528046ca4d2ff36947066a317af92a9377cc9ed0fb2668eeea1d07f4c7c83b75aa581490fa01281
+AUX chromium-121-qrgen-disablerust.patch 3295 BLAKE2B 6ba03f01ee7c14d7dff1c8d8890f5242e4ef706fba4582cd232fd48a02ed360fa51ad4f34f4e4a3a36864549f855bbd984eb9e34d766eea65e7e7079088640db SHA512 dfd94c7fa2c414e5a7f78bcb1a17618fe20796a23ea8449a88e69e8bf508a693052bbe3c033ff45fdd6d06b6765db43fcfc7faea483d55e46a51b67ec7bd9d1f
 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
@@ -43,4 +44,4 @@ DIST chromium-121.0.6129.0.tar.xz 3283266136 BLAKE2B ada9c23925d5067a7baf39fb829
 DIST chromium-121.0.6156.3.tar.xz 3310473440 BLAKE2B 7fa5df2b749ec30617e83282260bd75b6c332ae9296dc9a48bd179a8537973e6834bfa316cbaf472f9c611140a05c2be5f04371b9ccabffc204477046ec23695 SHA512 1f8b5280f562776b37c91714c709e4d0941bb5c3b2a3677266585911bd8a4a5ea1f65382c66a9920af5847f7d5dc25ff29f8d0acc0678ed1fd14d80480f9c9ef
 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
 EBUILD chromium-121.0.6129.0.ebuild 38954 BLAKE2B c9fd608b5ca30e31c9b64f7d384a29f97d459d6901c785bcded46b6e86569d19bb7a8cbd87408730a376331907c9991a687eee545e483d5510e94b4bec4ebfa8 SHA512 386a25cc49ed53b0173c297a38d79610e29d1cbaab5acab39de87fb1118a8824378b01fadc62c6c6b2428d20fabfd3d6be0810ed40a8298bcf3fb556d86a6618
-EBUILD chromium-121.0.6156.3.ebuild 38954 BLAKE2B c9fd608b5ca30e31c9b64f7d384a29f97d459d6901c785bcded46b6e86569d19bb7a8cbd87408730a376331907c9991a687eee545e483d5510e94b4bec4ebfa8 SHA512 386a25cc49ed53b0173c297a38d79610e29d1cbaab5acab39de87fb1118a8824378b01fadc62c6c6b2428d20fabfd3d6be0810ed40a8298bcf3fb556d86a6618
+EBUILD chromium-121.0.6156.3.ebuild 39007 BLAKE2B 592d08880678f06dfde7af0bc04245835d4bfe255189bccaf51a3322cc3f9ecd49fd00501a5971cf1cf62eada5152be437e47ff3b18047d444eea1a2fa260592 SHA512 550ddb1e7d308a58ecf4e79b34aeea7a7cafc6ed8c3ac986935912c75597a4121c6cacf0f557392093dfc1e44db0975fcc89be55737b0d1bcc304239e1b74cd5
diff --git a/www-client/chromium/chromium-121.0.6156.3.ebuild b/www-client/chromium/chromium-121.0.6156.3.ebuild
index 7d11cc1..8696e1d 100644
--- a/www-client/chromium/chromium-121.0.6156.3.ebuild
+++ b/www-client/chromium/chromium-121.0.6156.3.ebuild
@@ -327,6 +327,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-118-freetype-blink.patch"
 		"${FILESDIR}/chromium-119-minizip-types.patch"
 		"${FILESDIR}/chromium-121-blink_libxml2_downgrade.patch"
+		"${FILESDIR}/chromium-121-qrgen-disablerust.patch"
 
 		"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-109-EnumTable-crash.patch"
diff --git a/www-client/chromium/files/chromium-121-qrgen-disablerust.patch b/www-client/chromium/files/chromium-121-qrgen-disablerust.patch
new file mode 100644
index 0000000..fe6bf28
--- /dev/null
+++ b/www-client/chromium/files/chromium-121-qrgen-disablerust.patch
@@ -0,0 +1,92 @@
+diff --git a/components/qr_code_generator/BUILD.gn b/components/qr_code_generator/BUILD.gn
+index dddcc726b7..3545742d9d 100644
+--- a/components/qr_code_generator/BUILD.gn
++++ b/components/qr_code_generator/BUILD.gn
+@@ -3,7 +3,7 @@
+ # found in the LICENSE file.
+ 
+ import("//build/buildflag_header.gni")
+-import("//build/config/rust.gni")
++# import("//build/config/rust.gni")
+ import("//testing/libfuzzer/fuzzer_test.gni")
+ 
+ declare_args() {
+@@ -39,20 +39,20 @@ source_set("qr_code_generator") {
+   ]
+   deps = [
+     ":qr_code_generator_features",
+-    ":qr_code_generator_ffi_glue",
++#    ":qr_code_generator_ffi_glue",
+     "//base",
+   ]
+   public_deps = [ "//base" ]
+ }
+ 
+-rust_static_library("qr_code_generator_ffi_glue") {
+-  allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
+-  crate_root = "qr_code_generator_ffi_glue.rs"
+-  sources = [ "qr_code_generator_ffi_glue.rs" ]
+-  cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ]
+-  visibility = [ ":qr_code_generator" ]
+-  deps = [ "//third_party/rust/qr_code/v2:lib" ]
+-}
++#rust_static_library("qr_code_generator_ffi_glue") {
++#  allow_unsafe = true  # Needed for FFI that underpins the `cxx` crate.
++#  crate_root = "qr_code_generator_ffi_glue.rs"
++#  sources = [ "qr_code_generator_ffi_glue.rs" ]
++#  cxx_bindings = [ "qr_code_generator_ffi_glue.rs" ]
++#  visibility = [ ":qr_code_generator" ]
++#  deps = [ "//third_party/rust/qr_code/v2:lib" ]
++#}
+ 
+ source_set("unit_tests") {
+   testonly = true
+diff --git a/components/qr_code_generator/qr_code_generator.cc b/components/qr_code_generator/qr_code_generator.cc
+index f7d2df0775..4fadc4e1ae 100644
+--- a/components/qr_code_generator/qr_code_generator.cc
++++ b/components/qr_code_generator/qr_code_generator.cc
+@@ -11,12 +11,12 @@
+ #include <vector>
+ 
+ #include "base/check_op.h"
+-#include "base/containers/span_rust.h"
++//#include "base/containers/span_rust.h"
+ #include "base/memory/raw_ptr.h"
+ #include "base/notreached.h"
+ #include "base/numerics/safe_conversions.h"
+ #include "components/qr_code_generator/features.h"
+-#include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h"
++//#include "components/qr_code_generator/qr_code_generator_ffi_glue.rs.h"
+ 
+ namespace qr_code_generator {
+ 
+@@ -572,7 +572,7 @@ size_t SegmentSpanLength(base::span<const QRCodeGenerator::Segment> segments) {
+   return sum;
+ }
+ 
+-absl::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust(
++/*absl::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust(
+     base::span<const uint8_t> in,
+     absl::optional<int> min_version) {
+   rust::Slice<const uint8_t> rs_in = base::SpanToRustSlice(in);
+@@ -595,7 +595,7 @@ absl::optional<QRCodeGenerator::GeneratedCode> GenerateQrCodeUsingRust(
+   code.qr_size = base::checked_cast<int>(result_width);
+   CHECK_EQ(code.data.size(), static_cast<size_t>(code.qr_size * code.qr_size));
+   return code;
+-}
++}*/
+ 
+ }  // namespace
+ 
+@@ -617,9 +617,9 @@ absl::optional<QRCodeGenerator::GeneratedCode> QRCodeGenerator::Generate(
+     return absl::nullopt;
+   }
+ 
+-  if (IsRustyQrCodeGeneratorFeatureEnabled()) {
++  /*if (IsRustyQrCodeGeneratorFeatureEnabled()) {
+     return GenerateQrCodeUsingRust(in, min_version);
+-  }
++  }*/
+ 
+   std::vector<Segment> segments;
+   const QRVersionInfo* version_info = nullptr;