www-client/ungoogled-chromium: bump

PF4Public · Jan 21, 2025 · 7423b4a · 7423b4a
1 parent 56bfb17
commit 7423b4a
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 0 deletions.
diff --git a/www-client/ungoogled-chromium/Manifest b/www-client/ungoogled-chromium/Manifest
@@ -22,6 +22,7 @@ DIST chromium-47fb59539e5744467eb6f7aae52f5a169910d56c.patch 1405 BLAKE2B e72e76
 DIST chromium-4b232f209824053242aa34d14eb860e392ad30b1.patch 1415 BLAKE2B 8243fc7fa750aca189083c17d4e0dc7d6c961b83be39100fd9e00f9130cbb96c9a3ea45063995113c743bf39c851705cb92f534ed63015cadc9fc06beedccb16 SHA512 23d2146d706cb8e3af3d4723da5eeba7d84e0d5bb22f330d8d4e725b76ed5fdb97e110cdf7fc8fa7e6546e206cf90e6f1c6f2d6296eed6d9941e70796418d30c
 DIST chromium-4c49d7f04f43ab4757637cac21cfef7c0cd060fc.patch 1172 BLAKE2B 346027f24009cccdbb479055567aae9e327ea88163d5cc25becc1512b7035c809ec8089b69b6084e6278b9a6029123dabbe824b7ffd988aa244ba84dceff629f SHA512 63028b4e747b92fd462d2663fc317bec8f3ee1e3fc486a9135fef7fd5f68eaae9d883144024f8ddebbce5f053ccfe8ef142b3f6d0dfbd785310fd40bbb060f6a
 DIST chromium-5c1e85eb085658187f4475ff5e56962473b6f10a.patch 1011 BLAKE2B 9e53d7999f87172d375d1bdfffd6e1753a5fd8148fd041ecd26d7b255d3ea951ed01ed45bc43d54fc3657e549509a8f587ae4ef3162dd50ed283d666f6db6c98 SHA512 413be2fa1ae9f8d0436ad54d6f71d4eeac0a2c14a9a378fd87862fa15f9e214053ded872a7039e9dd2e4bb4e52d7eafe7eaa9c205cc402b67c45d888eafe351b
+DIST chromium-67ee7171925fb9269f9082772abe3ca603ad9341.patch 1629 BLAKE2B e50ac17dc4312786f40be2319cd3ef9207d35b5aaaf5e9467dd73f22b797d06af2102ba623c77dd015b6426375d8449b27db3f7efd3c785fdbf51c7c5d4e5ed6 SHA512 1ba0d824a488f629e02ac4604c9d7043bc2763c8a08be1e49d95406385220a69f3ada47b9abcaa6929fdf740a96691f76b7d671c6502fa4ba411f336ca9ae32d
 DIST chromium-7e28832cd3320d2b603e6ef9468581e1c65c14f1.patch 1339 BLAKE2B 8b8c9daa68f981b70627a07d9f7638c33158802d3ece8e7ab4e25734332944407810e8a2aa4f701d8153ccdd72138525598e23660feeb4b8a8e69893cc523d8d SHA512 10298ad3a257488add2e942e5522ac43e7979162acaf037122e437fe0a9734893e9bc03bd6a528d3052bb3ae2efe94fe61fb1fa051307db544e507d17603e4c3
 DIST chromium-84fcdd0620a72aa73ea521c682fb246067f2c14d.patch 3730 BLAKE2B 62ac6bd2fbd9ac480b818d5766e466c59789783f038a6c1aee83861e9ebcfd257dea0e9888fa8fceff81923d72042d928593e13fd7685d8b24199dcacfe013c4 SHA512 fc2136d507de85432d8f8173536aae46b6efe98ce3471b4fcdbfc61a14e15b7c06aa8612a7cdedbc53ab95e7d6c703e449b0f34a7c6f85ba4a18bf05753a6b84
 DIST chromium-8739a5b33176e82e06a746163c0c76de4908ced9.patch 1635 BLAKE2B 3c8a62403bf90e3e35f237f0774196b8a15669717a4ece79f5d8306fd2bdfe01f7c1f1715609578185c236a12d5cf9c4b4438a6400fc16e4a89e6f7f681c8820 SHA512 0323edb3fb4f34e50035588423af412c16d95ea06fdbc6ff82758b4e640cad803d40989195a2c9782b87759374e42f3d38110ff929224f8e3dce3dfef9a7fae1

