Unbundle the zlib

Use the gentoo patch.
This commit is contained in:
Tomas Popela 2019-09-13 15:18:03 +02:00
parent 892e596886
commit 8458f58818
2 changed files with 28 additions and 0 deletions

View File

@ -0,0 +1,25 @@
From e1bbdec720a333937bd1b990ae0f7ee97db0d3b0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Fri, 28 Jun 2019 15:56:23 +0000
Subject: [PATCH] update zlib
---
third_party/perfetto/gn/BUILD.gn | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/third_party/perfetto/gn/BUILD.gn b/third_party/perfetto/gn/BUILD.gn
index c951f5f..297eee3 100644
--- a/third_party/perfetto/gn/BUILD.gn
+++ b/third_party/perfetto/gn/BUILD.gn
@@ -200,7 +200,7 @@ group("zlib") {
"//buildtools:zlib",
]
} else if (build_with_chromium) {
- public_configs = [ "//third_party/zlib:zlib_config" ]
+ public_configs = [ "//third_party/zlib:system_zlib" ]
public_deps = [
"//third_party/zlib",
]
--
2.21.0

View File

@ -278,6 +278,8 @@ Patch62: chromium-76.0.3809.100-gcc-remoting-constexpr.patch
Patch63: chromium-76.0.3809.100-vtable-symbol-undefined.patch Patch63: chromium-76.0.3809.100-vtable-symbol-undefined.patch
# https://chromium.googlesource.com/chromium/src.git/+/3c9720245e440c4b7222f8348d2a2a3c25e098ae # https://chromium.googlesource.com/chromium/src.git/+/3c9720245e440c4b7222f8348d2a2a3c25e098ae
Patch64: chromium-77.0.3865.75-certificate-transparency.patch Patch64: chromium-77.0.3865.75-certificate-transparency.patch
# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-unbundle-zlib.patch
Patch65: chromium-77.0.3865.75-unbundle-zlib.patch
# Apply these changes to work around EPEL7 compiler issues # Apply these changes to work around EPEL7 compiler issues
Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch
@ -844,6 +846,7 @@ udev.
%patch62 -p1 -b .gcc-remoting-constexpr %patch62 -p1 -b .gcc-remoting-constexpr
%patch63 -p1 -b .vtable-symbol-undefined %patch63 -p1 -b .vtable-symbol-undefined
%patch64 -p1 -b .certificate-transparency %patch64 -p1 -b .certificate-transparency
%patch65 -p1 -b .unbundle-zlib
# EPEL specific patches # EPEL specific patches
%if 0%{?rhel} == 7 %if 0%{?rhel} == 7