summaryrefslogblamecommitdiff
path: root/www-client/chromium/files/chromium-109-minizip.patch
blob: f24595c8226a12d2b68842e6c9b7608ce3b71419 (plain) (tree)


















































































































































                                                                                                                                                                                                                  
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 1b01755e1..65550e8fd 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 01c68515a..7a53974f2 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/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/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 e65d7ce6b..1f89d931a 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 f107d7fe8..28ef2f636 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 e97027a0b..d6f02b1e0 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 48244c823..a5c0234fe 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 dd109293d..edb1542b7 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