[rpms/chromium] epel9-next: workaround for build error on epel and fedora39

[rpms/chromium] epel9-next: workaround for build error on epel and fedora39

[Than Ngo]

A new commit has been pushed.

Repo   : rpms/chromium
Branch : epel9-next
Commit : 7187ed89f5772f7469b22211b5e0eea52bb6c29e
Author : Than Ngo <than@redhat.com>
Date   : 2024-09-06T17:51:40+02:00
Stats  : +3/-93 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/chromium/c/7187ed89f5772f7469b22211b5e0eea52bb6c29e?branch=epel9-next

Log:
workaround for build error on epel and fedora39

---
diff --git a/chromium-119-system-minizip-header-fix.patch b/chromium-119-system-minizip-header-fix.patch
deleted file mode 100644
index 14ac00b..0000000
--- a/chromium-119-system-minizip-header-fix.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc
---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc.system-minizip	2023-11-06 12:42:34.928657960 +0100
-+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_extractor.cc	2023-11-06 12:51:12.547834851 +0100
-@@ -28,9 +28,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 -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc
---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc.system-minizip	2023-11-01 19:11:24.000000000 +0100
-+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/metadata_populator.cc	2023-11-06 12:42:34.928657960 +0100
-@@ -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/zip.h>
- 
- namespace tflite {
- namespace metadata {
-diff -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc
---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc.system-minizip	2023-11-01 19:11:24.000000000 +0100
-+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_readonly_mem_file.cc	2023-11-06 12:42:34.929657982 +0100
-@@ -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 -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc
---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc.system-minizip	2023-11-01 19:11:24.000000000 +0100
-+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.cc	2023-11-06 12:42:34.929657982 +0100
-@@ -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 -up chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h
---- chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h.system-minizip	2023-11-01 19:11:24.000000000 +0100
-+++ chromium-119.0.6045.105/third_party/tflite_support/src/tensorflow_lite_support/metadata/cc/utils/zip_writable_mem_file.h	2023-11-06 12:42:34.929657982 +0100
-@@ -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/chromium-81.0.4044.92-unbundle-zlib.patch b/chromium-81.0.4044.92-unbundle-zlib.patch
deleted file mode 100644
index ff4e3b1..0000000
--- a/chromium-81.0.4044.92-unbundle-zlib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn
---- chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn.unbundle-zlib	2020-04-13 12:25:09.001172601 -0400
-+++ chromium-81.0.4044.92/third_party/perfetto/gn/BUILD.gn	2020-04-13 12:25:23.688921586 -0400
-@@ -294,7 +294,7 @@ if (enable_perfetto_zlib) {
-       public_configs = [ "//buildtools:zlib_config" ]
-       public_deps = [ "//buildtools:zlib" ]
-     } else {
--      public_configs = [ "//third_party/zlib:zlib_config" ]
-+      public_configs = [ "//third_party/zlib:system_zlib" ]
-       public_deps = [ "//third_party/zlib" ]
-     }
-   }

diff --git a/chromium.spec b/chromium.spec
index 62312a5..4504799 100644
--- a/chromium.spec
+++ b/chromium.spec
@@ -230,12 +230,10 @@
 %global bundlehighway 1
 %endif
 
-# enable bundleminizip for Fedora > 39 due to switch to minizip-ng
-# which breaks the build
-%global bundleminizip 0
-%if 0%{?fedora} > 39
+# workaround for build error
+# disable bundleminizip for Fedora > 39 due to switch to minizip-ng
+# disable bundleminizip for epel and Fedora39 due to old minizip version
 %global bundleminizip 1
-%endif
 
 %if 0%{?fedora} || 0%{?rhel} >= 9
 %global bundlezstd 0
@@ -314,12 +312,6 @@ Patch20: chromium-disable-font-tests.patch
 # don't download binary blob
 Patch21: chromium-123-screen-ai-service.patch
 
-# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
-Patch52: chromium-81.0.4044.92-unbundle-zlib.patch
-
-# Fix headers to look for system paths when we are using system minizip
-Patch61: chromium-119-system-minizip-header-fix.patch
-
 # Fix issue where closure_compiler thinks java is only allowed in android builds
 # https://bugs.chromium.org/p/chromium/issues/detail?id=1192875
 Patch65: chromium-91.0.4472.77-java-only-allowed-in-android-builds.patch
@@ -1048,11 +1040,6 @@ Qt6 UI for chromium.
 %patch -P20 -p1 -b .disable-font-test
 %patch -P21 -p1 -b .screen-ai-service
 
-%if ! %{bundleminizip}
-%patch -P52 -p1 -b .unbundle-zlib
-%patch -P61 -p1 -b .system-minizip
-%endif
-
 %patch -P65 -p1 -b .java-only-allowed
 %patch -P69 -p1 -b .update-rjsmin-to-1.2.0
 %patch -P82 -p1 -b .remoting-no-tests