chromium 106: minizip???

3 files changed, 68 insertions, 3 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index e53fe13..9ef27d8 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,6 +4,7 @@ AUX chromium-104-tflitesupport-minizip-include.patch 4526 BLAKE2B 038a92efcff487
 AUX chromium-105-compiler.patch 7242 BLAKE2B 8c107ad08c1af4f31f7e19b235e1d45c5753765a0372788da1939206a61e1a33a687c17fa4780c37b7fa73eea7f0972d60828104d6f7ffa2fcf1688554d6cadf SHA512 33ae9b869c0bf3e650ce9cad0cd56dbdd28dff6f5f0f8a3ac8a48fdab2be43a7fff6ff99ddd1af4b4470eea96816ca054d68a81989e28f1c7625c9060d473ac0
 AUX chromium-105-protobuf-RepeatedPtrField-export.patch 682 BLAKE2B e67ff20391876c24fd5a268fda448190dd7dcf54e13deab21313775efd030c6072afa558d4cd446c3cdf476ee1e2bee50308ca5ef1d7dfd31759e445ae6f005a SHA512 31f1e0263916f460ca72d719c6d79bdad1840d36be13214cf0a3c16283b42f0e5791cb0f0fa07b97a6979025791aa8cb0dd71671de953d6b13106bee6f458af6
 AUX chromium-105-webrtc-aec3-include.patch 990 BLAKE2B f0347dbb8eea840c5812bafbca76dce24412abdf6533e6134b5aba3fc4e4fc3053f3b653fa506d7095a7448ee20c76717ad18c865f17fc04f37b4ae0bb0f1e6a SHA512 60ef09a91525b1553bca6458df1dc8ba9ef03e8aca80d09db5459ab064fa0f2677662e2475a8b8932e5d3a303a326b7cfbe7c18d2cbf16a2fdff4e925d780048
+AUX chromium-106-minizip.patch 2258 BLAKE2B 8aab571df7076a2240f4aff89482ec02fe8680530602dc9cfa31b64e419b4aaddca8a77e6567e24d2fc686fccdf895e55e56c332b8f38a2411c34aa2115df76d SHA512 2ff7554e04ee42e2836759a795e33a1cc974d7281f4be3b838a4ecd7493c9094eaa604670da5cda9e3b5080e830b5f587a37355fc0646805830ab0579361de0d
 AUX chromium-106-power_bookmarks-include.patch 690 BLAKE2B eb5764731fd9529ef731472b811235f77cdc1ff82d8d373426906aae82bdb9d985311dd280f1c660dd81a7c0f43159c02c1fedfaadabfaf785c2beafeffdcd4c SHA512 f12e719d1297bc718985e7ffede7d6437b245cc23e0d7af6f4c8efb9e9a37351b5e0aba2870a80ce312ca1dea4bdbc9179a2b8b276714b1eac206cf6b217f3ed
 AUX chromium-78-protobuf-RepeatedPtrField-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0
 AUX chromium-93-InkDropHost-crash.patch 1134 BLAKE2B 1593c406c48b629ea3170a518cf86e936af36c554bc97a380324ab6fc930e49a359dc3ef6787ab08314a6a8f5da85714b0fa9d8589d6a46b1d06cbbd7e401f22 SHA512 474d7f55505e1275238d71d1723d74a66fc9f27a16ed293aa80ffefbe5500cd65a0bf13ec76a9bca0334a245f22120099fb367d12b93adc14500104d11cd3bff
@@ -18,4 +19,4 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9
 DIST chromium-105.0.5176.3.tar.xz 1522919332 BLAKE2B 515590aa3c55b2ccda667cc2dd0dcd90120042cad8769c3b13796c3300b351370bc03a94f53323810a7e877d3f1308e35ea95bd1ed297728e69add8e45246803 SHA512 9433ef4d8f6dee9988fd0ca38a1db06eda758abca2d123a5d9947c1ad97b05cc0516f3b9b6299b475878797d8d6348860a83036694c2a28138248239a6773a2a
 DIST chromium-106.0.5231.2.tar.xz 1615028732 BLAKE2B 3d3bad9340e7d4fadbed9f406e348bd3e1f1f8adaa3ddab7ed2de1d589049bbab0c96a777ee899db52e95f88cb8192bd51f608d8ac56757ca45e3349c71baca5 SHA512 416a77129750e273e8cd86fe82e647bfc31123e3a1c7e149f894f3341d1f7770340a98d8926ebb484dd96aff58a3339ac36ebdb1fa1e0935975f917b52677d79
 EBUILD chromium-105.0.5176.3.ebuild 32666 BLAKE2B 45c08cf6ecd6425ea1f1b38639ca9f8c6b33794acb2a97096b68ce0d4650da28a69bff4496222025baaebc6265e186cf5bc087f759dff00771663d6e11773cff SHA512 d530d5caa7645735a99784c7de13c02b82187f909b7a99eeabb7b921ca146669469d4fd102a6d37d312bfa85e905050281ac1cf23502616e82df4a16ae336fc8
