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

Updated to 72.0.3626.109

Browse source
This commit is contained in:
Алзим 2019-02-21 00:25:57 +03:00
parent 5868af726f
commit f3965398a9
12 changed files with 121 additions and 158 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:
chromium-71.0.3578.98.tar.xz: 5de8e48fc1f277afb16a7a484dfa0360e568632c
chromium-72.0.3626.109.tar.xz: 0a9ae5d4074e14fe480ff9a22aa18ca5709c609a
depot_tools.tar.xz: 082b7f9a4dfa7eb03900755b4866aef2d73543a5
icons.tar.bz2: a835954af164bf38f8ea4ea80608839bed7800a3
new-system-icons.tar.xz: 89339b8b3b05359a8745ed7968fe148902a2fa28

40
4849d9a.diff
View file

@ -1,40 +0,0 @@
From 4849d9a19f700961e2c25b642bdaaa6514040e60 Mon Sep 17 00:00:00 2001
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Date: Tue, 13 Nov 2018 15:41:11 +0000
Subject: [PATCH] gn bootstrap: Remove sysroot-related options
https://gn-review.googlesource.com/c/gn/+/3200 removed the --no-sysroot
option from gen.py and moved to only use a sysroot in the GN bots, so the
options here no longer have any effect.
Bug: 904350
Change-Id: Ieddc71a4f8f802c2d050de1c69ca3a9ec788ee88
Reviewed-on: https://chromium-review.googlesource.com/c/1333391
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
Cr-Commit-Position: refs/heads/master@{#607596}
---
diff -urN chromium-71.0.3578.80.orig/tools/gn/bootstrap/bootstrap.py chromium-71.0.3578.80/tools/gn/bootstrap/bootstrap.py
--- chromium-71.0.3578.80.orig/tools/gn/bootstrap/bootstrap.py 2018-12-06 13:12:43.154663185 +0300
+++ chromium-71.0.3578.80/tools/gn/bootstrap/bootstrap.py 2018-12-06 13:13:31.563300408 +0300
@@ -46,10 +46,6 @@
'--build-path',
help='The directory in which to build gn, '
'relative to the src directory. (eg. out/Release)')
- parser.add_option(
- '--with-sysroot',
- action='store_true',
- help='Download and build with the Debian sysroot.')
parser.add_option('-v', '--verbose', help='ignored')
parser.add_option(
'--skip-generate-buildfiles',
@@ -76,8 +72,6 @@
'--no-last-commit-position',
'--out-path=' + gn_build_dir,
]
- if not options.with_sysroot:
- cmd.append('--no-sysroot')
if options.debug:
cmd.append('--debug')
subprocess.check_call(cmd)

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

