From 33095035eb14ba0821f25ec231b394ef1d93417e Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 31 Jul 2019 09:16:36 +0300 Subject: [PATCH] chromium: Fix build error. --- testing/chromium/checksums | 1 + .../chromium-75.0.3770.80-no-zlib-mangle.patch | 14 ++++++++++++++ testing/chromium/sources | 1 + 3 files changed, 16 insertions(+) create mode 100644 testing/chromium/patches/chromium-75.0.3770.80-no-zlib-mangle.patch diff --git a/testing/chromium/checksums b/testing/chromium/checksums index ee6fe14e..a6d29ed7 100644 --- a/testing/chromium/checksums +++ b/testing/chromium/checksums @@ -69,3 +69,4 @@ b07a4903f150da643320012880622b6d52c0ccf1e85d3425240188277ee546ef perfetto.patch 3f55f3ed81f4d967b8eb45655ddbdd3a59da3d69dbf1999a9335b199c84d1c9d unrar.patch 815a2a41003747bb6b44df192af4650e9ea0fe2dc87bb689a9bbb6e7a2c3eddd welcome-page.patch 9058162657672162964d2f35431c208d1cfae12325858ff636044d667e9dcaf5 disable_swiftshader.patch +fbc5e4e2c3b4bca3b5c0e30c050c72429cb734b86dc665b3e74cfe832426c2cb chromium-75.0.3770.80-no-zlib-mangle.patch diff --git a/testing/chromium/patches/chromium-75.0.3770.80-no-zlib-mangle.patch b/testing/chromium/patches/chromium-75.0.3770.80-no-zlib-mangle.patch new file mode 100644 index 00000000..998be67a --- /dev/null +++ b/testing/chromium/patches/chromium-75.0.3770.80-no-zlib-mangle.patch @@ -0,0 +1,14 @@ +diff -up chromium-75.0.3770.80/third_party/zlib/zconf.h.nozmangle chromium-75.0.3770.80/third_party/zlib/zconf.h +--- chromium-75.0.3770.80/third_party/zlib/zconf.h.nozmangle 2019-06-05 11:12:30.420412467 -0400 ++++ chromium-75.0.3770.80/third_party/zlib/zconf.h 2019-06-05 11:17:43.512683058 -0400 +@@ -8,10 +8,6 @@ + #ifndef ZCONF_H + #define ZCONF_H + +-/* This include does prefixing as below, but with an updated set of names. Also +- * sets up export macros in component builds. */ +-#include "chromeconf.h" +- + /* + * If you *really* need a unique prefix for all types and library functions, + * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. diff --git a/testing/chromium/sources b/testing/chromium/sources index abca331a..a025f050 100644 --- a/testing/chromium/sources +++ b/testing/chromium/sources @@ -69,3 +69,4 @@ patches/safe_browsing-disable-reporting-of-safebrowsing-over.patch patches/unrar.patch patches/welcome-page.patch patches/disable_swiftshader.patch +patches/chromium-75.0.3770.80-no-zlib-mangle.patch