Djam/chromium-browser-stable-test
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/chromium-browser-stable-test.git synced 2025-02-24 01:52:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated to 71.0.3578.98

Browse source
This commit is contained in:
Алзим 2018-12-16 01:01:23 +03:00
parent 21b25f25cb
commit 5868af726f
10 changed files with 86 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.abf.yml
View file

@ -1,5 +1,5 @@
sources: sources:
chromium-70.0.3538.110.tar.xz: 71f2cbf5cde590579e20c3dad9d20f035b3bd1a6 chromium-71.0.3578.98.tar.xz: 5de8e48fc1f277afb16a7a484dfa0360e568632c
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5 depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3 icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28 new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

11
4849d9a.diff
View file

@ -15,10 +15,9 @@ Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Cr-Commit-Position: refs/heads/master@{#607596} Cr-Commit-Position: refs/heads/master@{#607596}
--- ---
diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py diff -urN chromium-71.0.3578.80.orig/tools/gn/bootstrap/bootstrap.py chromium-71.0.3578.80/tools/gn/bootstrap/bootstrap.py
index 261fddd..1945852 100755 --- chromium-71.0.3578.80.orig/tools/gn/bootstrap/bootstrap.py 2018-12-06 13:12:43.154663185 +0300
--- a/tools/gn/bootstrap/bootstrap.py +++ chromium-71.0.3578.80/tools/gn/bootstrap/bootstrap.py 2018-12-06 13:13:31.563300408 +0300
+++ b/tools/gn/bootstrap/bootstrap.py
@@ -46,10 +46,6 @@ @@ -46,10 +46,6 @@
'--build-path', '--build-path',
help='The directory in which to build gn, ' help='The directory in which to build gn, '
@ -28,8 +27,8 @@ index 261fddd..1945852 100755
- action='store_true', - action='store_true',
- help='Download and build with the Debian sysroot.') - help='Download and build with the Debian sysroot.')
parser.add_option('-v', '--verbose', help='ignored') parser.add_option('-v', '--verbose', help='ignored')
options, args = parser.parse_args(argv) parser.add_option(
if args: '--skip-generate-buildfiles',
@@ -76,8 +72,6 @@ @@ -76,8 +72,6 @@
'--no-last-commit-position', '--no-last-commit-position',
'--out-path=' + gn_build_dir, '--out-path=' + gn_build_dir,

20
chromium-52-pdfium-system-libtiff-libpng.patch
View file

@ -64,7 +64,7 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200 --- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h 2017-06-24 00:05:50.521671902 +0200 +++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h 2017-06-24 00:05:50.521671902 +0200
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
#include <vector> #include <limits.h>
#include "core/fxcodec/jbig2/JBig2_Context.h" #include "core/fxcodec/jbig2/JBig2_Context.h"
-#include "third_party/libopenjpeg20/openjpeg.h" -#include "third_party/libopenjpeg20/openjpeg.h"
@ -99,10 +99,10 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_jpxm
if (!m_Parameters.nb_tile_to_decode) { if (!m_Parameters.nb_tile_to_decode) {
if (!opj_set_decode_area(m_Codec.Get(), m_Image.Get(), m_Parameters.DA_x0, if (!opj_set_decode_area(m_Codec.Get(), m_Image.Get(), m_Parameters.DA_x0,
diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn diff -up chromium-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn.orig chromium-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn
--- chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200 --- chromium-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn.orig
+++ chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn 2017-06-24 22:25:18.901585830 +0200 +++ chromium-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn
@@ -356,49 +356,14 @@ @@ -357,49 +357,14 @@
} }
} }
@ -120,7 +120,7 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
+ ] + ]
} }
-static_library("fx_libopenjpeg") { source_set("fx_libopenjpeg") {
- configs -= [ "//build/config/compiler:chromium_code" ] - configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ - configs += [
- "//build/config/compiler:no_chromium_code", - "//build/config/compiler:no_chromium_code",
@ -153,12 +153,11 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- "libopenjpeg20/tgt.c", - "libopenjpeg20/tgt.c",
- "libopenjpeg20/thread.c", - "libopenjpeg20/thread.c",
- ] - ]
+source_set("fx_libopenjpeg") {
+ public_configs = [ ":openjpeg_config" ] + public_configs = [ ":openjpeg_config" ]
} }
config("system_libpng_config") { config("system_libpng_config") {
@@ -477,61 +442,13 @@ @@ -479,61 +444,13 @@
} }
} }
@ -166,8 +165,8 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
+ libs = [ "tiff" ] + libs = [ "tiff" ]
+} +}
+ +
if (pdf_enable_xfa) { if (pdf_enable_xfa_tiff) {
- static_library("fx_tiff") { source_set("fx_tiff") {
- configs -= [ "//build/config/compiler:chromium_code" ] - configs -= [ "//build/config/compiler:chromium_code" ]
- configs += [ - configs += [
- "//build/config/compiler:no_chromium_code", - "//build/config/compiler:no_chromium_code",
@ -221,7 +220,6 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn.pdfium-sy
- "libtiff/tiffiop.h", - "libtiff/tiffiop.h",
- "libtiff/tiffvers.h", - "libtiff/tiffvers.h",
- ] - ]
+ source_set("fx_tiff") {
+ public_configs = [ ":fx_tiff_config" ] + public_configs = [ ":fx_tiff_config" ]
} }
} }

20
chromium-55-extra-media.patch
View file

@ -80,16 +80,16 @@ diff -up chromium-62.0.3192.0/media/base/decode_capabilities.cc.extra-media chro
diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chromium-62.0.3192.0/media/base/mime_util_internal.cc diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chromium-62.0.3192.0/media/base/mime_util_internal.cc
--- chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media 2017-08-22 21:04:45.000000000 +0200 --- chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media 2017-08-22 21:04:45.000000000 +0200
+++ chromium-62.0.3192.0/media/base/mime_util_internal.cc 2017-08-30 15:44:46.519076991 +0200 +++ chromium-62.0.3192.0/media/base/mime_util_internal.cc 2017-08-30 15:44:46.519076991 +0200
@@ -74,6 +74,10 @@ @@ -80,6 +80,10 @@
{"vorbis", MimeUtil::VORBIS}, {"opus", MimeUtil::OPUS}, {"vorbis", MimeUtil::VORBIS}, {"opus", MimeUtil::OPUS},
{"flac", MimeUtil::FLAC}, {"vp8", MimeUtil::VP8}, {"flac", MimeUtil::FLAC}, {"vp8", MimeUtil::VP8},
{"vp8.0", MimeUtil::VP8}, {"theora", MimeUtil::THEORA}, {"vp8.0", MimeUtil::VP8}, {"theora", MimeUtil::THEORA},
+ {"dts", MimeUtil::DTS}, + {"dts", MimeUtil::DTS},
+ {"mp2", MimeUtil::MP2}, + {"mp2", MimeUtil::MP2},
+ {"mp4v.20.8", MimeUtil::MPEG4_SP}, + {"mp4v.20.8", MimeUtil::MPEG4_SP},
+ {"mp4v.20.240", MimeUtil::MPEG4_ASP}, + {"mp4v.20.240", MimeUtil::MPEG4_ASP},
}, },
base::KEEP_FIRST_OF_DUPES); base::KEEP_FIRST_OF_DUPES));
@@ -172,6 +176,9 @@ @@ -172,6 +176,9 @@
return kCodecTheora; return kCodecTheora;