-EBUILD chromium-106.0.5231.2.ebuild 32715 BLAKE2B 6eab40f1b4fb91ee6a40aef83a14ab02eced5efec37c7019fd1fdd35b3b153f33f48dc6191a0e659a95b63ae6bf0dea3dd160146427b335b56abe5a6183ec8ab SHA512 b14e3de04e9b0882653222e6dbed7ece277c13ded98ee601f7a8b2d8f4846e0e8f78d550f82f39db81e7b7bb5f0edd181a7850a3dcd04d8bd456553ca2b64112
+EBUILD chromium-106.0.5231.2.ebuild 32718 BLAKE2B a92fd490202a7f4c50538648742141b60d10ea0d40a23abbdf1574e76221047ad7d6d7c216caaee9222b680ae4ff9a81a6a27d52ad9222814b15e0d1fe74067f SHA512 fda6c73bb75f76be5e8e3443ae038f201ab12ebe84960d6d3cac7fc1c9d57fe9de005dc3ffcbf9cefe8a16c9f7c56656446a458a6c77af3960714250578c7c77
diff --git a/www-client/chromium/chromium-106.0.5231.2.ebuild b/www-client/chromium/chromium-106.0.5231.2.ebuild
index 608f800..61bb414 100644
--- a/www-client/chromium/chromium-106.0.5231.2.ebuild
+++ b/www-client/chromium/chromium-106.0.5231.2.ebuild
@@ -242,6 +242,7 @@ src_prepare() {
 		"${FILESDIR}/chromium-105-compiler.patch"
 		"${FILESDIR}/chromium-103-VirtualCursor-std-layout.patch"
 		"${FILESDIR}/chromium-106-power_bookmarks-include.patch"
+		"${FILESDIR}/chromium-106-minizip.patch"
 
 		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
 		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
@@ -655,8 +656,6 @@ src_configure() {
 	fi
 	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
 
-	myconf_gn+=" use_system_minizip=true"
-
 	# See dependency logic in third_party/BUILD.gn
 	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
 
diff --git a/www-client/chromium/files/chromium-106-minizip.patch b/www-client/chromium/files/chromium-106-minizip.patch
new file mode 100644
index 0000000..697c124
--- /dev/null
+++ b/www-client/chromium/files/chromium-106-minizip.patch
@@ -0,0 +1,65 @@
+diff --git a/third_party/zlib/google/zip_internal.cc b/third_party/zlib/google/zip_internal.cc
+index 1adf2e6d0..c8cf33c25 100644
+--- a/third_party/zlib/google/zip_internal.cc
++++ b/third_party/zlib/google/zip_internal.cc
+@@ -17,7 +17,7 @@
+ #include "base/strings/string_util.h"
+ #include "base/strings/utf_string_conversions.h"
+ 
+-#if defined(USE_SYSTEM_MINIZIP)
++#if 1//defined(USE_SYSTEM_MINIZIP)
+ #include <minizip/ioapi.h>
+ #include <minizip/unzip.h>
+ #include <minizip/zip.h>
+diff --git a/third_party/zlib/google/zip_internal.h b/third_party/zlib/google/zip_internal.h
+index 92833fa17..343f6e291 100644
+--- a/third_party/zlib/google/zip_internal.h
++++ b/third_party/zlib/google/zip_internal.h
+@@ -14,7 +14,7 @@
+ #include <windows.h>
+ #endif
+ 
+-#if defined(USE_SYSTEM_MINIZIP)
++#if 1//defined(USE_SYSTEM_MINIZIP)
+ #include <minizip/unzip.h>
+ #include <minizip/zip.h>
+ #else
+diff --git a/third_party/zlib/google/zip_reader.cc b/third_party/zlib/google/zip_reader.cc
+index 075ba70aa..8be91a5ef 100644
+--- a/third_party/zlib/google/zip_reader.cc
++++ b/third_party/zlib/google/zip_reader.cc
+@@ -23,7 +23,7 @@
+ #include "third_party/zlib/google/redact.h"
+ #include "third_party/zlib/google/zip_internal.h"
+ 
+-#if defined(USE_SYSTEM_MINIZIP)
++#if 1//defined(USE_SYSTEM_MINIZIP)
+ #include <minizip/unzip.h>
+ #else
+ #include "third_party/zlib/contrib/minizip/unzip.h"
+diff --git a/third_party/zlib/google/zip_reader.h b/third_party/zlib/google/zip_reader.h
+index 286ddfd9b..616bd7e0b 100644
+--- a/third_party/zlib/google/zip_reader.h
++++ b/third_party/zlib/google/zip_reader.h
+@@ -18,7 +18,7 @@
+ #include "base/numerics/safe_conversions.h"
+ #include "base/time/time.h"
+ 
+-#if defined(USE_SYSTEM_MINIZIP)
++#if 1//defined(USE_SYSTEM_MINIZIP)
+ #include <minizip/unzip.h>
+ #else
+ #include "third_party/zlib/contrib/minizip/unzip.h"
+diff --git a/third_party/zlib/google/zip_writer.h b/third_party/zlib/google/zip_writer.h
+index aa3c965d9..f471c73b5 100644
+--- a/third_party/zlib/google/zip_writer.h
++++ b/third_party/zlib/google/zip_writer.h
+@@ -13,7 +13,7 @@
+ #include "build/build_config.h"
+ #include "third_party/zlib/google/zip.h"
+ 
+-#if defined(USE_SYSTEM_MINIZIP)
++#if 1//defined(USE_SYSTEM_MINIZIP)
+ #include <minizip/unzip.h>
+ #include <minizip/zip.h>
+ #else