@ -9,22 +9,6 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/BUILD.gn.pdfium-system-libtiff
"PNG_PREFIX",
"PNG_USE_READ_MACROS",
]
@@ -668,6 +667,7 @@
deps = [
":fxcrt",
"third_party:lcms2",
+ "third_party:fx_libopenjpeg",
]
}
@@ -685,6 +685,7 @@
configs += [ ":pdfium_core_config" ]
deps = [
":fxcrt",
+ "third_party:fx_libopenjpeg",
]
}
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp
--- chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp.pdfium-system-libtiff-libpng 2017-06-22 00:04:10.000000000 +0200
+++ chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_tiffmodule.cpp 2017-06-24 00:05:50.524671846 +0200
@ -63,7 +47,7 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/cjpx_decode
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h.pdfium-system-libtiff-libpng 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 2017-06-24 00:05:50.521671902 +0200
@@ -15,7 +15,7 @@
@@ -10,7 +10,7 @@
#include <limits.h>
#include "core/fxcodec/jbig2/JBig2_Context.h"
@ -75,10 +59,10 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/codec_int.h
diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_jpxmodule.cpp.pdfium-system-libtiff-libpng chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_jpxmodule.cpp
--- chromium-70.0.3538.22/third_party/pdfium/core/fxcodec/codec/ccodec_jpxmodule.cpp.system-libjpeg 2018-09-19 21:13:26.000000000 +0200
+++ chromium-70.0.3538.22/third_party/pdfium/core/fxcodec/codec/ccodec_jpxmodule.cpp 2018-09-23 18:25:54.967260458 +0200
@@ -17,8 +17,12 @@
#include "core/fxcrt/fx_memory.h"
@@ -18,8 +18,12 @@
#include "core/fxcrt/fx_safe_types.h"
#include "third_party/base/ptr_util.h"
#include "third_party/base/stl_util.h"
-#include "third_party/libopenjpeg20/openjpeg.h"
-#include "third_party/libopenjpeg20/opj_malloc.h"
+#include <openjpeg.h>
@ -90,19 +74,19 @@ diff -up chromium-60.0.3112.40/third_party/pdfium/core/fxcodec/codec/ccodec_jpxm
namespace {
@@ -514,7 +518,7 @@
@@ -513,7 +517,7 @@
return false;
m_Image = pTempImage;
- m_Image->pdfium_use_colorspace = !!m_ColorSpace;
+// m_Image->pdfium_use_colorspace = !!m_ColorSpace;
return true;
}
if (!m_Parameters.nb_tile_to_decode) {
if (!opj_set_decode_area(m_Codec.Get(), m_Image.Get(), m_Parameters.DA_x0,
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-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn.orig
+++ chromium-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn
@@ -357,49 +357,14 @@
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
--- 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-60.0.3112.40/third_party/pdfium/third_party/BUILD.gn 2017-06-24 22:25:18.901585830 +0200
@@ -384,49 +384,14 @@
}
}
@ -157,7 +141,7 @@ diff -up chromium-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn.orig chro
}
config("system_libpng_config") {
@@ -479,61 +444,13 @@
@@ -506,62 +470,13 @@
}
}
@ -179,6 +163,7 @@ diff -up chromium-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn.orig chro
- }
- deps = [
- ":zlib",
- "../core/fxcrt",
- "//third_party:jpeg",
- ]
- sources = [
@ -224,3 +209,13 @@ diff -up chromium-71.0.3578.98/third_party/pdfium/third_party/BUILD.gn.orig chro
}
}
--- chromium-72.0.3626.81/third_party/pdfium/core/fpdfapi/render/BUILD.gn.system-openjpeg 2019-01-30 02:20:34.000000000 +0100
+++ chromium-72.0.3626.81/third_party/pdfium/core/fpdfapi/render/BUILD.gn 2019-02-02 18:30:28.065009708 +0100
@@ -52,6 +52,7 @@ jumbo_source_set("render") {
"../../../constants",
"../../fxcodec",
"../../fxcrt",
+ "../../../third_party:fx_libopenjpeg",
"../../fxge",
"../font",
"../page",

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

@ -80,18 +80,18 @@ 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
--- 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
@@ -80,6 +80,10 @@
{"vorbis", MimeUtil::VORBIS}, {"opus", MimeUtil::OPUS},
{"flac", MimeUtil::FLAC}, {"vp8", MimeUtil::VP8},
{"vp8.0", MimeUtil::VP8}, {"theora", MimeUtil::THEORA},
+ {"dts", MimeUtil::DTS},
+ {"mp2", MimeUtil::MP2},
+ {"mp4v.20.8", MimeUtil::MPEG4_SP},
+ {"mp4v.20.240", MimeUtil::MPEG4_ASP},
},
base::KEEP_FIRST_OF_DUPES));
@@ -87,6 +87,10 @@
{"vp8", MimeUtil::VP8},
{"vp8.0", MimeUtil::VP8},
{"theora", MimeUtil::THEORA},
+ {"dts", MimeUtil::DTS},
+ {"mp2", MimeUtil::MP2},
+ {"mp4v.20.8", MimeUtil::MPEG4_SP},
+ {"mp4v.20.240", MimeUtil::MPEG4_ASP},
});
@@ -172,6 +176,9 @@
return *kStringToCodecMap;
@@ -184,6 +188,9 @@
return kCodecTheora;
case MimeUtil::DOLBY_VISION:
return kCodecDolbyVision;
@ -101,7 +101,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
default:
break;
}
@@ -266,6 +273,32 @@
@@ -278,6 +285,32 @@
CodecSet ogg_codecs(ogg_audio_codecs);
ogg_codecs.insert(ogg_video_codecs.begin(), ogg_video_codecs.end());
@ -134,7 +134,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
const CodecSet webm_audio_codecs{OPUS, VORBIS};
CodecSet webm_video_codecs{VP8, VP9};
#if BUILDFLAG(ENABLE_AV1_DECODER)
@@ -302,6 +335,8 @@
@@ -313,6 +346,8 @@
#endif // BUILDFLAG(ENABLE_MPEG_H_AUDIO_DEMUXING)
mp4_video_codecs.emplace(H264);
@ -143,7 +143,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
#if BUILDFLAG(ENABLE_HEVC_DEMUXING)
mp4_video_codecs.emplace(HEVC);
#endif // BUILDFLAG(ENABLE_HEVC_DEMUXING)
@@ -339,12 +374,16 @@
@@ -349,12 +384,16 @@
DCHECK(!mp4_video_codecs.empty());
AddContainerWithCodecs("video/mp4", mp4_codecs, false);
@ -160,7 +160,7 @@ diff -up chromium-62.0.3192.0/media/base/mime_util_internal.cc.extra-media chrom
#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
CodecSet mp2t_codecs{H264, MPEG2_AAC, MPEG4_AAC, MP3};
@@ -965,10 +1004,14 @@
@@ -962,10 +1001,14 @@
case H264:
case HEVC:
case DOLBY_VISION:
@ -217,22 +217,22 @@ diff -up chromium-62.0.3192.0/media/ffmpeg/ffmpeg_common.cc.extra-media chromium
diff -up chromium-62.0.3192.0/media/filters/ffmpeg_video_decoder.cc.extra-media chromium-62.0.3192.0/media/filters/ffmpeg_video_decoder.cc
--- chromium-62.0.3192.0/media/filters/ffmpeg_video_decoder.cc.extra-media 2017-08-22 21:04:45.000000000 +0200
+++ chromium-62.0.3192.0/media/filters/ffmpeg_video_decoder.cc 2017-08-30 15:39:09.736186059 +0200
@@ -59,7 +59,6 @@
case kUnknownVideoCodec:
case kCodecVC1:
case kCodecMPEG2:
- case kCodecHEVC:
case kCodecVP9:
case kCodecAV1:
case kCodecDolbyVision:
@@ -73,6 +72,7 @@
case kCodecH264:
case kCodecMPEG4:
case kCodecVP8:
+ case kCodecHEVC:
// Normalize to three threads for 1080p content, then scale linearly
// with number of pixels.
// Examples:
@@ -38,7 +38,6 @@
case kUnknownVideoCodec:
case kCodecVC1:
case kCodecMPEG2:
- case kCodecHEVC:
case kCodecVP9:
case kCodecAV1:
case kCodecDolbyVision:
@@ -52,6 +51,7 @@
case kCodecH264:
case kCodecVP8:
+ case kCodecHEVC:
// Normalize to three threads for 1080p content, then scale linearly
// with number of pixels.
// Examples:
diff -up chromium-62.0.3192.0/media/remoting/proto_enum_utils.cc.extra-media chromium-62.0.3192.0/media/remoting/proto_enum_utils.cc
--- chromium-62.0.3192.0/media/remoting/proto_enum_utils.cc.extra-media 2017-08-22 21:04:45.000000000 +0200
+++ chromium-62.0.3192.0/media/remoting/proto_enum_utils.cc 2017-08-30 15:39:09.736186059 +0200

