try to fix everything with minizip.

2 files changed, 68 insertions, 1 deletions

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 387aa1c..53d8449 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -16,7 +16,7 @@ AUX chromium-103-SubstringSetMatcher-packed.patch 3161 BLAKE2B 8e0f6f1b4ef271870
 AUX chromium-103-VirtualCursor-std-layout.patch 8310 BLAKE2B 97de0d611fc6d84df432c9df8b73ea84c042c21562e0a49eb2816facdf6a783d18f5ee31984b10d4aafcf46e2b53d2ceadbb139e1cddfbf1627891f6dddbffd8 SHA512 0646c21b6bc75c142ffcd102378aa000563333f33237bee12bf56bd009c1e5128bf3784813993d301d8e6d5d2b73a7807b8fc6631485ede6439b2703d3c39097
 AUX chromium-103-compiler.patch 8113 BLAKE2B 2f82b8304bde961971f97aa7632e68860a6988633c0d0bda66996163ff4538c645ce6768a397ea2852ec3ce5be386edb2ffa00a5f825479397cce5d2807fc4df SHA512 7cc3264effe9e53e3835d6c27dbff759070817b243efbc26db815427a221bfb1dcdef280ce47c4138f049e264de18ac950eea57425c50aaeab05d52cd1bcb63a
 AUX chromium-104-compiler.patch 8128 BLAKE2B 19316cf2ed34583beb4b513c07d54326c2b6fa82ebdf4fd1038c94d7acb518a6bc6fa670e69d14bf8597ae08621dc3b55f9260943fb829eab80bd0f39eeb4fb6 SHA512 b16b1921ed50f7486a830931a6464f2eac33884837d7a7fde88c20d8054bb99cba9922c295dc6bf4bdabbf6a3f0597894fabe42ba166906889bed80431a719b8
-AUX chromium-104-tflitesupport-minizip-include.patch 951 BLAKE2B 98eacacb666795fdd870de09e58787c450cd2f3eca365b714b843ef3429399eb9e4c4066abba44b2371fbdfec3c1121bce3710c345bdc10aa04085feb3fe09d4 SHA512 621b429c4197ecad5f39b5912f1644216dc32cef7b6de0b4fac686978b099657c5b84beff04e9fabcdbfb81a67baca34faa2d707e36428bc2f799bdbe9c2f6f7
+AUX chromium-104-tflitesupport-minizip-include.patch 4526 BLAKE2B 038a92efcff48744ec31c6222984ec0454e52095c9331c4925803435d60f6c925650c6b21b9002978379a46bf4a6b83bb044972796cf7e057d5a0ada4f55e195 SHA512 514297e9d431f064c28fd41ca80ee700d609f348c7d63605d86b698e4f2310c54f0973e1ba02dd138e7519e23b7b88b281bfe555f15bd76923fc4b8111eb2bb5
 AUX chromium-71-gcc-0.patch 2531 BLAKE2B 141886b7e9c6b627ba562d33729b60bc8b9cefd7792175e542527cb97c16a772f8b7a868fb3bdef8d2e89bec5e991b88a5fb074afc7dd2467de20cc6acdeeb47 SHA512 1c9875c087776b1675049bdfb132b55ea74a6015ebbbcfa9be412017bc877469ddde35ddb775338d8598fcc045de7e3c6c39d5b8a1d59c82447eb4bf5214b2bc
 AUX chromium-73-gcc-0.patch 4483 BLAKE2B b0759cf95146f483bf246c20d3c62956f6ddb5138c9436f9bf823956eaaab06de150eb90ec1d535d86965077a1d0e051e81d00a49d8674b836085d8a69f75570 SHA512 de7101ba00d8c1f00cd3f557574653cb9df80e59efe869c4fb127736b0f0793b20157169af74c8e38057c460e29a7e90e05274c749dbb6a30aa0aa7886b74b36
 AUX chromium-73-gcc-1.patch 4194 BLAKE2B 23d94aad7e77fae0d11b44d3e4cbc1af7e01f62cf2991b6a625d65ba8fc53a2ef369e55e2308739a89a1d68df09f99f8382d5bccab798074b206728c7f666b1d SHA512 802ac452eece4b64757990315bb5c38d7cb2ab9f4916b0c5457d9f04a47729e81b3b1dc52c68c641f5cbc20e45a509e721c211d42abfc22ebb0c48af421ec688
diff --git a/www-client/chromium/files/chromium-104-tflitesupport-minizip-include.patch b/www-client/chromium/files/chromium-104-tflitesupport-minizip-include.patch
index 84b7cb7..a8ce023 100644
--- a/www-client/chromium/files/chromium-104-tflitesupport-minizip-include.patch
+++ b/www-client/chromium/files/chromium-104-tflitesupport-minizip-include.patch
@@ -13,3 +13,70 @@ index 2a7233874..44fc64c3d 100644
  #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
  #include "tensorflow/lite/schema/schema_generated.h"
  #include "tensorflow_lite_support/cc/common.h"
+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 299ade3e9..388835cee 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
+@@ -19,8 +19,8 @@ limitations under the License.
+ #include <cstring>
+ #include <functional>
+ 
+-#include "contrib/minizip/ioapi.h"
+-#include "contrib/minizip/zip.h"
++#include "minizip/ioapi.h"
++#include "minizip/zip.h"
+ #include "flatbuffers/flatbuffers.h"  // from @flatbuffers
+ #include "tensorflow/lite/schema/schema_generated.h"
+ #include "tensorflow_lite_support/cc/common.h"
+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 392b6b411..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 "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 a1799ff50..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 "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 38ad17ad8..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 "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 30e42fdb7..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 "contrib/minizip/ioapi.h"
++#include "minizip/ioapi.h"
+ 
+ namespace tflite {
+ namespace metadata {