diff --git a/www-client/ungoogled-chromium/files/chromium-132-no-rust.patch b/www-client/ungoogled-chromium/files/chromium-132-no-rust.patch
@@ -193,3 +193,70 @@
 
        libs = [ "z" ]
      }
+--- a/base/json/json_reader.cc
++++ b/base/json/json_reader.cc
+@@ -13,7 +13,7 @@
+ #include "base/metrics/histogram_macros.h"
+ #include "build/build_config.h"
+
+-#if !BUILDFLAG(IS_NACL)
++#if BUILDFLAG(IS_NACL)
+ #include "base/strings/string_view_rust.h"
+ #include "third_party/rust/serde_json_lenient/v0_2/wrapper/functions.h"
+ #include "third_party/rust/serde_json_lenient/v0_2/wrapper/lib.rs.h"
+@@ -23,7 +23,7 @@
+
+ // TODO(crbug.com/40811643): Move the C++ parser into components/nacl to just
+ // run in-process there. Don't compile base::JSONReader on NaCL at all.
+-#if !BUILDFLAG(IS_NACL)
++#if BUILDFLAG(IS_NACL)
+
+ namespace {
+ using serde_json_lenient::ContextPointer;
+@@ -140,7 +140,7 @@
+ std::optional<Value> JSONReader::Read(std::string_view json,
+                                       int options,
+                                       size_t max_depth) {
+-#if BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL)
+   internal::JSONParser parser(options, max_depth);
+   return parser.Parse(json);
+ #else   // BUILDFLAG(IS_NACL)
+@@ -173,7 +173,7 @@
+ JSONReader::Result JSONReader::ReadAndReturnValueWithError(
+     std::string_view json,
+     int options) {
+-#if BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL)
+   internal::JSONParser parser(options);
+   auto value = parser.Parse(json);
+   if (!value) {
+@@ -213,7 +213,7 @@
+   if (!base::FeatureList::GetInstance()) {
+     return false;
+   }
+-#if BUILDFLAG(IS_NACL)
++#if !BUILDFLAG(IS_NACL)
+   return false;
+ #else
+   return base::FeatureList::IsEnabled(base::features::kUseRustJsonParser);
+--- a/base/logging.cc
++++ b/base/logging.cc
+@@ -126,7 +126,7 @@
+ #include "base/fuchsia/scoped_fx_logger.h"
+ #endif
+
+-#if !BUILDFLAG(IS_NACL)
++#if BUILDFLAG(IS_NACL)
+ #include "base/logging/rust_logger.rs.h"
+ #endif
+
+@@ -526,7 +526,7 @@
+   }
+ #endif
+
+-#if !BUILDFLAG(IS_NACL)
++#if BUILDFLAG(IS_NACL)
+   // Connects Rust logging with the //base logging functionality.
+   internal::init_rust_log_crate();
+ #endif
diff --git a/www-client/ungoogled-chromium/ungoogled-chromium-132.0.6834.83_p1.ebuild b/www-client/ungoogled-chromium/ungoogled-chromium-132.0.6834.83_p1.ebuild
@@ -68,6 +68,7 @@ declare -A CHROMIUM_COMMITS=(
 	["587c2cf8b11d3c32fa26887063eda3171a3d353e"]="third_party/ruy/src"
 	["047055e64ec01205365d0b1357bc2b00c547eb93"]="third_party/ink/src"
 	["-84fcdd0620a72aa73ea521c682fb246067f2c14d"]="."
+	["67ee7171925fb9269f9082772abe3ca603ad9341"]="." #133+
 )
 
 UGC_PV="${PV/_p/-}"