chromium 106: minizip????

2 files changed, 83 insertions, 1 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 9ef27d8..ba80976 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,7 +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-minizip.patch 6861 BLAKE2B 062d8398e9ebd9815ea9bb081a358af70560c15f571e13a691f208f7416055680088954c9f33dce46b9d425cf6eef66fbe17b67b7b6ddfa5807a44b1dba522cc SHA512 bfce692e2d140c1aaf1f6d82edc0f607993aac79a929bdc98b3a6901249faa5511ebbe85a429ca07b90d3d40e8e0a851f74a538b9741c6932d2bfea091748352
 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
diff --git a/www-client/chromium/files/chromium-106-minizip.patch b/www-client/chromium/files/chromium-106-minizip.patch
index 697c124..d85acb7 100644
--- a/www-client/chromium/files/chromium-106-minizip.patch
+++ b/www-client/chromium/files/chromium-106-minizip.patch
@@ -1,3 +1,85 @@
+diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
+index 62d091018..ccedc7777 100644
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
+@@ -27,8 +27,8 @@ limitations under the License.
+ #include "tensorflow_lite_support/cc/port/status_macros.h"
+ #include "tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h"
+ #include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
+-#include "third_party/zlib/contrib/minizip/unzip.h"
++#include "minizip/ioapi.h"
++#include "minizip/unzip.h"
+ 
+ namespace tflite {
+ namespace metadata {
+diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
+index 8e13fa63d..e96bc0491 100644
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
+@@ -26,8 +26,8 @@ limitations under the License.
+ #include "tensorflow_lite_support/cc/port/statusor.h"
+ #include "tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h"
+ #include "tensorflow_lite_support/metadata/metadata_schema_generated.h"
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
+-#include "third_party/zlib/contrib/minizip/zip.h"
++#include "minizip/ioapi.h"
++#include "minizip/zip.h"
+ 
+ namespace tflite {
+ namespace metadata {
+diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+index 525ae4a2b..80ad84900 100644
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include "minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
+index 72413a0a5..38c9278da 100644
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.h
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdlib>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include "minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
+index 3ba91b5e2..646822093 100644
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdio>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include "minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
+diff --git a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
+index 3d329925d..da6ff5ad8 100644
+--- a/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
++++ b/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
+@@ -19,7 +19,7 @@ limitations under the License.
+ #include <cstdlib>
+ 
+ #include "absl/strings/string_view.h"  // from @com_google_absl
+-#include "third_party/zlib/contrib/minizip/ioapi.h"
++#include "minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {
 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