2
chromium-61-gcc5.patch
View file

@ -6,6 +6,6 @@
-#include <math.h>
+#include <cmath>
#include <algorithm>
#include <numeric>
#include <vector>

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

@ -1,13 +1,3 @@
--- chromium-62.0.3202.75/third_party/pdfium/fxbarcode/common/BC_CommonBitArray.h-orig
+++ chromium-62.0.3202.75/third_party/pdfium/fxbarcode/common/BC_CommonBitArray.h
@@ -8,6 +8,7 @@
#include <stdint.h>
#include <vector>
+#include <cstdlib>
class CBC_CommonBitArray {
public:
--- 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
@@ -8,6 +8,8 @@

4
chromium-68.0.3440.106-rosa-user-agent.patch
View file

@ -5,8 +5,8 @@ diff -up chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent c
#elif defined(OS_MACOSX)
"Macintosh; ";
#elif defined(USE_X11) || defined(USE_OZONE)
- "X11; "; // strange, but that's what Firefox uses
+ "X11; OS ROSA; "; // strange, but that's what Firefox uses
- "X11; "; // strange, but that's what Firefox uses
+ "X11; OS ROSA; "; // strange, but that's what Firefox uses
#elif defined(OS_ANDROID)
"Linux; ";
#elif defined(OS_POSIX) || defined(OS_FUCHSIA)

11
chromium-72-i586.patch Normal file
View file

@ -0,0 +1,11 @@
--- chromium-72.0.3626.96/third_party/blink/renderer/core/fetch/multipart_parser.cc.i586 2019-02-06 23:06:47.000000000 +0100
+++ chromium-72.0.3626.96/third_party/blink/renderer/core/fetch/multipart_parser.cc 2019-02-18 08:53:30.267915984 +0100
@@ -299,7 +299,7 @@ bool MultipartParser::ParseHeaderFields(
HTTPHeaderMap* header_fields) {
// Combine the current bytes with buffered header bytes if needed.
const char* header_bytes = *bytes_pointer;
- if ((bytes_end - *bytes_pointer) > std::numeric_limits<wtf_size_t>::max())
+ if (uintptr_t(bytes_end - *bytes_pointer) > std::numeric_limits<wtf_size_t>::max())
return false;
wtf_size_t header_size = static_cast<wtf_size_t>(bytes_end - *bytes_pointer);

33
chromium-browser-stable.spec
View file

@ -34,7 +34,7 @@
Summary: A fast web browser based on the Blink engine
Name: chromium-browser-stable
Version: 71.0.3578.98
Version: 72.0.3626.109
Release: 1
License: BSD, LGPL
Group: Networking/WWW
@ -69,6 +69,8 @@ Patch35: chromium-50-system-ffmpeg-3.patch
Patch36: chromium-58-glib.patch
# clang builtin subtract functions, scoped enum
Patch47: chromium-61-gcc5.patch
# (cjw) fix i586 build
Patch198: chromium-72-i586.patch
# New from Debian
Patch500: chromium-third-party-cookies-off-by-default.patch
@ -84,8 +86,8 @@ Patch504: chromium-system-icu-r0.patch
# https://aur.archlinux.org/packages/chromium-vaapi/
Patch508: chromium-vaapi-r21.patch
# ftp://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/chromium-widevine-r3.patch
Patch509: chromium-widevine-r3.patch
# ftp://mirror.yandex.ru/gentoo-portage/www-client/chromium/files/chromium-widevine-r4.patch
Patch509: chromium-widevine-r4.patch
# ROSA Build
Patch600: chromium-buildname-60.0.3112.90.patch
@ -110,8 +112,6 @@ Patch631: chromium-69.0.3497.100-build-error-in-clang6.patch
Patch700: chromium-70.0.3538.77-no-system-nodejs.patch
# Disable fontconfig cache magic that breaks remoting
Patch717: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch
# gn bootstrap: Remove sysroot-related options
Patch718: 4849d9a.diff
Provides: %{crname} = %{EVRD}
Conflicts: chromium-browser-unstable
@ -139,6 +139,7 @@ BuildRequires: yasm
BuildRequires: atomic-devel
BuildRequires: bzip2-devel
BuildRequires: cap-devel
#BuildRequires: closure-compiler
BuildRequires: cups-devel
BuildRequires: elfutils-devel
BuildRequires: jpeg-devel
@ -164,7 +165,7 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(gnome-keyring-1)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0)
BuildRequires: pkgconfig(gtk+-2.0)
#BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtk+-3.0)
BuildRequires: pkgconfig(harfbuzz)
%if 0%{icu}
@ -185,6 +186,7 @@ BuildRequires: pkgconfig(libxslt)
%if 0%{?libva}
BuildRequires: pkgconfig(libva)
%endif
BuildRequires: pkgconfig(glesv2)
BuildRequires: pkgconfig(minizip)
BuildRequires: pkgconfig(nspr)
BuildRequires: pkgconfig(nss)
@ -305,6 +307,7 @@ members of the Chromium and WebDriver teams.
%endif
%patch36 -p1
%patch47 -p1
%patch198 -p1
# new from debian
%patch500 -p1
@ -341,7 +344,6 @@ members of the Chromium and WebDriver teams.
%endif
%patch717 -p1
%patch718 -p1
mkdir -p third_party/llvm-build/Release+Asserts/bin
pushd third_party/llvm-build/Release+Asserts/bin
@ -372,13 +374,12 @@ build/linux/unbundle/remove_bundled_libraries.py \
'net/third_party/quic' \
'net/third_party/spdy' \
'net/third_party/uri_template' \
'third_party/WebKit' \
'third_party/abseil-cpp' \
'third_party/adobe' \
'third_party/analytics' \
'third_party/angle' \
'third_party/angle/src/common/third_party/base' \
'third_party/angle/src/common/third_party/smhasher' \
'third_party/angle/src/common/third_party/xxhash' \
'third_party/angle/src/third_party/compiler' \
'third_party/angle/src/third_party/libXNVCtrl' \
'third_party/angle/src/third_party/trace_event' \
@ -413,6 +414,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/catapult/tracing/third_party/pako' \
'third_party/ced' \
'third_party/cld_3' \
'third_party/closure_compiler' \
'third_party/crashpad' \
'third_party/crashpad/crashpad/third_party/zlib/' \
'third_party/crc32c' \
@ -427,7 +429,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/flot' \
'third_party/fontconfig' \
'third_party/freetype' \
'third_party/glslang-angle' \
'third_party/glslang' \
'third_party/google_input_tools' \
'third_party/google_input_tools/third_party/closure_library' \
'third_party/google_input_tools/third_party/closure_library/third_party/closure' \
@ -472,6 +474,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/mesa' \
'third_party/metrics_proto' \
'third_party/modp_b64' \
'third_party/nasm' \
'third_party/node' \
'third_party/node/linux' \
'third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2' \
@ -512,7 +515,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/speech-dispatcher' \
'third_party/spirv-headers' \
'third_party/SPIRV-Tools' \
'third_party/spirv-tools-angle' \
'third_party/sqlite' \
'third_party/swiftshader' \
'third_party/swiftshader/third_party/subzero' \
@ -524,7 +526,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/usb_ids' \
'third_party/usrsctp' \
'third_party/vulkan' \
'third_party/vulkan-validation-layers' \
'third_party/web-animations-js' \
'third_party/webdriver' \
'third_party/webrtc' \
@ -601,7 +602,7 @@ third_party/node/update_npm_deps
%define is_widevine false
%endif
%define lld 1
%define lld 0
%if 0%{lld}
%define is_lld true
%define use_gold false
@ -612,9 +613,9 @@ third_party/node/update_npm_deps
# jumbo https://chromium.googlesource.com/chromium/src/+/master/docs/jumbo.md
# (Alzim) 1 - localhost, 0 - ABF build
%define localhost 0
%define localhost 1
%if 0%{localhost}
%define is_limit 175
%define is_limit 150
%else
%define is_limit 8
%endif
@ -651,6 +652,8 @@ third_party/node/update_npm_deps
use_aura=true \
use_libpci = true \
is_debug=false \
gtk_version=3 \
closure_compile=false \
is_clang=%{is_clang} \
clang_use_chrome_plugins=false \
clang_base_path="%{_prefix}" \

17
chromium-compiler-r4.patch
View file

@ -27,17 +27,18 @@
}
# Print absolute paths in diagnostics. There is no precedent for doing this
@@ -1499,10 +1486,6 @@
# TODO(thakis): https://crbug.com/753973
"-Wno-enum-compare-switch",
@@ -1475,11 +1475,6 @@
if (current_toolchain == host_toolchain || !use_xcode_clang) {
# Flags NaCl (Clang 3.7) and Xcode 9.2 (Clang clang-900.0.39.2) do not
# recognize.
- cflags += [
- # Ignore warnings about MSVC optimization pragmas.
- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314
- "-Wno-ignored-pragma-optimize",
-
# TODO(hans): https://crbug.com/890307
"-Wno-defaulted-function-deleted",
]
- ]
if (is_fuchsia) {
cflags += [
# TODO(hans): https://crbug.com/890307
@@ -1545,22 +1528,6 @@
"__STDC_CONSTANT_MACROS",
"__STDC_FORMAT_MACROS",

23
chromium-widevine-r3.patch
View file

@ -1,23 +0,0 @@
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

26
chromium-widevine-r4.patch Normal file
View file

@ -0,0 +1,26 @@
Define WIDEVINE_CDM_VERSION_STRING && re-re-re-patch for latest ninja
Stolen from Arch basically.
gmt
--- a/chrome/common/chrome_content_client.cc
+++ b/chrome/common/chrome_content_client.cc
@@ -99,7 +99,7 @@
// Registers Widevine CDM if Widevine is enabled, the Widevine CDM is
// bundled and not a component. When the Widevine CDM is a component, it is
// registered in widevine_cdm_component_installer.cc.
-#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
+#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
#define REGISTER_BUNDLED_WIDEVINE_CDM
#include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck
// TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support
--- 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_