22
chromium-62-include-cstdlib.patch
View file

@ -8,17 +8,6 @@
class CBC_CommonBitArray { class CBC_CommonBitArray {
public: public:
--- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/common/BC_CommonByteArray.h-orig
+++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/common/BC_CommonByteArray.h
@@ -8,6 +8,8 @@
#include <stdint.h>
#include <vector>
+#include <cstdlib>
+#include <cstdint>
// TODO(weili): The usage of this class should be replaced by
// std::vector<uint8_t>.
--- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/pdf417/BC_PDF417BarcodeRow.h-orig --- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/pdf417/BC_PDF417BarcodeRow.h-orig
+++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/pdf417/BC_PDF417BarcodeRow.h +++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/pdf417/BC_PDF417BarcodeRow.h
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
@ -30,12 +19,13 @@
class CBC_BarcodeRow { class CBC_BarcodeRow {
public: public:
--- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/qrcode/BC_QRCoderECBlocks.h-orig --- chromium-71.0.3578.98/third_party/pdfium/fxbarcode/qrcode/BC_QRCoderECBlocks.h.orig
+++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/qrcode/BC_QRCoderECBlocks.h +++ chromium-71.0.3578.98/third_party/pdfium/fxbarcode/qrcode/BC_QRCoderECBlocks.h
@@ -8,6 +8,8 @@ @@ -8,6 +8,9 @@
#include <stdint.h> #define FXBARCODE_QRCODE_BC_QRCODERECBLOCKS_H_
#include <vector> #include <stdint.h>
+
+#include <cstdlib> +#include <cstdlib>
+#include <cstdint> +#include <cstdint>

62
chromium-70.0.3538.67-jumbo.diff
View file

@ -1,62 +0,0 @@
From 5d5ab1d3bda4fcc55bb761df052f6a58a29c8aa4 Mon Sep 17 00:00:00 2001
From: Daniel Bratell <bratell@opera.com>
Date: Tue, 04 Sep 2018 01:10:52 +0000
Subject: [PATCH] [jumbo] Give two kForcedInvocationDeadline constants unique names
In certain jumbo configurations, the two constants names
kForcedInvocationDeadline could end up in the same translation
unit and then clash. This patch changes the names to
kTextFinderTestTimeout and kIdleSpellcheckTestTimeout.
Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_layout_ng
Change-Id: I76e030b98bead46fa0aff7f3e0ce1f264d754ef9
Reviewed-on: https://chromium-review.googlesource.com/1202064
Commit-Queue: Kent Tamura <tkent@chromium.org>
Reviewed-by: Kent Tamura <tkent@chromium.org>
Cr-Commit-Position: refs/heads/master@{#588441}
---
diff --git a/third_party/blink/renderer/core/editing/finder/text_finder.cc b/third_party/blink/renderer/core/editing/finder/text_finder.cc
index 4b5c514..1847a69 100644
--- a/third_party/blink/renderer/core/editing/finder/text_finder.cc
+++ b/third_party/blink/renderer/core/editing/finder/text_finder.cc
@@ -68,7 +68,7 @@
namespace blink {
namespace {
-constexpr TimeDelta kForcedInvocationDeadline = TimeDelta::FromSeconds(10);
+constexpr TimeDelta kTextFinderTestTimeout = TimeDelta::FromSeconds(10);
}
TextFinder::FindMatch::FindMatch(Range* range, int ordinal)
@@ -888,7 +888,7 @@
// https://crbug.com/875203
if (options.run_synchronously_for_testing) {
ScopeStringMatches(
- IdleDeadline::Create(CurrentTimeTicks() + kForcedInvocationDeadline,
+ IdleDeadline::Create(CurrentTimeTicks() + kTextFinderTestTimeout,
IdleDeadline::CallbackType::kCalledWhenIdle),
identifier, search_text, options);
} else {
diff --git a/third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.cc b/third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.cc
index 21c25f5..0acffa8 100644
--- a/third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.cc
+++ b/third_party/blink/renderer/core/editing/spellcheck/idle_spell_check_controller.cc
@@ -35,7 +35,7 @@
const int kHotModeRequestTimeoutMS = 200;
const int kInvalidHandle = -1;
const int kDummyHandleForForcedInvocation = -2;
-constexpr TimeDelta kForcedInvocationDeadline = TimeDelta::FromSeconds(10);
+constexpr TimeDelta kIdleSpellcheckTestTimeout = TimeDelta::FromSeconds(10);
} // namespace
@@ -233,7 +233,7 @@
return;
IdleDeadline* deadline =
- IdleDeadline::Create(CurrentTimeTicks() + kForcedInvocationDeadline,
+ IdleDeadline::Create(CurrentTimeTicks() + kIdleSpellcheckTestTimeout,
IdleDeadline::CallbackType::kCalledWhenIdle);
switch (state_) {

17
chromium-browser-stable.spec
View file

@ -34,7 +34,7 @@
Summary: A fast web browser based on the Blink engine Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable Name: chromium-browser-stable
Version: 70.0.3538.110 Version: 71.0.3578.98
Release: 1 Release: 1
License: BSD, LGPL License: BSD, LGPL
Group: Networking/WWW Group: Networking/WWW
@ -84,7 +84,8 @@ Patch504: chromium-system-icu-r0.patch
# https://aur.archlinux.org/packages/chromium-vaapi/ # https://aur.archlinux.org/packages/chromium-vaapi/
Patch508: chromium-vaapi-r21.patch Patch508: chromium-vaapi-r21.patch
Patch509: chromium-widevine-r2.patch # ftp://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/chromium-widevine-r3.patch
Patch509: chromium-widevine-r3.patch
# ROSA Build # ROSA Build
Patch600: chromium-buildname-60.0.3112.90.patch Patch600: chromium-buildname-60.0.3112.90.patch
@ -93,7 +94,7 @@ Patch601: chromium-62-include-cstdlib.patch
# https://github.com/RussianFedora/chromium/blob/fedora-stable/chromium-66.0.3359.81-system-clang.patch # https://github.com/RussianFedora/chromium/blob/fedora-stable/chromium-66.0.3359.81-system-clang.patch
Patch603: chromium-66.0.3359.81-system-clang.patch Patch603: chromium-66.0.3359.81-system-clang.patch
# http://ftp.riken.jp/Linux/gentoo/www-client/chromium/files/ # ftp://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/
Patch604: chromium-compiler-r4.patch Patch604: chromium-compiler-r4.patch
Patch605: chromium-ffmpeg-ebp-r1.patch Patch605: chromium-ffmpeg-ebp-r1.patch
# https://chromium.googlesource.com/chromium/src/+/40a8d84a54ac47d3299194c5377aebd71714f1f0%5E%21/ # https://chromium.googlesource.com/chromium/src/+/40a8d84a54ac47d3299194c5377aebd71714f1f0%5E%21/
@ -107,8 +108,6 @@ Patch629: chromium-60.0.3112.78-no-libpng-prefix.patch
Patch631: chromium-69.0.3497.100-build-error-in-clang6.patch Patch631: chromium-69.0.3497.100-build-error-in-clang6.patch
Patch700: chromium-70.0.3538.77-no-system-nodejs.patch Patch700: chromium-70.0.3538.77-no-system-nodejs.patch
# [jumbo] Give two kForcedInvocationDeadline constants unique names
Patch710: chromium-70.0.3538.67-jumbo.diff
# Disable fontconfig cache magic that breaks remoting # Disable fontconfig cache magic that breaks remoting
Patch717: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch Patch717: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
# gn bootstrap: Remove sysroot-related options # gn bootstrap: Remove sysroot-related options
@ -341,7 +340,6 @@ members of the Chromium and WebDriver teams.
%patch700 -p1 %patch700 -p1
%endif %endif
%patch710 -p1
%patch717 -p1 %patch717 -p1
%patch718 -p1 %patch718 -p1
@ -440,6 +438,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/icu' \ 'third_party/icu' \
'third_party/inspector_protocol' \ 'third_party/inspector_protocol' \
'third_party/jinja2' \ 'third_party/jinja2' \
'third_party/jsoncpp' \
'third_party/jstemplate' \ 'third_party/jstemplate' \
'third_party/khronos' \ 'third_party/khronos' \
'third_party/leveldatabase' \ 'third_party/leveldatabase' \
@ -512,6 +511,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/snappy' \ 'third_party/snappy' \
'third_party/speech-dispatcher' \ 'third_party/speech-dispatcher' \
'third_party/spirv-headers' \ 'third_party/spirv-headers' \
'third_party/SPIRV-Tools' \
'third_party/spirv-tools-angle' \ 'third_party/spirv-tools-angle' \
'third_party/sqlite' \ 'third_party/sqlite' \
'third_party/swiftshader' \ 'third_party/swiftshader' \
@ -559,6 +559,11 @@ FILE=chrome/common/channel_info_posix.cc
sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"%{product_vendor} %{product_version}"/' $FILE
cmp $FILE $FILE.orig && exit 1 cmp $FILE $FILE.orig && exit 1
# Remove compiler flags not supported by our system clang
sed -i \
-e '/"-Wno-defaulted-function-deleted"/d' \
build/config/compiler/BUILD.gn
%if 0%{?sys_node} %if 0%{?sys_node}
# setup node # setup node
mkdir -p third_party/node/linux/node-linux-x64/bin mkdir -p third_party/node/linux/node-linux-x64/bin

54
chromium-compiler-r4.patch
View file

@ -1,17 +1,6 @@
From 777d166eec22c1894108dce985498f75ac5931e8 Mon Sep 17 00:00:00 2001 --- chromium-71.0.3578.98/build/config/compiler/BUILD.gn.orig
From: Mike Gilbert <floppym@gentoo.org> +++ chromium-71.0.3578.98/build/config/compiler/BUILD.gn
Date: Wed, 25 Apr 2018 13:22:49 -0400 @@ -236,8 +236,6 @@
Subject: [PATCH] Disable various compiler configs
---
build/config/compiler/BUILD.gn | 61 ++++++++++------------------------
1 file changed, 18 insertions(+), 43 deletions(-)
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 6e38ad782d38..87bbd423f67f 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -225,8 +225,6 @@ config("compiler") {
configs += [ configs += [
# See the definitions below. # See the definitions below.
@ -20,12 +9,13 @@ index 6e38ad782d38..87bbd423f67f 100644
":compiler_codegen", ":compiler_codegen",
] ]
@@ -488,18 +486,6 @@ config("compiler") { @@ -500,17 +498,6 @@
} else {
ldflags += [ "-Wl,--color-diagnostics" ]
} }
} - }
-
- if (is_clang && !is_nacl && current_toolchain == host_toolchain && - if (is_clang && !is_nacl && !use_xcode_clang) {
- target_os != "chromeos") {
- cflags += [ - cflags += [
- # TODO(hans): Remove this once Clang generates better optimized debug info - # TODO(hans): Remove this once Clang generates better optimized debug info
- # by default. https://crbug.com/765793 - # by default. https://crbug.com/765793
@ -34,26 +24,25 @@ index 6e38ad782d38..87bbd423f67f 100644
- "-Xclang", - "-Xclang",
- "-instcombine-lower-dbg-declare=0", - "-instcombine-lower-dbg-declare=0",
- ] - ]
- } }
-
# Print absolute paths in diagnostics. There is no precedent for doing this # Print absolute paths in diagnostics. There is no precedent for doing this
# on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and @@ -1499,10 +1486,6 @@
# Windows developers rely on it (crbug.com/636109) so only do this on Windows.
@@ -1473,10 +1459,6 @@ config("default_warnings") {
cflags += [
# TODO(thakis): https://crbug.com/753973 # TODO(thakis): https://crbug.com/753973
"-Wno-enum-compare-switch", "-Wno-enum-compare-switch",
-
- # Ignore warnings about MSVC optimization pragmas. - # Ignore warnings about MSVC optimization pragmas.
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 - # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
- "-Wno-ignored-pragma-optimize", - "-Wno-ignored-pragma-optimize",
-
# TODO(hans): https://crbug.com/890307
"-Wno-defaulted-function-deleted",
] ]
} @@ -1545,22 +1528,6 @@
} "__STDC_CONSTANT_MACROS",
@@ -1518,22 +1500,6 @@ config("chromium_code") {
"__STDC_FORMAT_MACROS", "__STDC_FORMAT_MACROS",
] ]
-
- if (!is_debug && !using_sanitizer && - if (!is_debug && !using_sanitizer &&
- (!is_linux || !is_clang || is_official_build) && - (!is_linux || !is_clang || is_official_build) &&
- current_cpu != "s390x" && current_cpu != "s390" && - current_cpu != "s390x" && current_cpu != "s390" &&
@ -69,7 +58,6 @@ index 6e38ad782d38..87bbd423f67f 100644
- # disabled, so only do that for Release build. - # disabled, so only do that for Release build.
- defines += [ "_FORTIFY_SOURCE=2" ] - defines += [ "_FORTIFY_SOURCE=2" ]
- } - }
-
if (is_mac || is_ios) { if (is_mac) {
cflags_objc = [ "-Wobjc-missing-property-synthesis" ] cflags_objc = [ "-Wobjc-missing-property-synthesis" ]
cflags_objcc = [ "-Wobjc-missing-property-synthesis" ]

39
chromium-widevine-r2.patch
View file

@ -1,39 +0,0 @@
Minimal patch to get chromium to compile with widevine support.
Exactly the same as -r1, but we now need to patch
ninja to pretty please not terminate our build.
caveat emptor: it's in no way clear that building chromium this
way is safer, from a security perspective, than whatever Google
Chrome does.
Upstream appears to be cooking up a code-signing trust-chain
which may protect users against malicious cdm blobs; I doubt
we benefit from these using this kludge. Ideally, someone
would look into this more carefully than I have ... tbh as
soon as I got my "stories" back, I pretty much lost interest :)
-gmt
--
--- a/third_party/widevine/cdm/stub/widevine_cdm_version.h
+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h
@@ -10,6 +10,7 @@
#include "third_party/widevine/cdm/widevine_cdm_common.h"
+#define WIDEVINE_CDM_VERSION_STRING "unknown"
#define WIDEVINE_CDM_AVAILABLE
#endif // WIDEVINE_CDM_VERSION_H_
--- a/third_party/widevine/cdm/BUILD.gn
+++ b/third_party/widevine/cdm/BUILD.gn
@@ -11,7 +11,7 @@ import("//third_party/widevine/cdm/widev
# Internal Cast builds set enable_widevine=true to bring in Widevine support.
# TODO(xhwang): Support component updated CDM on other platforms and remove this
# assert.
-assert(!enable_widevine || is_win || is_mac || is_chromecast,
+assert(!enable_widevine || is_win || is_mac || is_chromecast || is_linux,
"Component updated CDM only supported on Windows and Mac for now.")
widevine_arch = current_cpu

23
chromium-widevine-r3.patch Normal file
View file

@ -0,0 +1,23 @@
From 5818fdbef3d399fe1bfbb56f81e59184e1a8e467 Mon Sep 17 00:00:00 2001
From: Mike Gilbert <floppymaster@gmail.com>
Date: Sun, 14 Oct 2018 20:04:03 -0400
Subject: [PATCH] Define WIDEVINE_CDM_VERSION_STRING
---
third_party/widevine/cdm/widevine_cdm_version.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/third_party/widevine/cdm/widevine_cdm_version.h b/third_party/widevine/cdm/widevine_cdm_version.h
index dd6efed02646..eaa017197e61 100644
--- a/third_party/widevine/cdm/widevine_cdm_version.h
+++ b/third_party/widevine/cdm/widevine_cdm_version.h
@@ -11,5 +11,6 @@
// If the Widevine CDM is available define the following:
// - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available
// as a string, e.g., "1.0.123.456").
+#define WIDEVINE_CDM_VERSION_STRING "unknown"
#endif // WIDEVINE_CDM_VERSION_H_
--
2.19.1