diff --git a/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch b/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch deleted file mode 100644 index f73ded3..0000000 --- a/0001-vpx_sum_squares_2d_i16_neon-Make-s2-a-uint64x1_t.patch +++ /dev/null @@ -1,54 +0,0 @@ -Upstream-Status: Submitted - -GCC aarch64 build fix [this is actually a libvpx patch, not a Chromium one] - -Sent to: https://chromium-review.googlesource.com/c/webm/libvpx/+/1136449 - -Signed-off-by: Raphael Kubo da Costa ---- -From c20bd394f18c47bf133b51d6a40399273c3f24e0 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Fri, 13 Jul 2018 14:29:09 +0200 -Subject: [PATCH] vpx_sum_squares_2d_i16_neon(): Make |s2| a uint64x1_t. - -This fixes the build with at least GCC 7.3, where it was previously failing -with: - -../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c: In function 'vpx_sum_squares_2d_i16_neon': -../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c:34:5: note: use -flax-vector-conversions to permit conversions between vectors with differing element types or numbers of subparts - s2 = vpaddl_u32(s1); - ^~ -../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c:34:8: error: incompatible types when assigning to type 'int64x1_t' from type 'uint64x1_t' - s2 = vpaddl_u32(s1); - ^ -../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c:81:8: error: incompatible types when assigning to type 'int64x1_t' from type 'uint64x1_t' - s2 = vadd_u64(vget_low_u64(s1), vget_high_u64(s1)); - ^ -../../third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c:84:24: error: incompatible type for argument 1 of 'vget_lane_u64' - return vget_lane_u64(s2, 0); - ^~ - -The generated assembly was verified to remain identical with both GCC and -LLVM. - -Change-Id: I2778428ee1fee0a674d0d4910347c2a717de21ac ---- - vpx_dsp/arm/sum_squares_neon.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/vpx_dsp/arm/sum_squares_neon.c b/vpx_dsp/arm/sum_squares_neon.c -index 8942ba83b..cfefad993 100644 ---- a/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c -+++ b/third_party/libvpx/source/libvpx/vpx_dsp/arm/sum_squares_neon.c -@@ -14,7 +14,7 @@ - #include "./vpx_dsp_rtcd.h" - - uint64_t vpx_sum_squares_2d_i16_neon(const int16_t *src, int stride, int size) { -- int64x1_t s2; -+ uint64x1_t s2; - - if (size == 4) { - int16x4_t s[4]; --- -2.14.4 - diff --git a/chromium-46.0.2490.71-notest.patch b/chromium-46.0.2490.71-notest.patch deleted file mode 100644 index e4e3448..0000000 --- a/chromium-46.0.2490.71-notest.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd.notest chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd ---- chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd.notest 2015-10-16 02:01:56.644149741 -0400 -+++ chromium-46.0.2490.71/chrome/test/data/webui_test_resources.grd 2015-10-16 02:02:36.217285227 -0400 -@@ -8,7 +8,6 @@ - - - -- - - - diff --git a/chromium-52.0.2743.116-unset-madv_free.patch b/chromium-52.0.2743.116-unset-madv_free.patch deleted file mode 100644 index 2867c79..0000000 --- a/chromium-52.0.2743.116-unset-madv_free.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp ---- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free 2016-08-15 13:07:29.279655676 -0400 -+++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-15 13:08:38.447317416 -0400 -@@ -41,6 +41,11 @@ - #include - #include - -+#if OS(LINUX) && defined(MADV_FREE) -+// Added in Linux 4.5, but it breaks the sandbox. -+#undef MADV_FREE -+#endif -+ - #ifndef MADV_FREE - #define MADV_FREE MADV_DONTNEED - #endif diff --git a/chromium-52.0.2743.82-arm-webrtc.patch b/chromium-52.0.2743.82-arm-webrtc.patch deleted file mode 100644 index f1a6629..0000000 --- a/chromium-52.0.2743.82-arm-webrtc.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff -up chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc.armwebrtc chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc ---- chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc.armwebrtc 2016-08-03 09:30:53.922861020 +0200 -+++ chromium-52.0.2743.82/third_party/webrtc/system_wrappers/source/cpu_features.cc 2016-08-03 09:32:00.337498174 +0200 -@@ -18,6 +18,47 @@ - - #include "webrtc/typedefs.h" - -+#include -+#ifdef __arm__ -+#include -+#include -+#include -+#include -+#endif -+ -+#ifdef __arm__ -+uint64_t WebRtc_GetCPUFeaturesARM() { -+ static bool detected = false; -+ static uint64_t have_neon = 0; -+ -+ int fd; -+ Elf32_auxv_t auxv; -+ unsigned int hwcaps; -+ -+ if (!detected) { -+ int fd; -+ Elf32_auxv_t auxv; -+ unsigned int hwcaps; -+ -+ fd = open("/proc/self/auxv", O_RDONLY); -+ if (fd >= 0) { -+ while (read(fd, &auxv, sizeof(Elf32_auxv_t)) == sizeof(Elf32_auxv_t)) { -+ if (auxv.a_type == AT_HWCAP) { -+ have_neon = (auxv.a_un.a_val & HWCAP_NEON) ? kCPUFeatureNEON : 0; -+ break; -+ } -+ } -+ close (fd); -+ } else { -+ have_neon = 0; -+ } -+ detected = true; -+ } -+ -+ return 0 | have_neon; // others here as we need them -+} -+#endif -+ - // No CPU feature is available => straight C path. - int GetCPUInfoNoASM(CPUFeature feature) { - (void)feature; diff --git a/chromium-52.0.2743.82-master-prefs-path.patch b/chromium-52.0.2743.82-master-prefs-path.patch deleted file mode 100644 index 6ddd26f..0000000 --- a/chromium-52.0.2743.82-master-prefs-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc.etc chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc ---- chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc.etc 2016-08-03 10:15:57.980692109 +0200 -+++ chromium-52.0.2743.82/chrome/browser/first_run/first_run_internal_linux.cc 2016-08-03 10:16:44.553325229 +0200 -@@ -19,9 +19,9 @@ bool IsOrganicFirstRun() { - - base::FilePath MasterPrefsPath() { - // The standard location of the master prefs is next to the chrome binary. -+ // ...but we patch it to use /etc/chromium - base::FilePath master_prefs; -- if (!PathService::Get(base::DIR_EXE, &master_prefs)) -- return base::FilePath(); -+ master_prefs = base::FilePath("/etc/chromium"); - return master_prefs.AppendASCII(installer::kDefaultMasterPrefs); - } - diff --git a/chromium-55.0.2883.75-sandbox-pie.patch b/chromium-55.0.2883.75-sandbox-pie.patch deleted file mode 100644 index 6aae0b0..0000000 --- a/chromium-55.0.2883.75-sandbox-pie.patch +++ /dev/null @@ -1,30 +0,0 @@ -diff -up chromium-55.0.2883.75/sandbox/linux/BUILD.gn.sandboxpie chromium-55.0.2883.75/sandbox/linux/BUILD.gn ---- chromium-55.0.2883.75/sandbox/linux/BUILD.gn.sandboxpie 2016-12-01 18:02:17.000000000 -0500 -+++ chromium-55.0.2883.75/sandbox/linux/BUILD.gn 2016-12-12 16:26:06.863426221 -0500 -@@ -279,11 +279,17 @@ if (is_linux) { - # For ULLONG_MAX - "-std=gnu99", - -+ "-fPIE", -+ - # These files have a suspicious comparison. - # TODO fix this and re-enable this warning. - "-Wno-sign-compare", - ] - -+ ldflags = [ -+ "-pie", -+ ] -+ - import("//build/config/compiler/compiler.gni") - import("//build/config/sanitizers/sanitizers.gni") - if (is_component_build || using_sanitizer) { -@@ -293,7 +299,7 @@ if (is_linux) { - # other flags that executable_config might have. - configs -= [ "//build/config:executable_config" ] - if (!use_gold) { -- ldflags = [ "-Wl,--disable-new-dtags" ] -+ ldflags += [ "-Wl,--disable-new-dtags" ] - } - } - diff --git a/chromium-56.0.2924.87-fpermissive.patch b/chromium-56.0.2924.87-fpermissive.patch deleted file mode 100644 index be68cf9..0000000 --- a/chromium-56.0.2924.87-fpermissive.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn.permissive chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn ---- chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn.permissive 2017-02-13 12:32:23.419665971 -0500 -+++ chromium-56.0.2924.87/third_party/WebKit/Source/BUILD.gn 2017-02-13 12:33:16.146629190 -0500 -@@ -54,6 +54,9 @@ config("config") { - cflags = [] - defines = [] - -+ # error: there are no arguments to 'swapAnchor' that depend on a template parameter, so a declaration of 'swapAnchor' must be available [-fpermissive] -+ cflags += [ "-fpermissive" ] -+ - if (is_win) { - cflags += [ - "/wd4305", # Truncation from 'type1' to 'type2'. diff --git a/chromium-56.0.2924.87-gcc5.patch b/chromium-56.0.2924.87-gcc5.patch deleted file mode 100644 index 902f92b..0000000 --- a/chromium-56.0.2924.87-gcc5.patch +++ /dev/null @@ -1,354 +0,0 @@ -diff -up chromium-56.0.2924.87/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-56.0.2924.87/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc ---- chromium-56.0.2924.87/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 2017-02-01 21:03:47.000000000 -0500 -+++ chromium-56.0.2924.87/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc 2017-02-09 10:38:38.319790897 -0500 -@@ -165,8 +165,8 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - // state[16 + 2] 0x000000 Byte 2 of 3 (relative offsets) - X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, - X__,X__,X__,X__,X__,X__,X__,X__, X__,X__,X__,X__,X__,X__,X__,X__, ---14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14, ---14,-14,-14,-14,-14,-14,-14,-14, -14,-14,-14,-14,-14,-14,-14,-14, -+(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, -+(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, (uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14,(uint8)-14, - - // state[17 + 2] 0x0031c0 Byte 3 of 3 (property) - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -@@ -259,10 +259,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 229,229,229, 3,208, 0,229, 5, 233, 0,229,229,229,208,229,229, - - // state[32 + 2] 0x002000 Byte 2 of 3 (relative offsets) ---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30, ---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30, ---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30, ---30,-30,-30,-30,-30,-30,-30,-30, -30,-30,-30,-30,-30,-30,-30,-30, -+(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, -+(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, -+(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, -+(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, (uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30,(uint8)-30, - - // state[33 + 2] 0x003780 Byte 3 of 3 (property) - 229,208,229,229,208,229,229,229, 208,208,208,208,208, 4, 6,208, -@@ -355,10 +355,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 228,229,229,229,229,233,233, 6, 208,229, 3,229,233, 6, 6, 0, - - // state[48 + 2] 0x001000 Byte 2 of 3 (relative offsets) ---46,-46,-46,-46,-42,-41,-40,-39, -46,-46,-46,-46,-46,-46,-46,-46, ---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46, ---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46, ---46,-46,-46,-46,-46,-46,-46,-46, -46,-46,-46,-46,-46,-46,-46,-46, -+(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, -+(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, -+(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, -+(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, (uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46,(uint8)-46, - - // state[49 + 2] 0x003b40 Byte 3 of 3 (property) - 6,227,208,233,208, 3, 3,208, 208,229, 0,229,233,219, 0, 6, -@@ -451,10 +451,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 229,208,208,208,217,208,229,229, 229,229,208,217,208,229,229,229, - - // state[64 + 2] 0x003000 Byte 2 of 3 (relative offsets) ---54,-53,-52,-51,-50,-58,-49,-47, -62,-62,-62,-62,-62,-62,-62,-62, ---46,-45,-44,-43,-42,-41,-40,-39, -38,-37,-36,-35,-34,-33,-31,-30, ---29,-28,-27,-26,-25,-24,-23,-22, -21,-20,-19,-18,-17,-15,-14,-13, ---12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, -+(uint8)-54,(uint8)-53,(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-58,(uint8)-49,(uint8)-47, (uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62,(uint8)-62, -+(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39, (uint8)-38,(uint8)-37,(uint8)-36,(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30, -+(uint8)-29,(uint8)-28,(uint8)-27,(uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22, (uint8)-21,(uint8)-20,(uint8)-19,(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13, -+(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, - - // state[65 + 2] 0x003f00 Byte 3 of 3 (property) - 217,217,208, 3,208,217,208,208, 6,229,208,228,229,229,208,229, -@@ -547,10 +547,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 229,208,229,229,208,229,233, 0, 208,208,229,208,227,229,229,229, - - // state[80 + 2] 0x004000 Byte 2 of 3 (relative offsets) ---11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, -+(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, -- 38, 39, 40, 41, 42, 43, 44,-78, 45, 46, 47, 48, 49, 50, 51, 52, -+ 38, 39, 40, 41, 42, 43, 44,(uint8)-78, 45, 46, 47, 48, 49, 50, 51, 52, - - // state[81 + 2] 0x0042c0 Byte 3 of 3 (property) - 229, 0,229,229,229, 3, 4, 4, 229,229,229,229,208,229, 0,208, -@@ -931,7 +931,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 0,142, 98, 28,117,206,212,212, 220, 15, 0,231,199,231,111, 28, - - // state[144 + 2] 0x005000 Byte 2 of 3 (relative offsets) ---11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, -+(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, -@@ -1315,7 +1315,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 16, 15,211,118, 0,231, 68,231, 0, 99,161, 0,115,221,144,140, - - // state[208 + 2] 0x006000 Byte 2 of 3 (relative offsets) ---10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, -+(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, -@@ -1699,7 +1699,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 119, 16, 51, 0, 0, 68,136, 72, 144,118, 87,201,191,136, 78,233, - - // state[272 + 2] 0x007000 Byte 2 of 3 (relative offsets) -- -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, -+ (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, -@@ -2083,7 +2083,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 212,212, 0,126,140,220,220, 0, 0, 0,127,118,106, 0,199, 0, - - // state[336 + 2] 0x008000 Byte 2 of 3 (relative offsets) -- -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, -+ (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, -@@ -2467,7 +2467,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 0,122, 0,231,100,232, 0, 0, 117, 0,206,231, 0, 0,231, 0, - - // state[400 + 2] 0x009000 Byte 2 of 3 (relative offsets) -- -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, -+ (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, - 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, - 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, -@@ -2851,10 +2851,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - - // state[464 + 2] 0x00a000 Byte 2 of 3 (relative offsets) -- -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -- -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -- -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -6, -- -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -5, -+ (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, -+ (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, -+ (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, (uint8)-6, -+ (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, (uint8)-5, - - // state[465 + 2] 0x000080 Byte 2 of 2 (property) - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -@@ -2947,10 +2947,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 208,208,208,208, 5, 6,208, 2, 0, 6, 6, 5,208,208,208, 6, - - // state[480 + 2] 0x00b000 Byte 2 of 3 (relative offsets) ---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20, ---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20, ---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20, ---20,-20,-20,-20,-20,-20,-20,-20, -20,-20,-20,-20,-20,-20,-20,-20, -+(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, -+(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, -+(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, -+(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, (uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20,(uint8)-20, - - // state[481 + 2] 0x020100 Byte 4 of 4 (property) - 2, 6, 5, 6, 5,229, 5,208, 208,208,208,208,208,208,208,229, -@@ -3043,10 +3043,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 208,208, 5, 5, 5,208,208, 2, 229, 5, 5, 5, 5, 5, 6,208, - - // state[496 + 2] 0x00d000 Byte 2 of 3 (relative offsets) ---35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-35,-35, ---35,-35,-35,-35,-35,-35,-35,-35, -35,-35,-35,-35,-35,-35,-34,-33, ---33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33, ---33,-33,-33,-33,-33,-33,-33,-33, -33,-33,-33,-33,-33,-33,-33,-33, -+(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, -+(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35, (uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-35,(uint8)-34,(uint8)-33, -+(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, -+(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, (uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33,(uint8)-33, - - // state[497 + 2] 0x0204c0 Byte 4 of 4 (property) - 2, 2, 5, 5, 5, 2,208, 2, 5, 5, 6,208,208, 5, 5, 5, -@@ -3139,10 +3139,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 208,208, 5, 5, 5, 5, 6, 6, 208,208, 2,208,208,208,208,208, - - // state[512 + 2] 0x00f000 Byte 2 of 3 (relative offsets) ---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47, ---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-47,-47,-47, ---47,-47,-47,-47,-46,-45,-44,-43, -42,-41,-44,-40,-47,-47,-47,-47, ---47,-47,-47,-47,-47,-47,-47,-47, -47,-47,-47,-47,-47,-39,-38,-37, -+(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, -+(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, -+(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44,(uint8)-43, (uint8)-42,(uint8)-41,(uint8)-44,(uint8)-40,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, -+(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47, (uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-47,(uint8)-39,(uint8)-38,(uint8)-37, - - // state[513 + 2] 0x020880 Byte 4 of 4 (property) - 5, 5, 5, 6,208,208,208,208, 208,208, 5, 5, 6, 6,208,208, -@@ -3235,10 +3235,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 5, 6,208,218,208,208,208,218, 208, 6,227,229, 6, 6, 6,208, - - // state[528 + 2] 0x020000 Byte 3 of 4 (relative offsets) ---52,-51,-50,-49,-47,-46,-45,-44, -43,-42,-41,-40,-39,-38,-37,-36, ---35,-34,-33,-31,-30,-29,-28,-27, -26,-25,-24,-23,-22,-21,-20,-19, ---18,-17,-15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -- -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -+(uint8)-52,(uint8)-51,(uint8)-50,(uint8)-49,(uint8)-47,(uint8)-46,(uint8)-45,(uint8)-44, (uint8)-43,(uint8)-42,(uint8)-41,(uint8)-40,(uint8)-39,(uint8)-38,(uint8)-37,(uint8)-36, -+(uint8)-35,(uint8)-34,(uint8)-33,(uint8)-31,(uint8)-30,(uint8)-29,(uint8)-28,(uint8)-27, (uint8)-26,(uint8)-25,(uint8)-24,(uint8)-23,(uint8)-22,(uint8)-21,(uint8)-20,(uint8)-19, -+(uint8)-18,(uint8)-17,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, -+ (uint8)-1, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, - - // state[529 + 2] 0x020c40 Byte 4 of 4 (property) - 227, 5, 5, 5, 2, 2, 2, 2, 213, 2, 2, 2, 2, 2,208, 6, -@@ -3427,7 +3427,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 208,208,208,208,208,208,208,208, 208, 6, 6, 6, 6, 2, 5, 5, - - // state[560 + 2] 0x021000 Byte 3 of 4 (relative offsets) ---16,-15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, -+(uint8)-16,(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, - 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, -@@ -3811,7 +3811,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 5, 5, 5, 6, 6, 6, 5,208, 208,229,208,208, 5, 5, 5, 5, - - // state[624 + 2] 0x022000 Byte 3 of 4 (relative offsets) ---15,-14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, -+(uint8)-15,(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, - 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, - 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, -@@ -4195,7 +4195,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 6, 6, 4, 5,208,208,208,208, 208,208,229, 6, 5, 6, 6, 6, - - // state[688 + 2] 0x023000 Byte 3 of 4 (relative offsets) ---14,-13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, -+(uint8)-14,(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, - 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, - 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, - 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, -@@ -4579,7 +4579,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 5, 5, 5, 5, 5, 5, 5, 6, 208,208,208,208,208,208, 6, 6, - - // state[752 + 2] 0x024000 Byte 3 of 4 (relative offsets) ---13,-12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, -+(uint8)-13,(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, - 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, - 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, - 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, -@@ -4963,7 +4963,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 229, 6, 2, 2, 2, 2, 2, 2, 2, 2, 2, 5, 2, 2, 6,229, - - // state[816 + 2] 0x025000 Byte 3 of 4 (relative offsets) ---12,-11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, -+(uint8)-12,(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, - 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, - 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, - 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, -@@ -5347,7 +5347,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 6, 6, 6, 5, 5, 5, 5, 6, 6, 6, 3, 6,229,208,208,229, - - // state[880 + 2] 0x026000 Byte 3 of 4 (relative offsets) ---11,-10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, -+(uint8)-11,(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, - 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, - 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, -@@ -5731,7 +5731,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 208, 6, 6,208,208,208,208,208, 6, 6, 6,216, 5, 5, 5, 5, - - // state[944 + 2] 0x027000 Byte 3 of 4 (relative offsets) ---10, -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, -+(uint8)-10, (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, 6, - 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, - 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, - 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, -@@ -6115,7 +6115,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 5, 5, 5, 6,208,208, 6, 6, 208,229,208,208,208, 5, 5, 5, - - // state[1008 + 2] 0x028000 Byte 3 of 4 (relative offsets) -- -9, -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, -+ (uint8)-9, (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, 6, 7, - 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, - 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, -@@ -6499,7 +6499,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 208,208, 5, 5, 6,208,208, 5, 208,208,208, 6,208, 6,208,208, - - // state[1072 + 2] 0x029000 Byte 3 of 4 (relative offsets) -- -8, -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, -+ (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, 6, 7, 8, - 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, - 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, -@@ -6883,7 +6883,7 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 229,229,229,229,208,208,208,229, 208,208,208,229, 0,229,208,208, - - // state[1136 + 2] 0x02a000 Byte 3 of 4 (relative offsets) -- -7, -6, -5, -4, -3, -2, -1, 1, 2, 3, 4, 5, 6, 7, 8, 9, -+ (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, 2, 3, 4, 5, 6, 7, 8, 9, - 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 22, 22, 22, - 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, - 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, -@@ -7075,10 +7075,10 @@ X__,X__,X__,X__,X__,X__,X__,X__, X__,X__ - 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, - - // state[1168 + 2] 0x02f000 Byte 3 of 4 (relative offsets) -- -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -- -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -- -8, -7, -6, -5, -4, -3, -2, -1, 1, -9, -9, -9, -9, -9, -9, -9, -- -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -9, -+ (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, -+ (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, -+ (uint8)-8, (uint8)-7, (uint8)-6, (uint8)-5, (uint8)-4, (uint8)-3, (uint8)-2, (uint8)-1, 1, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, -+ (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, (uint8)-9, - - // state[1169 + 2] 0x02fa00 Byte 4 of 4 (property) - 217, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,217, 5, 5, -diff -up chromium-56.0.2924.87/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-56.0.2924.87/third_party/webgl/src/specs/latest/2.0/webgl2.idl ---- chromium-56.0.2924.87/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 2017-02-01 21:03:57.000000000 -0500 -+++ chromium-56.0.2924.87/third_party/webgl/src/specs/latest/2.0/webgl2.idl 2017-02-09 10:38:38.380789675 -0500 -@@ -265,7 +265,7 @@ interface WebGL2RenderingContextBase - const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43; - const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44; - const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46; -- const GLenum INVALID_INDEX = 0xFFFFFFFF; -+ const GLenum INVALID_INDEX = 256; - const GLenum MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122; - const GLenum MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125; - const GLenum MAX_SERVER_WAIT_TIMEOUT = 0x9111; -diff -up chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.h ---- chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 2017-02-01 21:03:09.000000000 -0500 -+++ chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.h 2017-02-09 10:38:38.387789535 -0500 -@@ -49,7 +49,7 @@ class NodeFilter final : public GarbageC - * to the value of NodeType for the equivalent node type. - */ - enum { -- kShowAll = 0xFFFFFFFF, -+ kShowAll = 256 /* 0xFFFFFFFF */, - kShowElement = 0x00000001, - kShowAttribute = 0x00000002, - kShowText = 0x00000004, -diff -up chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.idl ---- chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 2017-02-01 21:03:09.000000000 -0500 -+++ chromium-56.0.2924.87/third_party/WebKit/Source/core/dom/NodeFilter.idl 2017-02-09 10:38:38.394789395 -0500 -@@ -30,7 +30,7 @@ - const unsigned short FILTER_SKIP = 3; - - // Constants for whatToShow -- const unsigned long SHOW_ALL = 0xFFFFFFFF; -+ const unsigned long SHOW_ALL = 256; // 0xFFFFFFFF - const unsigned long SHOW_ELEMENT = 0x1; - const unsigned long SHOW_ATTRIBUTE = 0x2; // historical - const unsigned long SHOW_TEXT = 0x4; -diff -up chromium-56.0.2924.87/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-56.0.2924.87/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl ---- chromium-56.0.2924.87/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 2017-02-01 21:03:09.000000000 -0500 -+++ chromium-56.0.2924.87/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl 2017-02-09 11:07:32.828682863 -0500 -@@ -239,7 +239,7 @@ typedef unsigned long long GLuint64; - const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43; - const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44; - const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46; -- const GLenum INVALID_INDEX = 0xFFFFFFFF; -+ const GLenum INVALID_INDEX = 256; - const GLenum MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122; - const GLenum MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125; - const GLenum MAX_SERVER_WAIT_TIMEOUT = 0x9111; -@@ -269,7 +269,7 @@ typedef unsigned long long GLuint64; - const GLenum TEXTURE_IMMUTABLE_FORMAT = 0x912F; - const GLenum MAX_ELEMENT_INDEX = 0x8D6B; - const GLenum TEXTURE_IMMUTABLE_LEVELS = 0x82DF; -- const GLint TIMEOUT_IGNORED = -1; -+ const GLint TIMEOUT_IGNORED = 256; - - /* WebGL-specific enums */ - const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL = 0x9247; diff --git a/chromium-59.0.3071.115-ucontext-fix.patch b/chromium-59.0.3071.115-ucontext-fix.patch deleted file mode 100644 index 96bfadb..0000000 --- a/chromium-59.0.3071.115-ucontext-fix.patch +++ /dev/null @@ -1,214 +0,0 @@ -diff -up chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc ---- chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc.ucontextfix 2017-07-12 15:23:33.019591380 -0400 -+++ chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc 2017-07-12 15:32:52.069197546 -0400 -@@ -36,19 +36,19 @@ namespace google_breakpad { - - // Minidump defines register structures which are different from the raw - // structures which we get from the kernel. These are platform specific --// functions to juggle the ucontext and user structures into minidump format. -+// functions to juggle the ucontext_t and user structures into minidump format. - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawC - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawC - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawC - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawC - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - #if _MIPS_SIM == _ABI64 - out->context_flags = MD_CONTEXT_MIPS64_FULL; - #elif _MIPS_SIM == _ABIO32 -diff -up chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h ---- chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h.ucontextfix 2017-07-12 15:33:08.486806743 -0400 -+++ chromium-59.0.3071.115/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h 2017-07-12 15:33:57.299644808 -0400 -@@ -39,23 +39,23 @@ - - namespace google_breakpad { - --// Wraps platform-dependent implementations of accessors to ucontext structs. -+// Wraps platform-dependent implementations of accessors to ucontext_t structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - -- // Juggle a arch-specific ucontext into a minidump format -+ // Juggle a arch-specific ucontext_t into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - -diff -up chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc ---- chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc.ucontextfix 2017-07-12 15:34:09.094364048 -0400 -+++ chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.cc 2017-07-12 15:35:36.483283853 -0400 -@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int - // Fill in all the holes in the struct to make Valgrind happy. - memset(&g_crash_context_, 0, sizeof(g_crash_context_)); - memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); -- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); -+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -450,9 +450,9 @@ bool ExceptionHandler::HandleSignal(int - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. -- // In case of MIPS Linux FP state is already part of struct ucontext -+ // In case of MIPS Linux FP state is already part of ucontext_t - // and 'float_state' is not a member of CrashContext. -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, - sizeof(g_crash_context_.float_state)); -@@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDel - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } -diff -up chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h ---- chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h.ucontextfix 2017-07-12 15:35:48.559996380 -0400 -+++ chromium-59.0.3071.115/breakpad/src/client/linux/handler/exception_handler.h 2017-07-12 15:36:32.615948562 -0400 -@@ -191,11 +191,11 @@ class ExceptionHandler { - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. - // In case of MIPS Linux FP state is already part of struct -- // ucontext so 'float_state' is not required. -+ // ucontext_t so 'float_state' is not required. - fpstate_t float_state; - #endif - }; -diff -up chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc ---- chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc.ucontextfix 2017-07-12 15:37:26.232674196 -0400 -+++ chromium-59.0.3071.115/breakpad/src/client/linux/microdump_writer/microdump_writer.cc 2017-07-12 15:37:39.032369973 -0400 -@@ -579,7 +579,7 @@ class MicrodumpWriter { - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif -diff -up chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc.ucontextfix chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc ---- chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc.ucontextfix 2017-07-12 15:37:54.041013246 -0400 -+++ chromium-59.0.3071.115/breakpad/src/client/linux/minidump_writer/minidump_writer.cc 2017-07-12 15:38:19.600405748 -0400 -@@ -1323,7 +1323,7 @@ class MinidumpWriter { - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif diff --git a/chromium-59.0.3071.86-ffmpeg-stdatomic.patch b/chromium-59.0.3071.86-ffmpeg-stdatomic.patch deleted file mode 100644 index a512513..0000000 --- a/chromium-59.0.3071.86-ffmpeg-stdatomic.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up chromium-59.0.3071.86/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic chromium-59.0.3071.86/third_party/ffmpeg/libavutil/cpu.c ---- chromium-59.0.3071.86/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic 2017-06-07 17:15:24.993945430 -0400 -+++ chromium-59.0.3071.86/third_party/ffmpeg/libavutil/cpu.c 2017-06-07 17:18:41.625997601 -0400 -@@ -17,7 +17,13 @@ - */ - - #include -+// GCC 4.8 didn't have stdatomic, but was advertising it. -+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=58016 -+#if !defined(__clang__) && defined(__GNUC__) && (__GNUC__ == 4 || (__GNUC__ == 4 && (__GNUC_MINOR__ == 8))) -+#include -+#else - #include -+#endif - - #include "cpu.h" - #include "cpu_internal.h" diff --git a/chromium-59.0.3071.86-nullfix.patch b/chromium-59.0.3071.86-nullfix.patch deleted file mode 100644 index 20e9d18..0000000 --- a/chromium-59.0.3071.86-nullfix.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff -up chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.nullfix chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn ---- chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.nullfix 2017-06-05 15:03:01.000000000 -0400 -+++ chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn 2017-06-07 15:32:43.531911624 -0400 -@@ -31,6 +31,7 @@ gcc_toolchain("arm64") { - ld = cxx - readelf = "${toolprefix}readelf" - nm = "${toolprefix}nm" -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - toolchain_args = { - current_cpu = "arm64" -@@ -49,6 +50,7 @@ gcc_toolchain("arm") { - ld = cxx - readelf = "${toolprefix}readelf" - nm = "${toolprefix}nm" -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - toolchain_args = { - current_cpu = "arm" -@@ -91,6 +93,7 @@ gcc_toolchain("x86") { - nm = "nm" - ar = "ar" - ld = cxx -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - # Output linker map files for binary size analysis. - enable_linker_map = true -@@ -136,6 +139,7 @@ gcc_toolchain("x64") { - nm = "nm" - ar = "ar" - ld = cxx -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - # Output linker map files for binary size analysis. - enable_linker_map = true -@@ -161,6 +165,7 @@ gcc_toolchain("mipsel") { - ld = cxx - readelf = "mipsel-linux-gnu-readelf" - nm = "mipsel-linux-gnu-nm" -+ extra_cppflags = "-fno-delete-null-pointer-checks" - - toolchain_args = { - cc_wrapper = "" diff --git a/chromium-59.0.3071.86-system-clang.patch b/chromium-59.0.3071.86-system-clang.patch deleted file mode 100644 index 458834b..0000000 --- a/chromium-59.0.3071.86-system-clang.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up chromium-59.0.3071.86/build/config/clang/clang.gni.system-clang chromium-59.0.3071.86/build/config/clang/clang.gni ---- chromium-59.0.3071.86/build/config/clang/clang.gni.system-clang 2017-06-11 20:57:07.327949687 -0400 -+++ chromium-59.0.3071.86/build/config/clang/clang.gni 2017-06-11 20:57:24.085620826 -0400 -@@ -9,5 +9,5 @@ declare_args() { - # coding guidelines, etc. Only used when compiling with Clang. - clang_use_chrome_plugins = is_clang && !is_nacl && !use_xcode_clang - -- clang_base_path = "//third_party/llvm-build/Release+Asserts" -+ clang_base_path = "/usr" - } diff --git a/chromium-60.0.3112.78-gn-system.patch b/chromium-60.0.3112.78-gn-system.patch deleted file mode 100644 index 60489bb..0000000 --- a/chromium-60.0.3112.78-gn-system.patch +++ /dev/null @@ -1,221 +0,0 @@ -diff -up chromium-60.0.3112.78/build/linux/unbundle/libjpeg.gn.gnsystem chromium-60.0.3112.78/build/linux/unbundle/libjpeg.gn ---- chromium-60.0.3112.78/build/linux/unbundle/libjpeg.gn.gnsystem 2017-07-25 15:04:48.000000000 -0400 -+++ chromium-60.0.3112.78/build/linux/unbundle/libjpeg.gn 2017-07-31 10:38:25.879951641 -0400 -@@ -16,6 +16,10 @@ source_set("libjpeg") { - libs = [ "jpeg" ] - } - -+config("system_libjpeg") { -+ defines = [ "USE_SYSTEM_LIBJPEG=1" ] -+} -+ - source_set("simd") { - } - -diff -up chromium-60.0.3112.78/build/linux/unbundle/libusb.gn.gnsystem chromium-60.0.3112.78/build/linux/unbundle/libusb.gn ---- chromium-60.0.3112.78/build/linux/unbundle/libusb.gn.gnsystem 2017-07-31 10:38:25.880951622 -0400 -+++ chromium-60.0.3112.78/build/linux/unbundle/libusb.gn 2017-07-31 10:38:25.879951641 -0400 -@@ -0,0 +1,24 @@ -+# Copyright 2016 The Chromium Authors. All rights reserved. -+# Use of this source code is governed by a BSD-style license that can be -+# found in the LICENSE file. -+ -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_libusb") { -+ packages = [ "libusb-1.0" ] -+} -+ -+shim_headers("libusb_shim") { -+ root_path = "src/libusb" -+ headers = [ -+ "libusb.h", -+ ] -+} -+ -+source_set("libusb") { -+ deps = [ -+ ":libusb_shim", -+ ] -+ public_configs = [ ":system_libusb" ] -+} -diff -up chromium-60.0.3112.78/build/linux/unbundle/opus.gn.gnsystem chromium-60.0.3112.78/build/linux/unbundle/opus.gn ---- chromium-60.0.3112.78/build/linux/unbundle/opus.gn.gnsystem 2017-07-25 15:04:48.000000000 -0400 -+++ chromium-60.0.3112.78/build/linux/unbundle/opus.gn 2017-07-31 10:38:25.880951622 -0400 -@@ -1,3 +1,164 @@ -+# Copyright 2016 The Chromium Authors. All rights reserved. -+# Use of this source code is governed by a BSD-style license that can be -+# found in the LICENSE file. -+ -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+import("//testing/test.gni") -+ -+pkg_config("system_opus") { -+ packages = [ "opus" ] -+} -+ -+shim_headers("opus_shim") { -+ root_path = "src/include" -+ headers = [ -+ "opus_custom.h", -+ "opus_defines.h", -+ "opus_multistream.h", -+ "opus_types.h", -+ "opus.h", -+ ] -+} -+ -+source_set("opus") { -+ deps = [ -+ ":opus_shim", -+ ] -+ public_configs = [ ":system_opus" ] -+} -+ -+config("opus_test_config") { -+ include_dirs = [ -+ "src/celt", -+ "src/silk", -+ ] -+ -+ if (is_win) { -+ defines = [ "inline=__inline" ] -+ } -+ if (is_android) { -+ libs = [ "log" ] -+ } -+ if (is_clang) { -+ cflags = [ "-Wno-absolute-value" ] -+ } -+} -+ -+executable("opus_compare") { -+ sources = [ -+ "src/src/opus_compare.c", -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ -+ "//build/config/compiler:no_chromium_code", -+ ":opus_test_config", -+ ] -+ -+ deps = [ -+ ":opus", -+ "//build/config/sanitizers:deps", -+ "//build/win:default_exe_manifest", -+ ] -+} -+ -+executable("opus_demo") { -+ sources = [ -+ "src/src/opus_demo.c", -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ -+ "//build/config/compiler:no_chromium_code", -+ ":opus_test_config", -+ ] -+ -+ deps = [ -+ ":opus", -+ "//build/config/sanitizers:deps", -+ "//build/win:default_exe_manifest", -+ ] -+} -+ -+test("test_opus_api") { -+ sources = [ -+ "src/tests/test_opus_api.c", -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ -+ "//build/config/compiler:no_chromium_code", -+ ":opus_test_config", -+ ] -+ -+ deps = [ -+ ":opus", -+ ] -+} -+ -+test("test_opus_encode") { -+ sources = [ -+ "src/tests/test_opus_encode.c", -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ -+ "//build/config/compiler:no_chromium_code", -+ ":opus_test_config", -+ ] -+ -+ deps = [ -+ ":opus", -+ ] -+} -+ -+# GN orders flags on a target before flags from configs. The default config -+# adds -Wall, and this flag have to be after -Wall -- so they need to -+# come from a config and can't be on the target directly. -+config("test_opus_decode_config") { -+ # test_opus_decode passes a null pointer to opus_decode() for an argument -+ # marked as requiring a non-null value by the nonnull function attribute, -+ # and expects opus_decode() to fail. Disable the -Wnonnull option to avoid -+ # a compilation error if -Werror is specified. -+ if (is_posix) { -+ cflags = [ "-Wno-nonnull" ] -+ } -+} -+ -+test("test_opus_decode") { -+ sources = [ -+ "src/tests/test_opus_decode.c", -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ -+ "//build/config/compiler:no_chromium_code", -+ ":opus_test_config", -+ ":test_opus_decode_config", -+ ] -+ -+ deps = [ -+ ":opus", -+ ] -+} -+ -+test("test_opus_padding") { -+ sources = [ -+ "src/tests/test_opus_padding.c", -+ ] -+ -+ configs -= [ "//build/config/compiler:chromium_code" ] -+ configs += [ -+ "//build/config/compiler:no_chromium_code", -+ ":opus_test_config", -+ ] -+ -+ deps = [ -+ ":opus", -+ ] -+} -+ - # Copyright 2017 The Chromium Authors. All rights reserved. - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. -diff -up chromium-60.0.3112.78/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-60.0.3112.78/build/linux/unbundle/replace_gn_files.py ---- chromium-60.0.3112.78/build/linux/unbundle/replace_gn_files.py.gnsystem 2017-07-31 10:38:25.880951622 -0400 -+++ chromium-60.0.3112.78/build/linux/unbundle/replace_gn_files.py 2017-07-31 10:39:58.067159914 -0400 -@@ -26,6 +26,7 @@ REPLACEMENTS = { - 'libevent': 'base/third_party/libevent/BUILD.gn', - 'libjpeg': 'build/secondary/third_party/libjpeg_turbo/BUILD.gn', - 'libpng': 'third_party/libpng/BUILD.gn', -+ 'libusb': 'third_party/libusb/BUILD.gn', - 'libvpx': 'third_party/libvpx/BUILD.gn', - 'libwebp': 'third_party/libwebp/BUILD.gn', - 'libxml': 'third_party/libxml/BUILD.gn', diff --git a/chromium-60.0.3112.78-last-commit-position.patch b/chromium-60.0.3112.78-last-commit-position.patch deleted file mode 100644 index 7c26d9f..0000000 --- a/chromium-60.0.3112.78-last-commit-position.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -up chromium-60.0.3112.78/tools/gn/BUILD.gn.lastcommit chromium-60.0.3112.78/tools/gn/BUILD.gn ---- chromium-60.0.3112.78/tools/gn/BUILD.gn.lastcommit 2017-07-31 10:42:38.568041044 -0400 -+++ chromium-60.0.3112.78/tools/gn/BUILD.gn 2017-07-31 10:47:50.760974587 -0400 -@@ -268,7 +268,6 @@ executable("gn") { - - deps = [ - ":gn_lib", -- ":last_commit_position", - "//base", - "//build/config:exe_and_shlib_deps", - "//build/win:default_exe_manifest", -diff -up chromium-60.0.3112.78/tools/gn/gn_main.cc.lastcommit chromium-60.0.3112.78/tools/gn/gn_main.cc ---- chromium-60.0.3112.78/tools/gn/gn_main.cc.lastcommit 2017-07-25 15:05:19.000000000 -0400 -+++ chromium-60.0.3112.78/tools/gn/gn_main.cc 2017-07-31 10:42:38.568041044 -0400 -@@ -12,13 +12,7 @@ - #include "tools/gn/standard_out.h" - #include "tools/gn/switches.h" - --// Only the GN-generated build makes this header for now. --// TODO(brettw) consider adding this if we need it in GYP. --#if defined(GN_BUILD) --#include "tools/gn/last_commit_position.h" --#else - #define LAST_COMMIT_POSITION "UNKNOWN" --#endif - - namespace { - diff --git a/chromium-60.0.3112.78-no-zlib-mangle.patch b/chromium-60.0.3112.78-no-zlib-mangle.patch deleted file mode 100644 index 4b90360..0000000 --- a/chromium-60.0.3112.78-no-zlib-mangle.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up chromium-60.0.3112.78/third_party/zlib/zconf.h.nozmangle chromium-60.0.3112.78/third_party/zlib/zconf.h ---- chromium-60.0.3112.78/third_party/zlib/zconf.h.nozmangle 2017-08-04 10:45:17.509152089 -0400 -+++ chromium-60.0.3112.78/third_party/zlib/zconf.h 2017-08-04 10:45:30.451902380 -0400 -@@ -8,9 +8,6 @@ - #ifndef ZCONF_H - #define ZCONF_H - --/* This include does prefixing as below, but with an updated set of names */ --#include "names.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/chromium-60.0.3112.90-vulkan-force-c99.patch b/chromium-60.0.3112.90-vulkan-force-c99.patch deleted file mode 100644 index 881aa91..0000000 --- a/chromium-60.0.3112.90-vulkan-force-c99.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99 chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn ---- chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn.c99 2017-08-14 10:40:48.028799820 -0400 -+++ chromium-60.0.3112.90/third_party/angle/src/vulkan_support/BUILD.gn 2017-08-14 10:41:43.054734910 -0400 -@@ -180,6 +180,7 @@ config("vulkan_internal_config") { - cflags += [ "-Wno-ignored-attributes" ] - } - if (is_linux) { -+ cflags += [ "-std=c99" ] - defines += [ - "SYSCONFDIR=\"/etc\"", - "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"", diff --git a/chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch b/chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch deleted file mode 100644 index 12e88d2..0000000 --- a/chromium-61.0.3163.79-aarch64-glibc-2.26.90.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-61.0.3163.79/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc chromium-61.0.3163.79/breakpad/src/client/linux/handler/exception_handler.cc ---- chromium-61.0.3163.79/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc 2017-09-12 10:12:25.375736650 -0400 -+++ chromium-61.0.3163.79/breakpad/src/client/linux/handler/exception_handler.cc 2017-09-12 10:14:42.339638321 -0400 -@@ -461,7 +461,7 @@ bool ExceptionHandler::HandleSignal(int - #if defined(__aarch64__) - ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = -- (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; -+ (struct fpsimd_context*)&uc_ptr->uc_mcontext.__glibc_reserved1; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { - memcpy(&g_crash_context_.float_state, fp_ptr, - sizeof(g_crash_context_.float_state)); diff --git a/chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch b/chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch deleted file mode 100644 index a8c7260..0000000 --- a/chromium-61.0.3163.79-fix-ffmpeg-aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni ---- chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 2017-09-06 14:34:36.247232957 -0400 -+++ chromium-61.0.3163.79/third_party/ffmpeg/ffmpeg_generated.gni 2017-09-06 14:36:37.632892363 -0400 -@@ -537,7 +537,7 @@ if (use_linux_config && current_cpu == " - ] - } - --if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { -+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chromium")) { - ffmpeg_c_sources += [ - "libavcodec/aarch64/mpegaudiodsp_init.c", - ] diff --git a/chromium-61.0.3163.79-setopaque.patch b/chromium-61.0.3163.79-setopaque.patch deleted file mode 100644 index b797d10..0000000 --- a/chromium-61.0.3163.79-setopaque.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-61.0.3163.79/cc/blink/web_layer_impl.h.setopaque chromium-61.0.3163.79/cc/blink/web_layer_impl.h ---- chromium-61.0.3163.79/cc/blink/web_layer_impl.h.setopaque 2017-09-06 13:55:45.454175023 -0400 -+++ chromium-61.0.3163.79/cc/blink/web_layer_impl.h 2017-09-06 13:58:02.395533936 -0400 -@@ -71,7 +71,7 @@ class CC_BLINK_EXPORT WebLayerImpl : pub - bool IsRootForIsolatedGroup() override; - void SetShouldHitTest(bool should_hit_test) override; - bool ShouldHitTest() override; -- void SetOpaque(bool opaque) override; -+ CC_BLINK_EXPORT void SetOpaque(bool opaque) override; - bool Opaque() const override; - void SetPosition(const blink::WebFloatPoint& position) override; - blink::WebFloatPoint GetPosition() const override; diff --git a/chromium-62.0.3202.62-correct-cplusplus-check.patch b/chromium-62.0.3202.62-correct-cplusplus-check.patch deleted file mode 100644 index 39f8580..0000000 --- a/chromium-62.0.3202.62-correct-cplusplus-check.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up chromium-62.0.3202.62/third_party/crc32c/src/include/crc32c/crc32c.h.fix-cplusplus-conditional chromium-62.0.3202.62/third_party/crc32c/src/include/crc32c/crc32c.h ---- chromium-62.0.3202.62/third_party/crc32c/src/include/crc32c/crc32c.h.fix-cplusplus-conditional 2017-10-17 15:12:35.000000000 -0400 -+++ chromium-62.0.3202.62/third_party/crc32c/src/include/crc32c/crc32c.h 2017-10-19 11:41:45.860279576 -0400 -@@ -38,6 +38,8 @@ inline uint32_t Crc32c(const std::string - // Visual Studio provides a header even in C++11 mode. When - // included, the header issues an #error. (C1189) - #if !defined(_MSC_VER) || __cplusplus >= 201703L -+// GCC issues an #error if __cplusplus <= 201402L -+#if defined(__GNUC__) && __cplusplus > 201402L - #include - - // Comptues the CRC32C of the bytes in the string_view. -@@ -46,6 +48,7 @@ inline uint32_t Crc32c(const std::string - string_view.size()); - } - -+#endif // defined(__GNUC__) && __cplusplus > 201402L - #endif // !defined(_MSC_VER) || __cplusplus >= 201703L - #endif // __has_include() - #endif // defined(__has_include) diff --git a/chromium-62.0.3202.62-dde535-gcc-fix.patch b/chromium-62.0.3202.62-dde535-gcc-fix.patch deleted file mode 100644 index 378403a..0000000 --- a/chromium-62.0.3202.62-dde535-gcc-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up chromium-62.0.3202.62/services/resource_coordinator/resource_coordinator_service.cc.dde535 chromium-62.0.3202.62/services/resource_coordinator/resource_coordinator_service.cc ---- chromium-62.0.3202.62/services/resource_coordinator/resource_coordinator_service.cc.dde535 2017-10-18 10:04:33.237966223 -0400 -+++ chromium-62.0.3202.62/services/resource_coordinator/resource_coordinator_service.cc 2017-10-18 10:05:00.442438694 -0400 -@@ -18,7 +18,8 @@ std::unique_ptr(); - -- return resource_coordinator_service; -+ return std::unique_ptr( -+ resource_coordinator_service.release()); - } - - ResourceCoordinatorService::ResourceCoordinatorService() diff --git a/chromium-62.0.3202.62-enable-mp3.patch b/chromium-62.0.3202.62-enable-mp3.patch deleted file mode 100644 index 3ed9dbf..0000000 --- a/chromium-62.0.3202.62-enable-mp3.patch +++ /dev/null @@ -1,484 +0,0 @@ -diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/button-press.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/button-press -diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/hit.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/hit -diff -up chromium-62.0.3202.62/components/neterror/resources/sounds/score-reached.mp3 chromium-62.0.3202.62/components/neterror/resources/sounds/score-reached -diff -up chromium-62.0.3202.62/media/base/mime_util_internal.cc.mp3 chromium-62.0.3202.62/media/base/mime_util_internal.cc ---- chromium-62.0.3202.62/media/base/mime_util_internal.cc.mp3 2017-10-17 15:10:44.000000000 -0400 -+++ chromium-62.0.3202.62/media/base/mime_util_internal.cc 2017-10-18 09:32:16.957562156 -0400 -@@ -266,15 +266,19 @@ void MimeUtil::AddSupportedMediaFormats( - CodecSet webm_codecs(webm_audio_codecs); - webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end()); - --#if BUILDFLAG(USE_PROPRIETARY_CODECS) - const CodecSet mp3_codecs{MP3}; -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - const CodecSet aac{MPEG2_AAC, MPEG4_AAC}; -+#else -+ const CodecSet aac{}; -+#endif -+ CodecSet mp4_audio_codecs(aac); -+ mp4_audio_codecs.emplace(MP3); - -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - CodecSet avc_and_aac(aac); - avc_and_aac.emplace(H264); - -- CodecSet mp4_audio_codecs(aac); -- mp4_audio_codecs.emplace(MP3); - mp4_audio_codecs.emplace(FLAC); - #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING) - mp4_audio_codecs.emplace(AC3); -@@ -311,10 +315,10 @@ void MimeUtil::AddSupportedMediaFormats( - AddContainerWithCodecs("application/ogg", ogg_codecs, false); - AddContainerWithCodecs("audio/flac", implicit_codec, false); - --#if BUILDFLAG(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3". - AddContainerWithCodecs("audio/mp3", implicit_codec, true); - AddContainerWithCodecs("audio/x-mp3", implicit_codec, true); -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS. - AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true); - DCHECK(!mp4_video_codecs.empty()); -@@ -920,7 +924,6 @@ bool MimeUtil::IsCodecProprietary(Codec - case INVALID_CODEC: - case AC3: - case EAC3: -- case MP3: - case MPEG2_AAC: - case MPEG4_AAC: - case H264: -@@ -928,6 +931,7 @@ bool MimeUtil::IsCodecProprietary(Codec - case DOLBY_VISION: - return true; - -+ case MP3: - case PCM: - case VORBIS: - case OPUS: -diff -up chromium-62.0.3202.62/media/formats/BUILD.gn.mp3 chromium-62.0.3202.62/media/formats/BUILD.gn ---- chromium-62.0.3202.62/media/formats/BUILD.gn.mp3 2017-10-17 15:10:45.000000000 -0400 -+++ chromium-62.0.3202.62/media/formats/BUILD.gn 2017-10-18 09:25:18.353676481 -0400 -@@ -17,6 +17,14 @@ source_set("formats") { - "ac3/ac3_util.h", - "common/offset_byte_queue.cc", - "common/offset_byte_queue.h", -+ "mpeg/adts_constants.cc", -+ "mpeg/adts_constants.h", -+ "mpeg/adts_stream_parser.cc", -+ "mpeg/adts_stream_parser.h", -+ "mpeg/mpeg1_audio_stream_parser.cc", -+ "mpeg/mpeg1_audio_stream_parser.h", -+ "mpeg/mpeg_audio_stream_parser_base.cc", -+ "mpeg/mpeg_audio_stream_parser_base.h", - "webm/webm_audio_client.cc", - "webm/webm_audio_client.h", - "webm/webm_cluster_parser.cc", -@@ -78,14 +86,6 @@ source_set("formats") { - "mp4/sample_to_group_iterator.h", - "mp4/track_run_iterator.cc", - "mp4/track_run_iterator.h", -- "mpeg/adts_constants.cc", -- "mpeg/adts_constants.h", -- "mpeg/adts_stream_parser.cc", -- "mpeg/adts_stream_parser.h", -- "mpeg/mpeg1_audio_stream_parser.cc", -- "mpeg/mpeg1_audio_stream_parser.h", -- "mpeg/mpeg_audio_stream_parser_base.cc", -- "mpeg/mpeg_audio_stream_parser_base.h", - ] - } - -diff -up chromium-62.0.3202.62/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-62.0.3202.62/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test -diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h ---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 2017-10-18 09:05:31.000000000 -0400 -+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h 2017-10-18 09:25:18.354676462 -0400 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -542,7 +542,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -620,9 +620,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -968,7 +968,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1275,7 +1275,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2217,7 +2217,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h ---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 2017-10-18 09:05:31.000000000 -0400 -+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h 2017-10-18 09:25:18.355676443 -0400 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -542,7 +542,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -620,9 +620,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -968,7 +968,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1275,7 +1275,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2217,7 +2217,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h ---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 2017-10-18 09:05:31.000000000 -0400 -+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h 2017-10-18 09:25:18.360676348 -0400 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/jrummell/chrome_root/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -542,7 +542,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -620,9 +620,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -968,7 +968,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1275,7 +1275,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2217,7 +2217,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h ---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 2017-10-18 09:05:31.000000000 -0400 -+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2017-10-18 09:25:18.360676348 -0400 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -542,7 +542,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -620,9 +620,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -968,7 +968,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1275,7 +1275,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2217,7 +2217,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h ---- chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 2017-10-18 09:05:31.000000000 -0400 -+++ chromium-62.0.3202.62/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h 2017-10-18 09:25:18.361676329 -0400 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-d3d11va --disable-dxva2 --disable-vaapi --disable-vda --disable-vdpau --disable-videotoolbox --disable-nvenc --disable-cuda --disable-cuvid --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/chrome/src/third_party/opus/src/include --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -542,7 +542,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -620,9 +620,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -968,7 +968,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1275,7 +1275,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2217,7 +2217,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni ---- chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-10-18 09:05:28.000000000 -0400 -+++ chromium-62.0.3202.62/third_party/ffmpeg/ffmpeg_generated.gni 2017-10-18 09:25:18.362676310 -0400 -@@ -182,17 +182,9 @@ if ((is_mac) || (is_win) || (use_linux_c - ] - } - --if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { -+if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_win) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm64") || (use_linux_config && current_cpu == "mipsel") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) { - ffmpeg_c_sources += [ -- "libavcodec/aac_ac3_parser.c", -- "libavcodec/aac_parser.c", -- "libavcodec/aacadtsdec.c", -- "libavcodec/aacps_float.c", -- "libavcodec/aacpsdsp_float.c", -- "libavcodec/aacsbr.c", -- "libavcodec/aactab.c", - "libavcodec/ac3tab.c", -- "libavcodec/autorename_libavcodec_aacdec.c", - "libavcodec/autorename_libavcodec_mpegaudiodsp.c", - "libavcodec/autorename_libavcodec_sbrdsp.c", - "libavcodec/cbrt_data.c", -@@ -210,7 +202,6 @@ if ((current_cpu == "x64" && ffmpeg_bran - "libavcodec/mpegaudiodsp_float.c", - "libavcodec/sinewin.c", - "libavcodec/sinewin_fixed.c", -- "libavformat/aacdec.c", - "libavformat/apetag.c", - "libavformat/img2.c", - "libavformat/mov.c", -@@ -219,6 +210,20 @@ if ((current_cpu == "x64" && ffmpeg_bran - ] - } - -+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { -+ ffmpeg_c_sources += [ -+ "libavcodec/aac_ac3_parser.c", -+ "libavcodec/aac_parser.c", -+ "libavcodec/aacadtsdec.c", -+ "libavcodec/aacps_float.c", -+ "libavcodec/aacpsdsp_float.c", -+ "libavcodec/aacsbr.c", -+ "libavcodec/aactab.c", -+ "libavcodec/autorename_libavcodec_aacdec.c", -+ "libavformat/aacdec.c", -+ ] -+} -+ - if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_mac) || (is_win) || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) { - ffmpeg_c_sources += [ - "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", -@@ -322,15 +327,19 @@ if ((is_mac) || (is_win) || (use_linux_c - if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { - ffmpeg_c_sources += [ - "libavcodec/x86/aacpsdsp_init.c", -+ ] -+ ffmpeg_yasm_sources += [ -+ "libavcodec/x86/aacpsdsp.asm", -+ ] -+} -+ -+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86") || (is_win)) { -+ ffmpeg_c_sources += [ - "libavcodec/x86/dct_init.c", - "libavcodec/x86/mpegaudiodsp.c", - "libavcodec/x86/sbrdsp_init.c", - ] --} -- --if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { - ffmpeg_yasm_sources += [ -- "libavcodec/x86/aacpsdsp.asm", - "libavcodec/x86/dct32.asm", - "libavcodec/x86/imdct36.asm", - "libavcodec/x86/sbrdsp.asm", -diff -up chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c ---- chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-10-18 09:05:30.000000000 -0400 -+++ chromium-62.0.3202.62/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-10-18 09:25:18.362676310 -0400 -@@ -23,6 +23,7 @@ - #define USE_FIXED 0 - - #include "aac.h" -+#include "aacsbrdata.h" - #include "config.h" - #include "libavutil/attributes.h" - #include "libavutil/intfloat.h" -diff -up chromium-62.0.3202.62/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-62.0.3202.62/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart -diff -up chromium-62.0.3202.62/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-62.0.3202.62/tools/android/audio_focus_grabber/java/res/raw/ping diff --git a/chromium-62.0.3202.62-epel7-no-nullptr-assignment-on-StructPtr.patch b/chromium-62.0.3202.62-epel7-no-nullptr-assignment-on-StructPtr.patch deleted file mode 100644 index 7af702a..0000000 --- a/chromium-62.0.3202.62-epel7-no-nullptr-assignment-on-StructPtr.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-62.0.3202.62/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr chromium-62.0.3202.62/third_party/WebKit/Source/platform/blob/BlobData.cpp ---- chromium-62.0.3202.62/third_party/WebKit/Source/platform/blob/BlobData.cpp.nonullptr 2017-10-18 10:10:14.216353575 -0400 -+++ chromium-62.0.3202.62/third_party/WebKit/Source/platform/blob/BlobData.cpp 2017-10-18 10:10:23.657170980 -0400 -@@ -295,7 +295,7 @@ BlobDataHandle::BlobDataHandle(std::uniq - - size_t current_memory_population = 0; - Vector elements; -- const DataElementPtr null_element = nullptr; -+ const DataElementPtr null_element; - BlobBytesProvider* last_bytes_provider = nullptr; - RefPtr file_runner = Platform::Current()->FileTaskRunner(); - diff --git a/chromium-62.0.3202.62-gcc-nc.patch b/chromium-62.0.3202.62-gcc-nc.patch deleted file mode 100644 index 0a74d25..0000000 --- a/chromium-62.0.3202.62-gcc-nc.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-62.0.3202.62/content/network/network_service_impl.cc.gcc-nc chromium-62.0.3202.62/content/network/network_service_impl.cc ---- chromium-62.0.3202.62/content/network/network_service_impl.cc.gcc-nc 2017-10-18 10:07:04.045041261 -0400 -+++ chromium-62.0.3202.62/content/network/network_service_impl.cc 2017-10-18 10:07:53.175088528 -0400 -@@ -90,6 +90,7 @@ NetworkServiceImpl::CreateNetworkContext - base::MakeUnique(this, std::move(request), - std::move(params), std::move(builder)); - *url_request_context = network_context->url_request_context(); -+ return std::unique_ptr(network_context.release()); - return network_context; - } - diff --git a/chromium-62.0.3202.62-gcc7.patch b/chromium-62.0.3202.62-gcc7.patch deleted file mode 100644 index 90d177d..0000000 --- a/chromium-62.0.3202.62-gcc7.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-62.0.3202.62/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-62.0.3202.62/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h ---- chromium-62.0.3202.62/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 2017-10-18 09:20:04.072765163 -0400 -+++ chromium-62.0.3202.62/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2017-10-18 09:21:40.156905187 -0400 -@@ -9,6 +9,7 @@ - #include "platform/graphics/WebGraphicsContext3DProviderWrapper.h" - #include "platform/wtf/ThreadSpecific.h" - -+#include - #include - - namespace blink { diff --git a/chromium-62.0.3202.62-rvalue-fix.patch b/chromium-62.0.3202.62-rvalue-fix.patch deleted file mode 100644 index 89197cd..0000000 --- a/chromium-62.0.3202.62-rvalue-fix.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up chromium-62.0.3202.62/chrome/browser/ui/webui/settings/on_startup_handler.cc.another-rvalue-fix chromium-62.0.3202.62/chrome/browser/ui/webui/settings/on_startup_handler.cc ---- chromium-62.0.3202.62/chrome/browser/ui/webui/settings/on_startup_handler.cc.another-rvalue-fix 2017-10-18 10:15:58.855675480 -0400 -+++ chromium-62.0.3202.62/chrome/browser/ui/webui/settings/on_startup_handler.cc 2017-10-18 10:16:28.925093301 -0400 -@@ -77,7 +77,7 @@ std::unique_ptr OnStartupHa - !extensions::ExtensionSystem::Get(profile_) - ->management_policy() - ->MustRemainEnabled(ntp_extension, nullptr)); -- return dict; -+ return std::move(dict); - } - - void OnStartupHandler::HandleGetNtpExtension(const base::ListValue* args) { -diff -up chromium-62.0.3202.62/ui/views/animation/ink_drop_host_view.cc.another-rvalue-fix chromium-62.0.3202.62/ui/views/animation/ink_drop_host_view.cc ---- chromium-62.0.3202.62/ui/views/animation/ink_drop_host_view.cc.another-rvalue-fix 2017-10-18 10:15:16.408497853 -0400 -+++ chromium-62.0.3202.62/ui/views/animation/ink_drop_host_view.cc 2017-10-18 10:15:43.793967075 -0400 -@@ -305,7 +305,7 @@ std::unique_ptr InkDropHost - base::MakeUnique(this, size()); - ink_drop->SetAutoHighlightMode( - views::InkDropImpl::AutoHighlightMode::HIDE_ON_RIPPLE); -- return ink_drop; -+ return std:move(ink_drop); - } - - std::unique_ptr -@@ -314,7 +314,7 @@ InkDropHostView::CreateDefaultFloodFillI - InkDropHostView::CreateDefaultInkDropImpl(); - ink_drop->SetAutoHighlightMode( - views::InkDropImpl::AutoHighlightMode::SHOW_ON_RIPPLE); -- return ink_drop; -+ return std:move(ink_drop); - } - - } // namespace views -diff -up chromium-62.0.3202.62/ui/views/controls/button/checkbox.cc.another-rvalue-fix chromium-62.0.3202.62/ui/views/controls/button/checkbox.cc ---- chromium-62.0.3202.62/ui/views/controls/button/checkbox.cc.another-rvalue-fix 2017-10-18 10:14:18.054627919 -0400 -+++ chromium-62.0.3202.62/ui/views/controls/button/checkbox.cc 2017-10-18 10:14:42.265159378 -0400 -@@ -198,7 +198,7 @@ std::unique_ptr Checkbox::Creat - std::unique_ptr ink_drop = CreateDefaultInkDropImpl(); - ink_drop->SetShowHighlightOnHover(false); - ink_drop->SetAutoHighlightMode(InkDropImpl::AutoHighlightMode::NONE); -- return ink_drop; -+ return std::move(ink_drop); - } - - std::unique_ptr Checkbox::CreateInkDropRipple() const { diff --git a/chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch b/chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch deleted file mode 100644 index 469d680..0000000 --- a/chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ---- chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.aarch64glibc 2017-12-12 09:56:24.469343868 -0500 -+++ chromium-63.0.3239.84/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2017-12-12 09:56:38.468071095 -0500 -@@ -461,7 +461,7 @@ bool ExceptionHandler::HandleSignal(int - #if defined(__aarch64__) - ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = -- (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; -+ (struct fpsimd_context*)&uc_ptr->uc_mcontext.__glibc_reserved1; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { - memcpy(&g_crash_context_.float_state, fp_ptr, - sizeof(g_crash_context_.float_state)); diff --git a/chromium-63.0.3289.84-enable-mp3.patch b/chromium-63.0.3289.84-enable-mp3.patch deleted file mode 100644 index 91a331a..0000000 --- a/chromium-63.0.3289.84-enable-mp3.patch +++ /dev/null @@ -1,485 +0,0 @@ -diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/button-press.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/button-press -diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/hit.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/hit -diff -up chromium-63.0.3239.84/components/neterror/resources/sounds/score-reached.mp3 chromium-63.0.3239.84/components/neterror/resources/sounds/score-reached -diff -up chromium-63.0.3239.84/media/base/mime_util_internal.cc.mp3 chromium-63.0.3239.84/media/base/mime_util_internal.cc ---- chromium-63.0.3239.84/media/base/mime_util_internal.cc.mp3 2017-12-06 15:05:29.000000000 -0500 -+++ chromium-63.0.3239.84/media/base/mime_util_internal.cc 2017-12-07 10:52:02.472510232 -0500 -@@ -266,15 +266,19 @@ void MimeUtil::AddSupportedMediaFormats( - CodecSet webm_codecs(webm_audio_codecs); - webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end()); - --#if BUILDFLAG(USE_PROPRIETARY_CODECS) - const CodecSet mp3_codecs{MP3}; -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - const CodecSet aac{MPEG2_AAC, MPEG4_AAC}; -+#else -+ const CodecSet aac{}; -+#endif -+ CodecSet mp4_audio_codecs(aac); -+ mp4_audio_codecs.emplace(MP3); - -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - CodecSet avc_and_aac(aac); - avc_and_aac.emplace(H264); - -- CodecSet mp4_audio_codecs(aac); -- mp4_audio_codecs.emplace(MP3); - mp4_audio_codecs.emplace(FLAC); - #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING) - mp4_audio_codecs.emplace(AC3); -@@ -311,10 +315,10 @@ void MimeUtil::AddSupportedMediaFormats( - AddContainerWithCodecs("application/ogg", ogg_codecs, false); - AddContainerWithCodecs("audio/flac", implicit_codec, false); - --#if BUILDFLAG(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3". - AddContainerWithCodecs("audio/mp3", implicit_codec, true); - AddContainerWithCodecs("audio/x-mp3", implicit_codec, true); -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS. - AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true); - DCHECK(!mp4_video_codecs.empty()); -@@ -935,7 +939,6 @@ bool MimeUtil::IsCodecProprietary(Codec - case INVALID_CODEC: - case AC3: - case EAC3: -- case MP3: - case MPEG2_AAC: - case MPEG4_AAC: - case H264: -@@ -943,6 +946,7 @@ bool MimeUtil::IsCodecProprietary(Codec - case DOLBY_VISION: - return true; - -+ case MP3: - case PCM: - case VORBIS: - case OPUS: -diff -up chromium-63.0.3239.84/media/formats/BUILD.gn.mp3 chromium-63.0.3239.84/media/formats/BUILD.gn ---- chromium-63.0.3239.84/media/formats/BUILD.gn.mp3 2017-12-06 15:05:29.000000000 -0500 -+++ chromium-63.0.3239.84/media/formats/BUILD.gn 2017-12-07 10:52:02.473510212 -0500 -@@ -20,6 +20,14 @@ source_set("formats") { - "ac3/ac3_util.h", - "common/offset_byte_queue.cc", - "common/offset_byte_queue.h", -+ "mpeg/adts_constants.cc", -+ "mpeg/adts_constants.h", -+ "mpeg/adts_stream_parser.cc", -+ "mpeg/adts_stream_parser.h", -+ "mpeg/mpeg1_audio_stream_parser.cc", -+ "mpeg/mpeg1_audio_stream_parser.h", -+ "mpeg/mpeg_audio_stream_parser_base.cc", -+ "mpeg/mpeg_audio_stream_parser_base.h", - "webm/webm_audio_client.cc", - "webm/webm_audio_client.h", - "webm/webm_cluster_parser.cc", -@@ -81,14 +89,6 @@ source_set("formats") { - "mp4/sample_to_group_iterator.h", - "mp4/track_run_iterator.cc", - "mp4/track_run_iterator.h", -- "mpeg/adts_constants.cc", -- "mpeg/adts_constants.h", -- "mpeg/adts_stream_parser.cc", -- "mpeg/adts_stream_parser.h", -- "mpeg/mpeg1_audio_stream_parser.cc", -- "mpeg/mpeg1_audio_stream_parser.h", -- "mpeg/mpeg_audio_stream_parser_base.cc", -- "mpeg/mpeg_audio_stream_parser_base.h", - ] - } - -diff -up chromium-63.0.3239.84/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test.mp3 chromium-63.0.3239.84/third_party/catapult/third_party/gsutil/gslib/tests/test_data/test -diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h ---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h.mp3 2017-12-07 09:51:37.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm64/config.h 2017-12-07 11:08:41.116117073 -0500 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-cross-compile --cross-prefix=/usr/bin/aarch64-linux-gnu- --target-os=linux --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -547,7 +547,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -626,9 +626,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -979,7 +979,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1292,7 +1292,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2267,7 +2267,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h ---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h.mp3 2017-12-07 09:51:37.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm/config.h 2017-12-07 11:09:23.602291820 -0500 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --disable-neon --extra-cflags='-mfpu=vfpv3-d16' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -547,7 +547,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -626,9 +626,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -979,7 +979,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1292,7 +1292,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2267,7 +2267,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h ---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h.mp3 2017-12-07 09:51:37.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/arm-neon/config.h 2017-12-07 11:09:49.945779754 -0500 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/home/chcunningham/chrome_root/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=arm --enable-armv6 --enable-armv6t2 --enable-vfp --enable-thumb --extra-cflags='-march=armv7-a' --enable-cross-compile --target-os=linux --cross-prefix=armv7a-cros-linux-gnueabi- --extra-cflags='-mtune=cortex-a8' --extra-cflags='-mfloat-abi=hard' --enable-neon --extra-cflags='-mfpu=neon' --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -547,7 +547,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -626,9 +626,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -979,7 +979,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1292,7 +1292,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2267,7 +2267,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h ---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h.mp3 2017-12-07 09:51:37.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/ia32/config.h 2017-12-07 11:10:25.513089579 -0500 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-yasm --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -547,7 +547,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -626,9 +626,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -979,7 +979,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1292,7 +1292,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2267,7 +2267,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h ---- chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h.mp3 2017-12-07 09:51:37.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h 2017-12-07 11:10:50.721599547 -0500 -@@ -1,7 +1,7 @@ - /* Automatically generated by configure - do not modify! */ - #ifndef FFMPEG_CONFIG_H - #define FFMPEG_CONFIG_H --#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic" -+#define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac' --enable-parser='opus,vorbis,flac' --extra-cflags=-I/ssd/blink3/src/third_party/opus/src/include --disable-linux-perf --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --enable-pic --enable-decoder='mp3' --enable-demuxer='mp3' --enable-parser='mpegaudio'" - #define FFMPEG_LICENSE "LGPL version 2.1 or later" - #define CONFIG_THIS_YEAR 2017 - #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" -@@ -547,7 +547,7 @@ - #define CONFIG_FFPROBE 0 - #define CONFIG_FFSERVER 0 - #define CONFIG_FFMPEG 0 --#define CONFIG_DCT 0 -+#define CONFIG_DCT 1 - #define CONFIG_DWT 0 - #define CONFIG_ERROR_RESILIENCE 0 - #define CONFIG_FAAN 1 -@@ -626,9 +626,9 @@ - #define CONFIG_LZF 0 - #define CONFIG_ME_CMP 0 - #define CONFIG_MPEG_ER 0 --#define CONFIG_MPEGAUDIO 0 --#define CONFIG_MPEGAUDIODSP 0 --#define CONFIG_MPEGAUDIOHEADER 0 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 - #define CONFIG_MPEGVIDEO 0 - #define CONFIG_MPEGVIDEOENC 0 - #define CONFIG_MSS34DSP 0 -@@ -979,7 +979,7 @@ - #define CONFIG_MP1FLOAT_DECODER 0 - #define CONFIG_MP2_DECODER 0 - #define CONFIG_MP2FLOAT_DECODER 0 --#define CONFIG_MP3_DECODER 0 -+#define CONFIG_MP3_DECODER 1 - #define CONFIG_MP3FLOAT_DECODER 0 - #define CONFIG_MP3ADU_DECODER 0 - #define CONFIG_MP3ADUFLOAT_DECODER 0 -@@ -1292,7 +1292,7 @@ - #define CONFIG_MM_DEMUXER 0 - #define CONFIG_MMF_DEMUXER 0 - #define CONFIG_MOV_DEMUXER 0 --#define CONFIG_MP3_DEMUXER 0 -+#define CONFIG_MP3_DEMUXER 1 - #define CONFIG_MPC_DEMUXER 0 - #define CONFIG_MPC8_DEMUXER 0 - #define CONFIG_MPEGPS_DEMUXER 0 -@@ -2267,7 +2267,7 @@ - #define CONFIG_MJPEG_PARSER 0 - #define CONFIG_MLP_PARSER 0 - #define CONFIG_MPEG4VIDEO_PARSER 0 --#define CONFIG_MPEGAUDIO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 - #define CONFIG_MPEGVIDEO_PARSER 0 - #define CONFIG_OPUS_PARSER 1 - #define CONFIG_PNG_PARSER 0 -diff -up chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.mp3 chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni ---- chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.mp3 2017-12-07 09:51:36.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni 2017-12-07 11:16:58.728447124 -0500 -@@ -183,17 +183,9 @@ if ((is_mac) || (is_win) || (use_linux_c - ] - } - --if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { -+if ((current_cpu == "x64") || (is_android && current_cpu == "arm" && arm_use_neon) || (is_android && current_cpu == "arm64") || (is_android && current_cpu == "mips64el") || (is_android && current_cpu == "mipsel") || (is_android && current_cpu == "x86") || (is_win) || (use_linux_config && current_cpu == "arm" && arm_use_neon) || (use_linux_config && current_cpu == "arm") || (use_linux_config && current_cpu == "arm64") || (use_linux_config && current_cpu == "mipsel") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) { - ffmpeg_c_sources += [ -- "libavcodec/aac_ac3_parser.c", -- "libavcodec/aac_parser.c", -- "libavcodec/aacadtsdec.c", -- "libavcodec/aacps_float.c", -- "libavcodec/aacpsdsp_float.c", -- "libavcodec/aacsbr.c", -- "libavcodec/aactab.c", - "libavcodec/ac3tab.c", -- "libavcodec/autorename_libavcodec_aacdec.c", - "libavcodec/autorename_libavcodec_mdct15.c", - "libavcodec/autorename_libavcodec_mpegaudiodsp.c", - "libavcodec/autorename_libavcodec_sbrdsp.c", -@@ -211,7 +203,6 @@ if ((current_cpu == "x64" && ffmpeg_bran - "libavcodec/mpegaudiodsp_float.c", - "libavcodec/sinewin.c", - "libavcodec/sinewin_fixed.c", -- "libavformat/aacdec.c", - "libavformat/apetag.c", - "libavformat/img2.c", - "libavformat/mov.c", -@@ -220,6 +211,20 @@ if ((current_cpu == "x64" && ffmpeg_bran - ] - } - -+if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mips64el" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && arm_use_neon && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "mipsel" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { -+ ffmpeg_c_sources += [ -+ "libavcodec/aac_ac3_parser.c", -+ "libavcodec/aac_parser.c", -+ "libavcodec/aacadtsdec.c", -+ "libavcodec/aacps_float.c", -+ "libavcodec/aacpsdsp_float.c", -+ "libavcodec/aacsbr.c", -+ "libavcodec/aactab.c", -+ "libavcodec/autorename_libavcodec_aacdec.c", -+ "libavformat/aacdec.c", -+ ] -+} -+ - if ((is_android && current_cpu == "x64") || (is_android && current_cpu == "x86") || (is_mac) || (is_win) || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86")) { - ffmpeg_c_sources += [ - "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", -@@ -323,16 +328,20 @@ if ((is_mac) || (is_win) || (use_linux_c - if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { - ffmpeg_c_sources += [ - "libavcodec/x86/aacpsdsp_init.c", -+ ] -+ ffmpeg_yasm_sources += [ -+ "libavcodec/x86/aacpsdsp.asm", -+ ] -+} -+ -+if ((current_cpu == "x64") || (is_android && current_cpu == "x86") || (use_linux_config && current_cpu == "x64") || (use_linux_config && current_cpu == "x86") || (is_win)) { -+ ffmpeg_c_sources += [ - "libavcodec/x86/dct_init.c", - "libavcodec/x86/mdct15_init.c", - "libavcodec/x86/mpegaudiodsp.c", - "libavcodec/x86/sbrdsp_init.c", - ] --} -- --if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") || (is_win && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "ChromeOS")) { - ffmpeg_yasm_sources += [ -- "libavcodec/x86/aacpsdsp.asm", - "libavcodec/x86/dct32.asm", - "libavcodec/x86/imdct36.asm", - "libavcodec/x86/mdct15.asm", -diff -up chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c ---- chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c.mp3 2017-12-07 09:51:37.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/ffmpeg/libavcodec/sbrdsp.c 2017-12-07 10:52:02.484509992 -0500 -@@ -23,6 +23,7 @@ - #define USE_FIXED 0 - - #include "aac.h" -+#include "aacsbrdata.h" - #include "config.h" - #include "libavutil/attributes.h" - #include "libavutil/intfloat.h" -diff -up chromium-63.0.3239.84/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart.mp3 chromium-63.0.3239.84/third_party/webrtc/examples/objc/AppRTCMobile/ios/resources/mozart -diff -up chromium-63.0.3239.84/tools/android/audio_focus_grabber/java/res/raw/ping.mp3 chromium-63.0.3239.84/tools/android/audio_focus_grabber/java/res/raw/ping diff --git a/chromium-63.0.3289.84-fix-ffmpeg-aarch64.patch b/chromium-63.0.3289.84-fix-ffmpeg-aarch64.patch deleted file mode 100644 index 8df206b..0000000 --- a/chromium-63.0.3289.84-fix-ffmpeg-aarch64.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni ---- chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni.aarch64 2017-12-07 11:23:07.077290535 -0500 -+++ chromium-63.0.3239.84/third_party/ffmpeg/ffmpeg_generated.gni 2017-12-07 11:27:30.354175021 -0500 -@@ -541,7 +541,7 @@ if (use_linux_config && current_cpu == " - ] - } - --if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64" && ffmpeg_branding == "ChromeOS")) { -+if ((is_android && current_cpu == "arm64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "arm64")) { - ffmpeg_c_sources += [ - "libavcodec/aarch64/aacpsdsp_init_aarch64.c", - "libavcodec/aarch64/mpegaudiodsp_init.c", diff --git a/chromium-63.0.3289.84-fix-ft-hb-unbundle.patch b/chromium-63.0.3289.84-fix-ft-hb-unbundle.patch deleted file mode 100644 index 9ca87ad..0000000 --- a/chromium-63.0.3289.84-fix-ft-hb-unbundle.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up chromium-63.0.3239.84/build/linux/unbundle/freetype.gn.fixunbundle chromium-63.0.3239.84/build/linux/unbundle/freetype.gn ---- chromium-63.0.3239.84/build/linux/unbundle/freetype.gn.fixunbundle 2017-12-07 12:07:48.652161826 -0500 -+++ chromium-63.0.3239.84/build/linux/unbundle/freetype.gn 2017-12-07 12:08:52.514919585 -0500 -@@ -117,6 +117,14 @@ source_set("freetype") { - public_configs = [ ":freetype_config" ] - } - -+source_set("freetype_source") { -+ visibility = [ "//third_party:freetype_harfbuzz" ] -+ deps = [ -+ ":freetype_shim", -+ ] -+ public_configs = [ ":freetype_config" ] -+} -+ - source_set("bootstrap_freetype_for_harfbuzz") { - deps = [ - ":freetype_shim", -diff -up chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn.fixunbundle chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn ---- chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn.fixunbundle 2017-12-07 12:09:57.057661738 -0500 -+++ chromium-63.0.3239.84/build/linux/unbundle/harfbuzz-ng.gn 2017-12-07 12:10:03.225541404 -0500 -@@ -24,6 +24,14 @@ group("harfbuzz-ng") { - ] - } - -+source_set("harfbuzz_source") { -+ visibility = [ "//third_party:freetype_harfbuzz" ] -+ deps = [ -+ ":harfbuzz_shim", -+ ] -+ public_configs = [ ":system_harfbuzz" ] -+} -+ - source_set("harfbuzz-ng-ft") { - deps = [ - ":harfbuzz_shim", diff --git a/chromium-63.0.3289.84-gcc-round-fix.patch b/chromium-63.0.3289.84-gcc-round-fix.patch deleted file mode 100644 index 86d0a7e..0000000 --- a/chromium-63.0.3289.84-gcc-round-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc.gcc-round-fix chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc ---- chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc.gcc-round-fix 2017-12-07 16:20:01.521717091 -0500 -+++ chromium-63.0.3239.84/third_party/webrtc/p2p/base/port.cc 2017-12-07 16:20:13.025491739 -0500 -@@ -11,6 +11,7 @@ - #include "p2p/base/port.h" - - #include -+#include - #include - - #include "p2p/base/common.h" diff --git a/chromium-63.0.3289.84-gcc5-r3.patch b/chromium-63.0.3289.84-gcc5-r3.patch deleted file mode 100644 index 83c6911..0000000 --- a/chromium-63.0.3289.84-gcc5-r3.patch +++ /dev/null @@ -1,104 +0,0 @@ -diff -up chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h ---- chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2017-12-06 15:05:28.000000000 -0500 -+++ chromium-63.0.3239.84/gpu/ipc/common/mailbox_struct_traits.h 2017-12-07 11:32:15.416636125 -0500 -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; -diff -up chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ---- chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 2017-12-06 15:05:31.000000000 -0500 -+++ chromium-63.0.3239.84/services/viz/public/cpp/compositing/filter_operation_struct_traits.h 2017-12-07 11:32:15.422636011 -0500 -@@ -134,7 +134,7 @@ struct StructTraits matrix(const cc::FilterOperation& operation) { - if (operation.type() != cc::FilterOperation::COLOR_MATRIX) - return base::span(); -- return operation.matrix(); -+ return base::make_span(operation.matrix()); - } - - static base::span shape( -diff -up chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h ---- chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2017-12-07 11:32:15.429635877 -0500 -+++ chromium-63.0.3239.84/services/viz/public/cpp/compositing/quads_struct_traits.h 2017-12-07 11:34:00.081601880 -0500 -@@ -309,7 +309,7 @@ struct StructTraits vertex_opacity(const viz::DrawQuad& input) { - const viz::TextureDrawQuad* quad = - viz::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const viz::DrawQuad& input) { -diff -up chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp.gcc5-r3 chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp ---- chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp.gcc5-r3 2017-12-06 15:05:46.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/WebKit/Source/platform/exported/WebCORS.cpp 2017-12-07 11:32:15.430635859 -0500 -@@ -480,7 +480,7 @@ WebString AccessControlErrorString( - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -512,7 +512,7 @@ WebString PreflightErrorString(const Pre - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -533,7 +533,7 @@ WebString RedirectErrorString(const Redi - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -diff -up chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ---- chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 2017-12-06 15:05:46.000000000 -0500 -+++ chromium-63.0.3239.84/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h 2017-12-07 11:32:15.408636277 -0500 -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } -diff -up chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc ---- chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2017-12-07 11:32:15.409636258 -0500 -+++ chromium-63.0.3239.84/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-12-07 11:33:10.714561105 -0500 -@@ -10,7 +10,7 @@ - - #include "modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - diff --git a/chromium-63.0.3289.84-nolibc++.patch b/chromium-63.0.3289.84-nolibc++.patch deleted file mode 100644 index 0d999c8..0000000 --- a/chromium-63.0.3289.84-nolibc++.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up chromium-63.0.3239.84/remoting/host/linux/BUILD.gn.nolibc++ chromium-63.0.3239.84/remoting/host/linux/BUILD.gn ---- chromium-63.0.3239.84/remoting/host/linux/BUILD.gn.nolibc++ 2017-12-07 11:55:43.173273434 -0500 -+++ chromium-63.0.3239.84/remoting/host/linux/BUILD.gn 2017-12-07 11:55:53.244077772 -0500 -@@ -62,11 +62,9 @@ if (enable_me2me_host) { - if (is_component_build) { - sources += [ - "$root_build_dir/libbase.so", -- "$root_build_dir/libc++.so", - ] - deps += [ - "//base:base", -- "//buildtools/third_party/libc++:libc++", - ] - } - } diff --git a/chromium-63.0.3289.84-setopaque.patch b/chromium-63.0.3289.84-setopaque.patch deleted file mode 100644 index 8fb585a..0000000 --- a/chromium-63.0.3289.84-setopaque.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-63.0.3239.84/cc/blink/web_layer_impl.h.setopaque chromium-63.0.3239.84/cc/blink/web_layer_impl.h ---- chromium-63.0.3239.84/cc/blink/web_layer_impl.h.setopaque 2017-12-07 10:47:48.262446682 -0500 -+++ chromium-63.0.3239.84/cc/blink/web_layer_impl.h 2017-12-07 10:48:47.437298948 -0500 -@@ -67,7 +67,7 @@ class CC_BLINK_EXPORT WebLayerImpl : pub - void SetIsRootForIsolatedGroup(bool root) override; - bool IsRootForIsolatedGroup() override; - void SetHitTestableWithoutDrawsContent(bool should_hit_test) override; -- void SetOpaque(bool opaque) override; -+ CC_BLINK_EXPORT void SetOpaque(bool opaque) override; - bool Opaque() const override; - void SetPosition(const blink::WebFloatPoint& position) override; - blink::WebFloatPoint GetPosition() const override; diff --git a/chromium-64.0.3282.119-enable-mp3.patch b/chromium-64.0.3282.119-enable-mp3.patch deleted file mode 100644 index 849b5ee..0000000 --- a/chromium-64.0.3282.119-enable-mp3.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up chromium-64.0.3282.119/media/base/mime_util_internal.cc.mp3 chromium-64.0.3282.119/media/base/mime_util_internal.cc ---- chromium-64.0.3282.119/media/base/mime_util_internal.cc.mp3 2018-01-24 15:05:48.000000000 -0500 -+++ chromium-64.0.3282.119/media/base/mime_util_internal.cc 2018-01-25 11:18:12.354147726 -0500 -@@ -279,15 +279,19 @@ void MimeUtil::AddSupportedMediaFormats( - CodecSet webm_codecs(webm_audio_codecs); - webm_codecs.insert(webm_video_codecs.begin(), webm_video_codecs.end()); - --#if BUILDFLAG(USE_PROPRIETARY_CODECS) - const CodecSet mp3_codecs{MP3}; -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - const CodecSet aac{MPEG2_AAC, MPEG4_AAC}; -+#else -+ const CodecSet aac{}; -+#endif -+ CodecSet mp4_audio_codecs(aac); -+ mp4_audio_codecs.emplace(MP3); - -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - CodecSet avc_and_aac(aac); - avc_and_aac.emplace(H264); - -- CodecSet mp4_audio_codecs(aac); -- mp4_audio_codecs.emplace(MP3); - mp4_audio_codecs.emplace(FLAC); - #if BUILDFLAG(ENABLE_AC3_EAC3_AUDIO_DEMUXING) - mp4_audio_codecs.emplace(AC3); -@@ -329,10 +333,10 @@ void MimeUtil::AddSupportedMediaFormats( - AddContainerWithCodecs("application/ogg", ogg_codecs, false); - AddContainerWithCodecs("audio/flac", implicit_codec, false); - --#if BUILDFLAG(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/mpeg", mp3_codecs, true); // Allow "mp3". - AddContainerWithCodecs("audio/mp3", implicit_codec, true); - AddContainerWithCodecs("audio/x-mp3", implicit_codec, true); -+#if BUILDFLAG(USE_PROPRIETARY_CODECS) - AddContainerWithCodecs("audio/aac", implicit_codec, true); // AAC / ADTS. - AddContainerWithCodecs("audio/mp4", mp4_audio_codecs, true); - DCHECK(!mp4_video_codecs.empty()); -@@ -970,7 +974,6 @@ bool MimeUtil::IsCodecProprietary(Codec - case INVALID_CODEC: - case AC3: - case EAC3: -- case MP3: - case MPEG2_AAC: - case MPEG4_AAC: - case H264: -@@ -978,6 +981,7 @@ bool MimeUtil::IsCodecProprietary(Codec - case DOLBY_VISION: - return true; - -+ case MP3: - case PCM: - case VORBIS: - case OPUS: diff --git a/chromium-64.0.3282.119-gcc-constexpr-fix.patch b/chromium-64.0.3282.119-gcc-constexpr-fix.patch deleted file mode 100644 index 57b63cd..0000000 --- a/chromium-64.0.3282.119-gcc-constexpr-fix.patch +++ /dev/null @@ -1,70 +0,0 @@ -diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h ---- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h.gcc-constexpr 2018-01-25 15:50:16.971171007 -0500 -+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/StaticType.h 2018-01-25 15:51:14.158053914 -0500 -@@ -160,7 +160,7 @@ template --const TType *GetForVecMatHelper(unsigned char primarySize) -+constexpr const TType *GetForVecMatHelper(unsigned char primarySize) - { - static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt || - basicType == EbtBool, -@@ -186,7 +186,7 @@ const TType *GetForVecMatHelper(unsigned - template --const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1) -+constexpr const TType *GetForVecMat(unsigned char primarySize, unsigned char secondarySize = 1) - { - static_assert(basicType == EbtFloat || basicType == EbtInt || basicType == EbtUInt || - basicType == EbtBool, -@@ -208,7 +208,7 @@ const TType *GetForVecMat(unsigned char - } - - template --const TType *GetForVec(TQualifier qualifier, unsigned char size) -+constexpr const TType *GetForVec(TQualifier qualifier, unsigned char size) - { - switch (qualifier) - { -diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp ---- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp.gcc-constexpr 2018-01-25 15:51:27.670790008 -0500 -+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/SymbolTable.cpp 2018-01-25 15:52:04.117077652 -0500 -@@ -189,7 +189,7 @@ TSymbolTable::~TSymbolTable() - pop(); - } - --bool IsGenType(const TType *type) -+constexpr bool IsGenType(const TType *type) - { - if (type) - { -@@ -201,7 +201,7 @@ bool IsGenType(const TType *type) - return false; - } - --bool IsVecType(const TType *type) -+constexpr bool IsVecType(const TType *type) - { - if (type) - { -diff -up chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h.gcc-constexpr chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h ---- chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h.gcc-constexpr 2018-01-25 15:52:15.042864767 -0500 -+++ chromium-64.0.3282.119/third_party/angle/src/compiler/translator/Types.h 2018-01-25 15:52:56.763049389 -0500 -@@ -236,13 +236,13 @@ class TType - { - } - -- TBasicType getBasicType() const { return type; } -+ constexpr TBasicType getBasicType() const { return type; } - void setBasicType(TBasicType t); - - TPrecision getPrecision() const { return precision; } - void setPrecision(TPrecision p) { precision = p; } - -- TQualifier getQualifier() const { return qualifier; } -+ constexpr TQualifier getQualifier() const { return qualifier; } - void setQualifier(TQualifier q) { qualifier = q; } - - bool isInvariant() const { return invariant; } diff --git a/chromium-64.0.3282.119-gcc-round-fix.patch b/chromium-64.0.3282.119-gcc-round-fix.patch deleted file mode 100644 index 465808c..0000000 --- a/chromium-64.0.3282.119-gcc-round-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-64.0.3282.119/third_party/webrtc/p2p/base/port.cc.gcc-round-fix chromium-64.0.3282.119/third_party/webrtc/p2p/base/port.cc ---- chromium-64.0.3282.119/third_party/webrtc/p2p/base/port.cc.gcc-round-fix 2018-01-25 12:03:14.696443814 -0500 -+++ chromium-64.0.3282.119/third_party/webrtc/p2p/base/port.cc 2018-01-25 12:20:26.446448618 -0500 -@@ -10,7 +10,7 @@ - - #include "p2p/base/port.h" - --#include -+#include - - #include - #include diff --git a/chromium-64.0.3282.119-gcc5-r3.patch b/chromium-64.0.3282.119-gcc5-r3.patch deleted file mode 100644 index 3679ecf..0000000 --- a/chromium-64.0.3282.119-gcc5-r3.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff -up chromium-64.0.3282.119/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-64.0.3282.119/gpu/ipc/common/mailbox_struct_traits.h ---- chromium-64.0.3282.119/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2018-01-24 15:05:47.000000000 -0500 -+++ chromium-64.0.3282.119/gpu/ipc/common/mailbox_struct_traits.h 2018-01-25 11:58:48.251623423 -0500 -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; -diff -up chromium-64.0.3282.119/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 chromium-64.0.3282.119/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ---- chromium-64.0.3282.119/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 2018-01-24 15:05:51.000000000 -0500 -+++ chromium-64.0.3282.119/services/viz/public/cpp/compositing/filter_operation_struct_traits.h 2018-01-25 11:58:48.252623400 -0500 -@@ -137,7 +137,7 @@ struct StructTraits matrix(const cc::FilterOperation& operation) { - if (operation.type() != cc::FilterOperation::COLOR_MATRIX) - return base::span(); -- return operation.matrix(); -+ return base::make_span(operation.matrix()); - } - - static base::span shape( -diff -up chromium-64.0.3282.119/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-64.0.3282.119/services/viz/public/cpp/compositing/quads_struct_traits.h ---- chromium-64.0.3282.119/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2018-01-24 15:05:51.000000000 -0500 -+++ chromium-64.0.3282.119/services/viz/public/cpp/compositing/quads_struct_traits.h 2018-01-25 11:58:48.252623400 -0500 -@@ -308,7 +308,7 @@ struct StructTraits vertex_opacity(const viz::DrawQuad& input) { - const viz::TextureDrawQuad* quad = - viz::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const viz::DrawQuad& input) { -diff -up chromium-64.0.3282.119/third_party/WebKit/Source/platform/exported/WebCORS.cpp.gcc5-r3 chromium-64.0.3282.119/third_party/WebKit/Source/platform/exported/WebCORS.cpp -diff -up chromium-64.0.3282.119/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 chromium-64.0.3282.119/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ---- chromium-64.0.3282.119/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 2018-01-24 15:06:11.000000000 -0500 -+++ chromium-64.0.3282.119/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h 2018-01-25 11:58:48.253623376 -0500 -@@ -62,7 +62,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -93,11 +93,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } -diff -up chromium-64.0.3282.119/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-64.0.3282.119/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc ---- chromium-64.0.3282.119/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2018-01-25 11:58:48.253623376 -0500 -+++ chromium-64.0.3282.119/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2018-01-25 12:01:28.769900550 -0500 -@@ -10,7 +10,7 @@ - - #include "modules/audio_processing/aec3/aec_state.h" - --#include -+#include - - #include - #include diff --git a/chromium-64.0.3282.119-gcc5.patch b/chromium-64.0.3282.119-gcc5.patch deleted file mode 100644 index 0fdc39f..0000000 --- a/chromium-64.0.3282.119-gcc5.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -up chromium-64.0.3282.119/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-64.0.3282.119/third_party/webgl/src/specs/latest/2.0/webgl2.idl ---- chromium-64.0.3282.119/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 2018-01-25 11:07:27.179175007 -0500 -+++ chromium-64.0.3282.119/third_party/webgl/src/specs/latest/2.0/webgl2.idl 2018-01-25 11:07:38.037925336 -0500 -@@ -263,7 +263,7 @@ interface WebGL2RenderingContextBase - const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43; - const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44; - const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46; -- const GLenum INVALID_INDEX = 0xFFFFFFFF; -+ const GLenum INVALID_INDEX = 256; - const GLenum MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122; - const GLenum MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125; - const GLenum MAX_SERVER_WAIT_TIMEOUT = 0x9111; -diff -up chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.h ---- chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 2018-01-25 11:11:08.581962228 -0500 -+++ chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.h 2018-01-25 11:11:24.062593478 -0500 -@@ -49,7 +49,7 @@ class NodeFilter final { - * to the value of NodeType for the equivalent node type. - */ - enum { -- kShowAll = 0xFFFFFFFF, -+ kShowAll = 256 /* 0xFFFFFFFF */, - kShowElement = 0x00000001, - kShowAttribute = 0x00000002, - kShowText = 0x00000004, -diff -up chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.idl ---- chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 2018-01-25 11:11:34.816335412 -0500 -+++ chromium-64.0.3282.119/third_party/WebKit/Source/core/dom/NodeFilter.idl 2018-01-25 11:12:23.380171262 -0500 -@@ -27,7 +27,7 @@ callback interface NodeFilter { - const unsigned short FILTER_SKIP = 3; - - // Constants for whatToShow -- const unsigned long SHOW_ALL = 0xFFFFFFFF; -+ const unsigned long SHOW_ALL = 256; // 0xFFFFFFFF - const unsigned long SHOW_ELEMENT = 0x1; - const unsigned long SHOW_ATTRIBUTE = 0x2; // historical - const unsigned long SHOW_TEXT = 0x4; -diff -up chromium-64.0.3282.119/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-64.0.3282.119/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl ---- chromium-64.0.3282.119/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 2018-01-25 11:12:57.367363214 -0500 -+++ chromium-64.0.3282.119/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl 2018-01-25 11:13:29.883590960 -0500 -@@ -241,7 +241,7 @@ typedef unsigned long long GLuint64; - const GLenum UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43; - const GLenum UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44; - const GLenum UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46; -- const GLenum INVALID_INDEX = 0xFFFFFFFF; -+ const GLenum INVALID_INDEX = 256; - const GLenum MAX_VERTEX_OUTPUT_COMPONENTS = 0x9122; - const GLenum MAX_FRAGMENT_INPUT_COMPONENTS = 0x9125; - const GLenum MAX_SERVER_WAIT_TIMEOUT = 0x9111; -@@ -271,7 +271,7 @@ typedef unsigned long long GLuint64; - const GLenum TEXTURE_IMMUTABLE_FORMAT = 0x912F; - const GLenum MAX_ELEMENT_INDEX = 0x8D6B; - const GLenum TEXTURE_IMMUTABLE_LEVELS = 0x82DF; -- const GLint TIMEOUT_IGNORED = -1; -+ const GLint TIMEOUT_IGNORED = 256; - - /* WebGL-specific enums */ - const GLenum MAX_CLIENT_WAIT_TIMEOUT_WEBGL = 0x9247; diff --git a/chromium-64.0.3282.119-gcc7.patch b/chromium-64.0.3282.119-gcc7.patch deleted file mode 100644 index 7fe383e..0000000 --- a/chromium-64.0.3282.119-gcc7.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-64.0.3282.119/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-64.0.3282.119/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h ---- chromium-64.0.3282.119/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 2018-01-25 11:15:00.291466617 -0500 -+++ chromium-64.0.3282.119/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2018-01-25 11:16:36.159320291 -0500 -@@ -10,6 +10,7 @@ - #include "platform/wtf/Functional.h" - #include "platform/wtf/ThreadSpecific.h" - -+#include - #include - - namespace blink { diff --git a/chromium-64.0.3282.119-memcpy-fix.patch b/chromium-64.0.3282.119-memcpy-fix.patch deleted file mode 100644 index 39c3c25..0000000 --- a/chromium-64.0.3282.119-memcpy-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-64.0.3282.119/cc/paint/raw_memory_transfer_cache_entry.cc.memcpyfix chromium-64.0.3282.119/cc/paint/raw_memory_transfer_cache_entry.cc ---- chromium-64.0.3282.119/cc/paint/raw_memory_transfer_cache_entry.cc.memcpyfix 2018-01-26 15:04:44.708100850 -0500 -+++ chromium-64.0.3282.119/cc/paint/raw_memory_transfer_cache_entry.cc 2018-01-26 15:04:54.234915081 -0500 -@@ -3,6 +3,7 @@ - // found in the LICENSE file. - - #include "cc/paint/raw_memory_transfer_cache_entry.h" -+#include - - namespace cc { - diff --git a/chromium-64.0.3282.167-gcc8-fabi11.patch b/chromium-64.0.3282.167-gcc8-fabi11.patch deleted file mode 100644 index 5f0c527..0000000 --- a/chromium-64.0.3282.167-gcc8-fabi11.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py.fabi11 chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py ---- chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py.fabi11 2018-02-19 11:39:15.807713662 -0500 -+++ chromium-64.0.3282.167/tools/gn/bootstrap/bootstrap.py 2018-02-19 11:39:47.038070341 -0500 -@@ -336,6 +336,11 @@ def write_gn_ninja(path, root_gen_dir, o - cflags = os.environ.get('CFLAGS', '').split() - cflags_cc = os.environ.get('CXXFLAGS', '').split() - ldflags = os.environ.get('LDFLAGS', '').split() -+ -+ # Work around GCC8 bug gcc#84286 -+ cflags.extend(['-fabi-version=11']) -+ cflags_cc.extend(['-fabi-version=11']) -+ - include_dirs = [root_gen_dir, SRC_ROOT] - libs = [] - diff --git a/chromium-65.0.3325.146-Fix-non-copyable-class-s-optional-move.patch b/chromium-65.0.3325.146-Fix-non-copyable-class-s-optional-move.patch deleted file mode 100644 index 6cf8ca8..0000000 --- a/chromium-65.0.3325.146-Fix-non-copyable-class-s-optional-move.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up chromium-65.0.3325.146/base/optional.h.noncopyable chromium-65.0.3325.146/base/optional.h ---- chromium-65.0.3325.146/base/optional.h.noncopyable 2018-03-13 16:52:15.953729689 -0400 -+++ chromium-65.0.3325.146/base/optional.h 2018-03-13 16:53:55.365792522 -0400 -@@ -45,6 +45,15 @@ struct OptionalStorageBase { - - // When T is not trivially destructible we must call its - // destructor before deallocating its memory. -+ // Note that this hides the (implicitly declared) move constructor, which -+ // would be used for constexpr move constructor in OptionalStorage. -+ // It is needed iff T is trivially move constructible. However, the current -+ // is_trivially_{copy,move}_constructible implementation requires -+ // is_trivially_destructible (which looks a bug, cf: -+ // https://gcc.gnu.org/bugzilla/show_bug.cgi?id=51452 and -+ // http://cplusplus.github.io/LWG/lwg-active.html#2116), so it is not -+ // necessary for this case at the moment. Please see also the destructor -+ // comment in "is_trivially_destructible = true" specialization below. - ~OptionalStorageBase() { - if (!is_null_) - value_.~T(); -@@ -78,9 +87,18 @@ struct OptionalStorageBase(args)...) {} - - // When T is trivially destructible (i.e. its destructor does nothing) there -- // is no need to call it. Explicitly defaulting the destructor means it's not -- // user-provided. Those two together make this destructor trivial. -- ~OptionalStorageBase() = default; -+ // is no need to call it. Implicitly defined destructor is trivial, because -+ // both members (bool and union containing only variants which are trivially -+ // destructible) are trivially destructible. -+ // Explicitly-defaulted destructor is also trivial, but do not use it here, -+ // because it hides the implicit move constructor. It is needed to implement -+ // constexpr move constructor in OptionalStorage iff T is trivially move -+ // constructible. Note that, if T is trivially move constructible, the move -+ // constructor of OptionalStorageBase is also implicitly defined and it is -+ // trivially move constructor. If T is not trivially move constructible, -+ // "not declaring move constructor without destructor declaration" here means -+ // "delete move constructor", which works because any move constructor of -+ // OptionalStorage will not refer to it in that case. - - template - void Init(Args&&... args) { diff --git a/chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patch b/chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patch deleted file mode 100644 index dbdf68f..0000000 --- a/chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp.GetString chromium-65.0.3325.146/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp ---- chromium-65.0.3325.146/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp.GetString 2018-03-13 22:54:27.262671113 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/bindings/modules/v8/V8BindingForModules.cpp 2018-03-13 22:55:47.722113713 -0400 -@@ -68,7 +68,7 @@ v8::Local ToV8(const IDBKeyPa - case IDBKeyPath::kNullType: - return v8::Null(isolate); - case IDBKeyPath::kStringType: -- return V8String(isolate, value.String()); -+ return V8String(isolate, value.GetString()); - case IDBKeyPath::kArrayType: - return ToV8(value.Array(), creation_context, isolate); - } -@@ -97,7 +97,7 @@ v8::Local ToV8(const IDBKey* - case IDBKey::kNumberType: - return v8::Number::New(isolate, key->Number()); - case IDBKey::kStringType: -- return V8String(isolate, key->String()); -+ return V8String(isolate, key->GetString()); - case IDBKey::kBinaryType: - // https://w3c.github.io/IndexedDB/#convert-a-value-to-a-key - return ToV8(DOMArrayBuffer::Create(key->Binary()), creation_context, -@@ -379,7 +379,7 @@ static std::unique_ptr CreateIDB - } - - DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType); -- return CreateIDBKeyFromValueAndKeyPath(isolate, value, key_path.String(), -+ return CreateIDBKeyFromValueAndKeyPath(isolate, value, key_path.GetString(), - exception_state); - } - -@@ -483,7 +483,7 @@ bool InjectV8KeyIntoV8Value(v8::Isolate* - DCHECK(isolate->InContext()); - - DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType); -- Vector key_path_elements = ParseKeyPath(key_path.String()); -+ Vector key_path_elements = ParseKeyPath(key_path.GetString()); - - // The conbination of a key generator and an empty key path is forbidden by - // spec. -@@ -569,7 +569,7 @@ bool CanInjectIDBKeyIntoScriptValue(v8:: - const IDBKeyPath& key_path) { - IDB_TRACE("canInjectIDBKeyIntoScriptValue"); - DCHECK_EQ(key_path.GetType(), IDBKeyPath::kStringType); -- Vector key_path_elements = ParseKeyPath(key_path.String()); -+ Vector key_path_elements = ParseKeyPath(key_path.GetString()); - - if (!key_path_elements.size()) - return false; -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp ---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp.GetString 2018-03-13 22:56:04.041798217 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/exported/WebIDBKey.cpp 2018-03-13 22:56:22.481440993 -0400 -@@ -56,7 +56,7 @@ WebData WebIDBKeyView::Binary() const { - } - - WebString WebIDBKeyView::String() const { -- return private_->String(); -+ return private_->GetString(); - } - - double WebIDBKeyView::Date() const { -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp ---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp.GetString 2018-03-13 22:56:36.028178758 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.cpp 2018-03-13 22:56:58.846736831 -0400 -@@ -297,7 +297,7 @@ IDBObjectStore* IDBDatabase::createObjec - } - - if (auto_increment && ((key_path.GetType() == IDBKeyPath::kStringType && -- key_path.String().IsEmpty()) || -+ key_path.GetString().IsEmpty()) || - key_path.GetType() == IDBKeyPath::kArrayType)) { - exception_state.ThrowDOMException( - kInvalidAccessError, -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKey.h.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKey.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKey.h.GetString 2018-03-13 22:57:13.229458842 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKey.h 2018-03-13 22:57:38.633966776 -0400 -@@ -106,7 +106,7 @@ class MODULES_EXPORT IDBKey { - return binary_; - } - -- const String& String() const { -+ const String& GetString() const { - DCHECK_EQ(type_, kStringType); - return string_; - } -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h.GetString 2018-03-13 22:57:51.104725428 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/IDBKeyPath.h 2018-03-13 22:58:09.459369906 -0400 -@@ -65,7 +65,7 @@ class MODULES_EXPORT IDBKeyPath { - return array_; - } - -- const String& String() const { -+ const String& GetString() const { - DCHECK_EQ(type_, kStringType); - return string_; - } -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp.GetString chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp ---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp.GetString 2018-03-13 22:58:28.778995834 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/indexeddb/InspectorIndexedDBAgent.cpp 2018-03-13 22:58:45.044681364 -0400 -@@ -399,7 +399,7 @@ static std::unique_ptr KeyPathF - case IDBKeyPath::kStringType: - key_path = KeyPath::create() - .setType(KeyPath::TypeEnum::String) -- .setString(idb_key_path.String()) -+ .setString(idb_key_path.GetString()) - .build(); - break; - case IDBKeyPath::kArrayType: { diff --git a/chromium-65.0.3325.146-GCC-PlaybackImageProvider-Settings-do-not-provide-co.patch b/chromium-65.0.3325.146-GCC-PlaybackImageProvider-Settings-do-not-provide-co.patch deleted file mode 100644 index 8edc424..0000000 --- a/chromium-65.0.3325.146-GCC-PlaybackImageProvider-Settings-do-not-provide-co.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up chromium-65.0.3325.146/cc/raster/playback_image_provider.cc.pipcc chromium-65.0.3325.146/cc/raster/playback_image_provider.cc ---- chromium-65.0.3325.146/cc/raster/playback_image_provider.cc.pipcc 2018-03-13 22:47:00.271322726 -0400 -+++ chromium-65.0.3325.146/cc/raster/playback_image_provider.cc 2018-03-13 22:47:53.127300060 -0400 -@@ -92,7 +92,6 @@ PlaybackImageProvider::GetDecodedDrawIma - } - - PlaybackImageProvider::Settings::Settings() = default; --PlaybackImageProvider::Settings::Settings(const Settings& other) = default; - PlaybackImageProvider::Settings::~Settings() = default; - - } // namespace cc -diff -up chromium-65.0.3325.146/cc/raster/playback_image_provider.h.pipcc chromium-65.0.3325.146/cc/raster/playback_image_provider.h ---- chromium-65.0.3325.146/cc/raster/playback_image_provider.h.pipcc 2018-03-13 22:48:00.673153629 -0400 -+++ chromium-65.0.3325.146/cc/raster/playback_image_provider.h 2018-03-13 22:48:12.726920597 -0400 -@@ -20,7 +20,6 @@ class CC_EXPORT PlaybackImageProvider : - public: - struct CC_EXPORT Settings { - Settings(); -- Settings(const Settings& other); - ~Settings(); - - // The set of image ids to skip during raster. diff --git a/chromium-65.0.3325.146-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch b/chromium-65.0.3325.146-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch deleted file mode 100644 index 62124be..0000000 --- a/chromium-65.0.3325.146-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up chromium-65.0.3325.146/services/preferences/tracked/pref_hash_filter.h.fulldecl chromium-65.0.3325.146/services/preferences/tracked/pref_hash_filter.h ---- chromium-65.0.3325.146/services/preferences/tracked/pref_hash_filter.h.fulldecl 2018-03-13 16:38:38.870652491 -0400 -+++ chromium-65.0.3325.146/services/preferences/tracked/pref_hash_filter.h 2018-03-13 16:39:02.691186647 -0400 -@@ -21,9 +21,9 @@ - #include "services/preferences/public/interfaces/preferences.mojom.h" - #include "services/preferences/tracked/hash_store_contents.h" - #include "services/preferences/tracked/interceptable_pref_filter.h" -+#include "services/preferences/tracked/pref_hash_store.h" - #include "services/preferences/tracked/tracked_preference.h" - --class PrefHashStore; - class PrefService; - - namespace base { -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h.fulldecl chromium-65.0.3325.146/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h.fulldecl 2018-03-13 16:39:13.787970233 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h 2018-03-13 16:39:42.614407235 -0400 -@@ -30,6 +30,7 @@ - - #include - #include "modules/webdatabase/DatabaseBasicTypes.h" -+#include "modules/webdatabase/SQLError.h" - #include "modules/webdatabase/SQLStatement.h" - #include "modules/webdatabase/SQLStatementBackend.h" - #include "modules/webdatabase/SQLTransactionStateMachine.h" -@@ -41,7 +42,6 @@ - namespace blink { - - class Database; --class SQLErrorData; - class SQLiteTransaction; - class SQLTransaction; - class SQLTransactionBackend; diff --git a/chromium-65.0.3325.146-GCC-explicitely-std-move-to-base-Optional-instead-of.patch b/chromium-65.0.3325.146-GCC-explicitely-std-move-to-base-Optional-instead-of.patch deleted file mode 100644 index 9c6f315..0000000 --- a/chromium-65.0.3325.146-GCC-explicitely-std-move-to-base-Optional-instead-of.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up chromium-65.0.3325.146/content/browser/appcache/appcache_request_handler.cc.explicit-std-move chromium-65.0.3325.146/content/browser/appcache/appcache_request_handler.cc ---- chromium-65.0.3325.146/content/browser/appcache/appcache_request_handler.cc.explicit-std-move 2018-03-13 22:50:41.346043716 -0400 -+++ chromium-65.0.3325.146/content/browser/appcache/appcache_request_handler.cc 2018-03-13 22:51:21.428267583 -0400 -@@ -639,7 +639,7 @@ AppCacheRequestHandler::MaybeCreateSubre - - SubresourceLoaderParams params; - params.loader_factory_info = factory_ptr.PassInterface(); -- return params; -+ return base::Optional(std::move(params)); - } - - void AppCacheRequestHandler::MaybeCreateSubresourceLoader( -diff -up chromium-65.0.3325.146/content/browser/service_worker/service_worker_controllee_request_handler.cc.explicit-std-move chromium-65.0.3325.146/content/browser/service_worker/service_worker_controllee_request_handler.cc ---- chromium-65.0.3325.146/content/browser/service_worker/service_worker_controllee_request_handler.cc.explicit-std-move 2018-03-13 22:51:38.133943776 -0400 -+++ chromium-65.0.3325.146/content/browser/service_worker/service_worker_controllee_request_handler.cc 2018-03-13 22:51:57.658566347 -0400 -@@ -271,7 +271,7 @@ ServiceWorkerControlleeRequestHandler::M - controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle( - provider_host_->controller()); - params.controller_service_worker_info = std::move(controller_info); -- return params; -+ return base::Optional(std::move(params)); - } - - void ServiceWorkerControlleeRequestHandler::PrepareForMainResource( diff --git a/chromium-65.0.3325.146-GCC-fully-declare-ConfigurationPolicyProvider.patch b/chromium-65.0.3325.146-GCC-fully-declare-ConfigurationPolicyProvider.patch deleted file mode 100644 index 809a321..0000000 --- a/chromium-65.0.3325.146-GCC-fully-declare-ConfigurationPolicyProvider.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up chromium-65.0.3325.146/components/policy/core/browser/browser_policy_connector_base.h.fully-declare chromium-65.0.3325.146/components/policy/core/browser/browser_policy_connector_base.h ---- chromium-65.0.3325.146/components/policy/core/browser/browser_policy_connector_base.h.fully-declare 2018-03-13 23:02:13.989635567 -0400 -+++ chromium-65.0.3325.146/components/policy/core/browser/browser_policy_connector_base.h 2018-03-13 23:02:44.318048625 -0400 -@@ -12,13 +12,13 @@ - #include "base/macros.h" - #include "base/optional.h" - #include "components/policy/core/browser/configuration_policy_handler_list.h" -+#include "components/policy/core/common/configuration_policy_provider.h" - #include "components/policy/core/common/schema.h" - #include "components/policy/core/common/schema_registry.h" - #include "components/policy/policy_export.h" - - namespace policy { - --class ConfigurationPolicyProvider; - class PolicyService; - class PolicyServiceImpl; - diff --git a/chromium-65.0.3325.146-Implement-conditional-copy-move-ctors-assign-operato.patch b/chromium-65.0.3325.146-Implement-conditional-copy-move-ctors-assign-operato.patch deleted file mode 100644 index 9b4befe..0000000 --- a/chromium-65.0.3325.146-Implement-conditional-copy-move-ctors-assign-operato.patch +++ /dev/null @@ -1,91 +0,0 @@ -diff -up chromium-65.0.3325.146/base/optional.h.conditional chromium-65.0.3325.146/base/optional.h ---- chromium-65.0.3325.146/base/optional.h.conditional 2018-03-13 22:11:02.328058249 -0400 -+++ chromium-65.0.3325.146/base/optional.h 2018-03-13 22:12:43.622098296 -0400 -@@ -266,6 +266,58 @@ class OptionalBase { - OptionalStorage storage_; - }; - -+// The following {Copy,Move}{Constructible,Assignable} structs are helpers to -+// implement constructor/assign-operator overloading. Specifically, if T is -+// is not movable but copyable, Optional's move constructor should not -+// participate in overload resolution. This inheritance trick implements that. -+template -+struct CopyConstructible {}; -+ -+template <> -+struct CopyConstructible { -+ constexpr CopyConstructible() = default; -+ constexpr CopyConstructible(const CopyConstructible&) = delete; -+ constexpr CopyConstructible(CopyConstructible&&) = default; -+ CopyConstructible& operator=(const CopyConstructible&) = default; -+ CopyConstructible& operator=(CopyConstructible&&) = default; -+}; -+ -+template -+struct MoveConstructible {}; -+ -+template <> -+struct MoveConstructible { -+ constexpr MoveConstructible() = default; -+ constexpr MoveConstructible(const MoveConstructible&) = default; -+ constexpr MoveConstructible(MoveConstructible&&) = delete; -+ MoveConstructible& operator=(const MoveConstructible&) = default; -+ MoveConstructible& operator=(MoveConstructible&&) = default; -+}; -+ -+template -+struct CopyAssignable {}; -+ -+template <> -+struct CopyAssignable { -+ constexpr CopyAssignable() = default; -+ constexpr CopyAssignable(const CopyAssignable&) = default; -+ constexpr CopyAssignable(CopyAssignable&&) = default; -+ CopyAssignable& operator=(const CopyAssignable&) = delete; -+ CopyAssignable& operator=(CopyAssignable&&) = default; -+}; -+ -+template -+struct MoveAssignable {}; -+ -+template <> -+struct MoveAssignable { -+ constexpr MoveAssignable() = default; -+ constexpr MoveAssignable(const MoveAssignable&) = default; -+ constexpr MoveAssignable(MoveAssignable&&) = default; -+ MoveAssignable& operator=(const MoveAssignable&) = default; -+ MoveAssignable& operator=(MoveAssignable&&) = delete; -+}; -+ - } // namespace internal - - // base::Optional is a Chromium version of the C++17 optional class: -@@ -280,12 +332,18 @@ class OptionalBase { - // - No exceptions are thrown, because they are banned from Chromium. - // - All the non-members are in the 'base' namespace instead of 'std'. - template --class Optional : public internal::OptionalBase { -+class Optional -+ : public internal::OptionalBase, -+ public internal::CopyConstructible::value>, -+ public internal::MoveConstructible::value>, -+ public internal::CopyAssignable::value && -+ std::is_copy_assignable::value>, -+ public internal::MoveAssignable::value && -+ std::is_move_assignable::value> { - public: - using value_type = T; - - // Defer default/copy/move constructor implementation to OptionalBase. -- // TODO(hidehiko): Implement conditional enabling. - constexpr Optional() = default; - constexpr Optional(const Optional& other) = default; - constexpr Optional(Optional&& other) = default; -@@ -316,7 +374,6 @@ class Optional : public internal::Option - ~Optional() = default; - - // Defer copy-/move- assign operator implementation to OptionalBase. -- // TOOD(hidehiko): Implement conditional enabling. - Optional& operator=(const Optional& other) = default; - Optional& operator=(Optional&& other) = default; - diff --git a/chromium-65.0.3325.146-Implement-converting-constructors-from-Optional-U.patch b/chromium-65.0.3325.146-Implement-converting-constructors-from-Optional-U.patch deleted file mode 100644 index 3214104..0000000 --- a/chromium-65.0.3325.146-Implement-converting-constructors-from-Optional-U.patch +++ /dev/null @@ -1,116 +0,0 @@ -diff -up chromium-65.0.3325.146/base/optional.h.converting chromium-65.0.3325.146/base/optional.h ---- chromium-65.0.3325.146/base/optional.h.converting 2018-03-13 22:31:05.248797490 -0400 -+++ chromium-65.0.3325.146/base/optional.h 2018-03-13 22:33:10.826368771 -0400 -@@ -31,6 +31,10 @@ constexpr in_place_t in_place = {}; - // http://en.cppreference.com/w/cpp/utility/optional/nullopt - constexpr nullopt_t nullopt(0); - -+// Forward declaration, which is refered by following helpers. -+template -+class Optional; -+ - namespace internal { - - template ::value> -@@ -220,6 +224,19 @@ class OptionalBase { - constexpr explicit OptionalBase(in_place_t, Args&&... args) - : storage_(in_place, std::forward(args)...) {} - -+ // Implementation of converting constructors. -+ template -+ explicit OptionalBase(const OptionalBase& other) { -+ if (other.storage_.is_populated_) -+ storage_.Init(other.storage_.value_); -+ } -+ -+ template -+ explicit OptionalBase(OptionalBase&& other) { -+ if (other.storage_.is_populated_) -+ storage_.Init(std::move(other.storage_.value_)); -+ } -+ - ~OptionalBase() = default; - - OptionalBase& operator=(const OptionalBase& other) { -@@ -263,6 +280,11 @@ class OptionalBase { - storage_.is_populated_ = false; - } - -+ // For implementing conversion, allow access to other typed OptionalBase -+ // class. -+ template -+ friend class OptionalBase; -+ - OptionalStorage storage_; - }; - -@@ -318,6 +340,20 @@ struct MoveAssignable { - MoveAssignable& operator=(MoveAssignable&&) = delete; - }; - -+// Helper to conditionally enable converting constructors. -+template -+struct IsConvertibleFromOptional -+ : std::integral_constant< -+ bool, -+ std::is_constructible&>::value || -+ std::is_constructible&>::value || -+ std::is_constructible&&>::value || -+ std::is_constructible&&>::value || -+ std::is_convertible&, T>::value || -+ std::is_convertible&, T>::value || -+ std::is_convertible&&, T>::value || -+ std::is_convertible&&, T>::value> {}; -+ - } // namespace internal - - // base::Optional is a Chromium version of the C++17 optional class: -@@ -348,7 +384,47 @@ class Optional - constexpr Optional(const Optional& other) = default; - constexpr Optional(Optional&& other) = default; - -- constexpr Optional(nullopt_t) {} -+ constexpr Optional(nullopt_t) {} // NOLINT(runtime/explicit) -+ -+ // Converting copy constructor. "explicit" only if -+ // std::is_convertible::value is false. It is implemented by -+ // declaring two almost same constructors, but that condition in enable_if_t -+ // is different, so that either one is chosen, thanks to SFINAE. -+ template < -+ typename U, -+ std::enable_if_t::value && -+ !internal::IsConvertibleFromOptional::value && -+ std::is_convertible::value, -+ bool> = false> -+ Optional(const Optional& other) : internal::OptionalBase(other) {} -+ -+ template < -+ typename U, -+ std::enable_if_t::value && -+ !internal::IsConvertibleFromOptional::value && -+ !std::is_convertible::value, -+ bool> = false> -+ explicit Optional(const Optional& other) -+ : internal::OptionalBase(other) {} -+ -+ // Converting move constructor. Similar to converting copy constructor, -+ // declaring two (explicit and non-explicit) constructors. -+ template < -+ typename U, -+ std::enable_if_t::value && -+ !internal::IsConvertibleFromOptional::value && -+ std::is_convertible::value, -+ bool> = false> -+ Optional(Optional&& other) : internal::OptionalBase(std::move(other)) {} -+ -+ template < -+ typename U, -+ std::enable_if_t::value && -+ !internal::IsConvertibleFromOptional::value && -+ !std::is_convertible::value, -+ bool> = false> -+ explicit Optional(Optional&& other) -+ : internal::OptionalBase(std::move(other)) {} - - constexpr Optional(const T& value) - : internal::OptionalBase(in_place, value) {} diff --git a/chromium-65.0.3325.146-Implement-value-forward-constructor.patch b/chromium-65.0.3325.146-Implement-value-forward-constructor.patch deleted file mode 100644 index db727d8..0000000 --- a/chromium-65.0.3325.146-Implement-value-forward-constructor.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff -up chromium-65.0.3325.146/base/optional.h.vforward chromium-65.0.3325.146/base/optional.h ---- chromium-65.0.3325.146/base/optional.h.vforward 2018-03-13 22:35:46.383359966 -0400 -+++ chromium-65.0.3325.146/base/optional.h 2018-03-13 22:37:48.724992995 -0400 -@@ -354,6 +354,10 @@ struct IsConvertibleFromOptional - std::is_convertible&&, T>::value || - std::is_convertible&&, T>::value> {}; - -+// Forward compatibility for C++20. -+template -+using RemoveCvRefT = std::remove_cv_t>; -+ - } // namespace internal - - // base::Optional is a Chromium version of the C++17 optional class: -@@ -367,6 +371,13 @@ struct IsConvertibleFromOptional - // - 'constexpr' might be missing in some places for reasons specified locally. - // - No exceptions are thrown, because they are banned from Chromium. - // - All the non-members are in the 'base' namespace instead of 'std'. -+// -+// Note that T cannot have a constructor T(Optional) etc. Optional checks -+// T's constructor (specifically via IsConvertibleFromOptional), and in the -+// check whether T can be constructible from Optional, which is recursive -+// so it does not work. As of Feb 2018, std::optional C++17 implementation in -+// both clang and gcc has same limitation. MSVC SFINAE looks to have different -+// behavior, but anyway it reports an error, too. - template - class Optional - : public internal::OptionalBase, -@@ -426,12 +437,6 @@ class Optional - explicit Optional(Optional&& other) - : internal::OptionalBase(std::move(other)) {} - -- constexpr Optional(const T& value) -- : internal::OptionalBase(in_place, value) {} -- -- constexpr Optional(T&& value) -- : internal::OptionalBase(in_place, std::move(value)) {} -- - template - constexpr explicit Optional(in_place_t, Args&&... args) - : internal::OptionalBase(in_place, std::forward(args)...) {} -@@ -447,6 +452,30 @@ class Optional - Args&&... args) - : internal::OptionalBase(in_place, il, std::forward(args)...) {} - -+ // Forward value constructor. Similar to converting constructors, -+ // conditionally explicit. -+ template < -+ typename U = value_type, -+ std::enable_if_t< -+ std::is_constructible::value && -+ !std::is_same, in_place_t>::value && -+ !std::is_same, Optional>::value && -+ std::is_convertible::value, -+ bool> = false> -+ constexpr Optional(U&& value) -+ : internal::OptionalBase(in_place, std::forward(value)) {} -+ -+ template < -+ typename U = value_type, -+ std::enable_if_t< -+ std::is_constructible::value && -+ !std::is_same, in_place_t>::value && -+ !std::is_same, Optional>::value && -+ !std::is_convertible::value, -+ bool> = false> -+ constexpr explicit Optional(U&& value) -+ : internal::OptionalBase(in_place, std::forward(value)) {} -+ - ~Optional() = default; - - // Defer copy-/move- assign operator implementation to OptionalBase. diff --git a/chromium-65.0.3325.146-Update-non-copy-non-move-assign-operators.patch b/chromium-65.0.3325.146-Update-non-copy-non-move-assign-operators.patch deleted file mode 100644 index f9c4503..0000000 --- a/chromium-65.0.3325.146-Update-non-copy-non-move-assign-operators.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -up chromium-65.0.3325.146/base/optional.h.ncnm chromium-65.0.3325.146/base/optional.h ---- chromium-65.0.3325.146/base/optional.h.ncnm 2018-03-13 22:40:11.743226276 -0400 -+++ chromium-65.0.3325.146/base/optional.h 2018-03-13 22:44:30.948211358 -0400 -@@ -240,37 +240,37 @@ class OptionalBase { - ~OptionalBase() = default; - - OptionalBase& operator=(const OptionalBase& other) { -- if (!other.storage_.is_populated_) { -- FreeIfNeeded(); -- return *this; -- } -- -- InitOrAssign(other.storage_.value_); -+ CopyAssign(other); - return *this; - } - - OptionalBase& operator=(OptionalBase&& other) { -- if (!other.storage_.is_populated_) { -- FreeIfNeeded(); -- return *this; -- } -- -- InitOrAssign(std::move(other.storage_.value_)); -+ MoveAssign(std::move(other)); - return *this; - } - -- void InitOrAssign(const T& value) { -- if (!storage_.is_populated_) -- storage_.Init(value); -+ template -+ void CopyAssign(const OptionalBase& other) { -+ if (other.storage_.is_populated_) -+ InitOrAssign(other.storage_.value_); - else -- storage_.value_ = value; -+ FreeIfNeeded(); - } - -- void InitOrAssign(T&& value) { -- if (!storage_.is_populated_) -- storage_.Init(std::move(value)); -+ template -+ void MoveAssign(OptionalBase&& other) { -+ if (other.storage_.is_populated_) -+ InitOrAssign(std::move(other.storage_.value_)); -+ else -+ FreeIfNeeded(); -+ } -+ -+ template -+ void InitOrAssign(U&& value) { -+ if (storage_.is_populated_) -+ storage_.value_ = std::forward(value); - else -- storage_.value_ = std::move(value); -+ storage_.Init(std::forward(value)); - } - - void FreeIfNeeded() { -@@ -340,7 +340,7 @@ struct MoveAssignable { - MoveAssignable& operator=(MoveAssignable&&) = delete; - }; - --// Helper to conditionally enable converting constructors. -+// Helper to conditionally enable converting constructors and assign operators. - template - struct IsConvertibleFromOptional - : std::integral_constant< -@@ -354,6 +354,16 @@ struct IsConvertibleFromOptional - std::is_convertible&&, T>::value || - std::is_convertible&&, T>::value> {}; - -+template -+struct IsAssignableFromOptional -+ : std::integral_constant< -+ bool, -+ IsConvertibleFromOptional::value || -+ std::is_assignable&>::value || -+ std::is_assignable&>::value || -+ std::is_assignable&&>::value || -+ std::is_assignable&&>::value> {}; -+ - // Forward compatibility for C++20. - template - using RemoveCvRefT = std::remove_cv_t>; -@@ -487,14 +497,42 @@ class Optional - return *this; - } - -- template -- typename std::enable_if, T>::value, -- Optional&>::type -+ // Perfect-forwarded assignment. -+ template -+ std::enable_if_t< -+ !std::is_same, Optional>::value && -+ std::is_constructible::value && -+ std::is_assignable::value && -+ (!std::is_scalar::value || -+ !std::is_same, T>::value), -+ Optional&> - operator=(U&& value) { - InitOrAssign(std::forward(value)); - return *this; - } - -+// Copy assign the state of other. -+ template -+ std::enable_if_t::value && -+ std::is_constructible::value && -+ std::is_assignable::value, -+ Optional&> -+ operator=(const Optional& other) { -+ CopyAssign(other); -+ return *this; -+ } -+ -+ // Move assign the state of other. -+ template -+ std::enable_if_t::value && -+ std::is_constructible::value && -+ std::is_assignable::value, -+ Optional&> -+ operator=(Optional&& other) { -+ MoveAssign(std::move(other)); -+ return *this; -+ } -+ - constexpr const T* operator->() const { - DCHECK(storage_.is_populated_); - return &value(); -@@ -606,8 +644,10 @@ class Optional - private: - // Accessing template base class's protected member needs explicit - // declaration to do so. -+ using internal::OptionalBase::CopyAssign; - using internal::OptionalBase::FreeIfNeeded; - using internal::OptionalBase::InitOrAssign; -+ using internal::OptionalBase::MoveAssign; - using internal::OptionalBase::storage_; - }; - diff --git a/chromium-65.0.3325.146-Use-affirmative-expression-in-base-Optional.patch b/chromium-65.0.3325.146-Use-affirmative-expression-in-base-Optional.patch deleted file mode 100644 index 8aaea85..0000000 --- a/chromium-65.0.3325.146-Use-affirmative-expression-in-base-Optional.patch +++ /dev/null @@ -1,265 +0,0 @@ -diff -up chromium-65.0.3325.146/base/optional.h.affirmative chromium-65.0.3325.146/base/optional.h ---- chromium-65.0.3325.146/base/optional.h.affirmative 2018-03-13 22:27:29.451969704 -0400 -+++ chromium-65.0.3325.146/base/optional.h 2018-03-13 22:27:57.031436045 -0400 -@@ -41,7 +41,7 @@ struct OptionalStorageBase { - - template - constexpr explicit OptionalStorageBase(in_place_t, Args&&... args) -- : is_null_(false), value_(std::forward(args)...) {} -+ : is_populated_(true), value_(std::forward(args)...) {} - - // When T is not trivially destructible we must call its - // destructor before deallocating its memory. -@@ -55,18 +55,18 @@ struct OptionalStorageBase { - // necessary for this case at the moment. Please see also the destructor - // comment in "is_trivially_destructible = true" specialization below. - ~OptionalStorageBase() { -- if (!is_null_) -+ if (is_populated_) - value_.~T(); - } - - template - void Init(Args&&... args) { -- DCHECK(is_null_); -+ DCHECK(!is_populated_); - ::new (&value_) T(std::forward(args)...); -- is_null_ = false; -+ is_populated_ = true; - } - -- bool is_null_ = true; -+ bool is_populated_ = false; - union { - // |empty_| exists so that the union will always be initialized, even when - // it doesn't contain a value. Union members must be initialized for the -@@ -84,7 +84,7 @@ struct OptionalStorageBase - constexpr explicit OptionalStorageBase(in_place_t, Args&&... args) -- : is_null_(false), value_(std::forward(args)...) {} -+ : is_populated_(true), value_(std::forward(args)...) {} - - // When T is trivially destructible (i.e. its destructor does nothing) there - // is no need to call it. Implicitly defined destructor is trivial, because -@@ -102,12 +102,12 @@ struct OptionalStorageBase - void Init(Args&&... args) { -- DCHECK(is_null_); -+ DCHECK(!is_populated_); - ::new (&value_) T(std::forward(args)...); -- is_null_ = false; -+ is_populated_ = true; - } - -- bool is_null_ = true; -+ bool is_populated_ = false; - union { - // |empty_| exists so that the union will always be initialized, even when - // it doesn't contain a value. Union members must be initialized for the -@@ -133,7 +133,7 @@ struct OptionalStorage : OptionalStorage - - // Accessing the members of template base class requires explicit - // declaration. -- using OptionalStorageBase::is_null_; -+ using OptionalStorageBase::is_populated_; - using OptionalStorageBase::value_; - using OptionalStorageBase::Init; - -@@ -145,12 +145,12 @@ struct OptionalStorage : OptionalStorage - OptionalStorage() = default; - - OptionalStorage(const OptionalStorage& other) { -- if (!other.is_null_) -+ if (other.is_populated_) - Init(other.value_); - } - - OptionalStorage(OptionalStorage&& other) { -- if (!other.is_null_) -+ if (other.is_populated_) - Init(std::move(other.value_)); - } - }; -@@ -160,7 +160,7 @@ struct OptionalStorage - : OptionalStorageBase { -- using OptionalStorageBase::is_null_; -+ using OptionalStorageBase::is_populated_; - using OptionalStorageBase::value_; - using OptionalStorageBase::Init; - using OptionalStorageBase::OptionalStorageBase; -@@ -169,7 +169,7 @@ struct OptionalStorage - : OptionalStorageBase { -- using OptionalStorageBase::is_null_; -+ using OptionalStorageBase::is_populated_; - using OptionalStorageBase::value_; - using OptionalStorageBase::Init; - using OptionalStorageBase::OptionalStorageBase; -@@ -188,7 +188,7 @@ struct OptionalStorage storage_; -@@ -334,12 +334,12 @@ class Optional : public internal::Option - } - - constexpr const T* operator->() const { -- DCHECK(!storage_.is_null_); -+ DCHECK(storage_.is_populated_); - return &value(); - } - - constexpr T* operator->() { -- DCHECK(!storage_.is_null_); -+ DCHECK(storage_.is_populated_); - return &value(); - } - -@@ -351,27 +351,27 @@ class Optional : public internal::Option - - constexpr T&& operator*() && { return std::move(value()); } - -- constexpr explicit operator bool() const { return !storage_.is_null_; } -+ constexpr explicit operator bool() const { return storage_.is_populated_; } - -- constexpr bool has_value() const { return !storage_.is_null_; } -+ constexpr bool has_value() const { return storage_.is_populated_; } - - constexpr T& value() & { -- DCHECK(!storage_.is_null_); -+ DCHECK(storage_.is_populated_); - return storage_.value_; - } - - constexpr const T& value() const & { -- DCHECK(!storage_.is_null_); -+ DCHECK(storage_.is_populated_); - return storage_.value_; - } - - constexpr T&& value() && { -- DCHECK(!storage_.is_null_); -+ DCHECK(storage_.is_populated_); - return std::move(storage_.value_); - } - - constexpr const T&& value() const && { -- DCHECK(!storage_.is_null_); -+ DCHECK(storage_.is_populated_); - return std::move(storage_.value_); - } - -@@ -382,8 +382,9 @@ class Optional : public internal::Option - // "T must be copy constructible"); - static_assert(std::is_convertible::value, - "U must be convertible to T"); -- return storage_.is_null_ ? static_cast(std::forward(default_value)) -- : value(); -+ return storage_.is_populated_ -+ ? value() -+ : static_cast(std::forward(default_value)); - } - - template -@@ -393,26 +394,27 @@ class Optional : public internal::Option - // "T must be move constructible"); - static_assert(std::is_convertible::value, - "U must be convertible to T"); -- return storage_.is_null_ ? static_cast(std::forward(default_value)) -- : std::move(value()); -+ return storage_.is_populated_ -+ ? std::move(value()) -+ : static_cast(std::forward(default_value)); - } - - void swap(Optional& other) { -- if (storage_.is_null_ && other.storage_.is_null_) -+ if (!storage_.is_populated_ && !other.storage_.is_populated_) - return; - -- if (storage_.is_null_ != other.storage_.is_null_) { -- if (storage_.is_null_) { -- storage_.Init(std::move(other.storage_.value_)); -- other.FreeIfNeeded(); -- } else { -+ if (storage_.is_populated_ != other.storage_.is_populated_) { -+ if (storage_.is_populated_) { - other.storage_.Init(std::move(storage_.value_)); - FreeIfNeeded(); -+ } else { -+ storage_.Init(std::move(other.storage_.value_)); -+ other.FreeIfNeeded(); - } - return; - } - -- DCHECK(!storage_.is_null_ && !other.storage_.is_null_); -+ DCHECK(storage_.is_populated_ && other.storage_.is_populated_); - using std::swap; - swap(**this, *other); - } diff --git a/chromium-65.0.3325.146-gcc5-r3.patch b/chromium-65.0.3325.146-gcc5-r3.patch deleted file mode 100644 index ab74a35..0000000 --- a/chromium-65.0.3325.146-gcc5-r3.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff -up chromium-65.0.3325.146/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-65.0.3325.146/gpu/ipc/common/mailbox_struct_traits.h ---- chromium-65.0.3325.146/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2018-03-06 18:04:32.000000000 -0500 -+++ chromium-65.0.3325.146/gpu/ipc/common/mailbox_struct_traits.h 2018-03-07 10:42:07.198179638 -0500 -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; -diff -up chromium-65.0.3325.146/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 chromium-65.0.3325.146/services/viz/public/cpp/compositing/filter_operation_struct_traits.h ---- chromium-65.0.3325.146/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 2018-03-06 18:04:37.000000000 -0500 -+++ chromium-65.0.3325.146/services/viz/public/cpp/compositing/filter_operation_struct_traits.h 2018-03-07 10:42:07.198179638 -0500 -@@ -138,7 +138,7 @@ struct StructTraits matrix(const cc::FilterOperation& operation) { - if (operation.type() != cc::FilterOperation::COLOR_MATRIX) - return base::span(); -- return operation.matrix(); -+ return base::make_span(operation.matrix()); - } - - static base::span shape( -diff -up chromium-65.0.3325.146/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-65.0.3325.146/services/viz/public/cpp/compositing/quads_struct_traits.h ---- chromium-65.0.3325.146/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2018-03-06 18:04:37.000000000 -0500 -+++ chromium-65.0.3325.146/services/viz/public/cpp/compositing/quads_struct_traits.h 2018-03-07 10:42:07.198179638 -0500 -@@ -308,7 +308,7 @@ struct StructTraits vertex_opacity(const viz::DrawQuad& input) { - const viz::TextureDrawQuad* quad = - viz::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const viz::DrawQuad& input) { -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 2018-03-06 18:05:06.000000000 -0500 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h 2018-03-07 10:48:53.996093882 -0500 -@@ -62,7 +62,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(length), - data_(data), - data_length_(length), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -93,11 +93,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } -diff -up chromium-65.0.3325.146/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-65.0.3325.146/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc ---- chromium-65.0.3325.146/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2018-03-06 18:06:09.000000000 -0500 -+++ chromium-65.0.3325.146/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2018-03-07 10:42:07.199179616 -0500 -@@ -10,7 +10,7 @@ - - #include "modules/audio_processing/aec3/aec_state.h" - --#include -+#include - - #include - #include diff --git a/chromium-65.0.3325.146-gcc7.patch b/chromium-65.0.3325.146-gcc7.patch deleted file mode 100644 index 4f2b46c..0000000 --- a/chromium-65.0.3325.146-gcc7.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 chromium-65.0.3325.146/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.gcc7 2018-03-07 10:34:48.783900894 -0500 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2018-03-07 10:35:44.885638503 -0500 -@@ -5,6 +5,7 @@ - #ifndef SharedGpuContext_h - #define SharedGpuContext_h - -+#include - #include - #include "base/callback.h" - #include "base/memory/weak_ptr.h" diff --git a/chromium-65.0.3325.146-workaround-gcc7-is_trivially_copy_constructable-failure.patch b/chromium-65.0.3325.146-workaround-gcc7-is_trivially_copy_constructable-failure.patch deleted file mode 100644 index 241dfb5..0000000 --- a/chromium-65.0.3325.146-workaround-gcc7-is_trivially_copy_constructable-failure.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -up chromium-65.0.3325.146/base/optional.h.784732 chromium-65.0.3325.146/base/optional.h ---- chromium-65.0.3325.146/base/optional.h.784732 2018-03-07 13:40:00.103579631 -0500 -+++ chromium-65.0.3325.146/base/optional.h 2018-03-07 13:41:08.950323996 -0500 -@@ -9,6 +9,7 @@ - #include - - #include "base/logging.h" -+#include "base/template_util.h" - - namespace base { - -@@ -106,7 +107,7 @@ struct OptionalStorageBase::value, -+ bool = is_trivially_copy_constructible::value, - bool = std::is_trivially_move_constructible::value> - struct OptionalStorage : OptionalStorageBase { - // This is no trivially {copy,move} constructible case. Other cases are -diff -up chromium-65.0.3325.146/base/template_util.h.784732 chromium-65.0.3325.146/base/template_util.h ---- chromium-65.0.3325.146/base/template_util.h.784732 2018-03-07 13:41:19.479131969 -0500 -+++ chromium-65.0.3325.146/base/template_util.h 2018-03-07 13:42:41.308639551 -0500 -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - #include "build/build_config.h" - -@@ -127,6 +128,23 @@ template - using is_trivially_copyable = std::is_trivially_copyable; - #endif - -+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 7 -+// Workaround for g++7 and earlier family. -+// Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80654, without this -+// Optional> where T is non-copyable causes a compile error. -+// As we know it is not trivially copy constructible, explicitly declare so. -+template -+struct is_trivially_copy_constructible -+ : std::is_trivially_copy_constructible {}; -+ -+template -+struct is_trivially_copy_constructible> : std::false_type {}; -+#else -+// Otherwise use std::is_trivially_copy_constructible as is. -+template -+using is_trivially_copy_constructible = std::is_trivially_copy_constructible; -+#endif -+ - } // namespace base - - #undef CR_USE_FALLBACKS_FOR_GCC_WITH_LIBCXX diff --git a/chromium-65.0.3325.146-wtf-oilpan-Remove-GC-checks-from-WTF-Optional-T.patch b/chromium-65.0.3325.146-wtf-oilpan-Remove-GC-checks-from-WTF-Optional-T.patch deleted file mode 100644 index 8b5ff7f..0000000 --- a/chromium-65.0.3325.146-wtf-oilpan-Remove-GC-checks-from-WTF-Optional-T.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/platform/heap/TraceTraits.h.oilpan chromium-65.0.3325.146/third_party/WebKit/Source/platform/heap/TraceTraits.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/platform/heap/TraceTraits.h.oilpan 2018-03-13 16:45:40.613426445 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/platform/heap/TraceTraits.h 2018-03-13 16:45:49.946244905 -0400 -@@ -18,6 +18,7 @@ - #include "platform/wtf/HashTable.h" - #include "platform/wtf/LinkedHashSet.h" - #include "platform/wtf/ListHashSet.h" -+#include "platform/wtf/Optional.h" - #include "platform/wtf/TypeTraits.h" - - namespace blink { -@@ -325,6 +326,23 @@ class TraceTrait> { - } - }; - -+// While using Optional with garbage-collected types is generally disallowed -+// by the OptionalGarbageCollected check in blink_gc_plugin, garbage-collected -+// containers such as HeapVector are allowed and need to be traced. -+template -+class TraceTrait> { -+ STATIC_ONLY(TraceTrait); -+ -+ public: -+ template -+ static void Trace(VisitorDispatcher visitor, WTF::Optional* optional) { -+ if (*optional != WTF::nullopt) { -+ TraceIfEnabled::value>::Trace(visitor, -+ optional->value()); -+ } -+ } -+}; -+ - // If eager tracing leads to excessively deep |trace()| call chains (and - // the system stack usage that this brings), the marker implementation will - // switch to using an explicit mark stack. Recursive and deep object graphs -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/Optional.h.oilpan chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/Optional.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/Optional.h.oilpan 2018-03-13 16:46:01.683015951 -0400 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/Optional.h 2018-03-13 16:46:51.632043375 -0400 -@@ -7,20 +7,15 @@ - - #include "base/optional.h" - #include "platform/wtf/TemplateUtil.h" --#include "platform/wtf/TypeTraits.h" - - namespace WTF { - - // WTF::Optional is base::Optional. See base/optional.h for documentation. - // - // A clang plugin enforces that garbage collected types are not allocated --// outside of the heap, similarly we enforce that one doesn't create garbage --// collected types nested inside an Optional. -+// outside of the heap. GC containers such as HeapVector are allowed though. - template --using Optional = -- typename std::enable_if::value || -- IsPersistentReferenceType::value, -- base::Optional>::type; -+using Optional = base::Optional; - - constexpr base::nullopt_t nullopt = base::nullopt; - constexpr base::in_place_t in_place = base::in_place; diff --git a/chromium-65.0.3325.146-wtf-vector-fix.patch b/chromium-65.0.3325.146-wtf-vector-fix.patch deleted file mode 100644 index e4bfeba..0000000 --- a/chromium-65.0.3325.146-wtf-vector-fix.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/DEPS.jdp chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/DEPS ---- chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/DEPS.jdp 2018-03-07 13:54:42.653286576 -0500 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/DEPS 2018-03-07 13:55:00.973903591 -0500 -@@ -16,6 +16,7 @@ include_rules = [ - "+base/process/process_metrics.h", - "+base/rand_util.h", - "+base/strings", -+ "+base/template_util.h", - "+base/threading/thread_checker.h", - "+base/time/time.h", - "+base/tuple.h", -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/Optional.h.jdp chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/Optional.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/Optional.h.jdp 2018-03-07 13:56:29.053062331 -0500 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/Optional.h 2018-03-07 13:56:36.595904651 -0500 -@@ -6,6 +6,7 @@ - #define Optional_h - - #include "base/optional.h" -+#include "platform/wtf/TemplateUtil.h" - #include "platform/wtf/TypeTraits.h" - - namespace WTF { -diff -up chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/TemplateUtil.h.jdp chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/TemplateUtil.h ---- chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/TemplateUtil.h.jdp 2018-03-07 13:56:47.356679702 -0500 -+++ chromium-65.0.3325.146/third_party/WebKit/Source/platform/wtf/TemplateUtil.h 2018-03-07 13:57:41.769542223 -0500 -@@ -0,0 +1,28 @@ -+// Copyright 2018 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef TemplateUtil_h -+#define TemplateUtil_h -+ -+#include "base/template_util.h" -+#include "platform/wtf/Vector.h" -+ -+namespace base { -+ -+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 7 -+// Workaround for g++7 and earlier family. -+// Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80654, without this -+// Optional> where T is non-copyable causes a compile error. -+// As we know it is not trivially copy constructible, explicitly declare so. -+// -+// It completes the declaration in base/template_util.h that was provided -+// for std::vector -+template -+struct is_trivially_copy_constructible> : std::false_type {}; -+#endif -+ -+} // namespace base -+ -+#endif // TemplateUtil_h -+ diff --git a/chromium-65.0.3325.162-boolfix.patch b/chromium-65.0.3325.162-boolfix.patch deleted file mode 100644 index a27f3a8..0000000 --- a/chromium-65.0.3325.162-boolfix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h ---- chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-03-15 13:07:54.999428755 -0400 -+++ chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-03-15 13:08:21.270794252 -0400 -@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { - - bool is_valid() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return (bool) handle_; } - - ScopedInterfaceEndpointHandle PassHandle() { - return std::move(handle_); -diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h ---- chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-03-15 13:07:09.680523296 -0400 -+++ chromium-65.0.3325.162/mojo/public/cpp/bindings/associated_interface_request.h 2018-03-15 13:07:44.429684037 -0400 -@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest { - // handle. - bool is_pending() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return (bool) handle_; } - - ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } - -diff -up chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h ---- chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-03-15 13:08:33.494499025 -0400 -+++ chromium-65.0.3325.162/mojo/public/cpp/bindings/interface_request.h 2018-03-15 13:10:39.218462546 -0400 -@@ -54,7 +54,7 @@ class InterfaceRequest { - // Indicates whether the request currently contains a valid message pipe. - bool is_pending() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return (bool) handle_; } - - // Removes the message pipe from the request and returns it. - ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); } diff --git a/chromium-65.0.3325.162-epel7-stdc++.patch b/chromium-65.0.3325.162-epel7-stdc++.patch deleted file mode 100644 index ee2066b..0000000 --- a/chromium-65.0.3325.162-epel7-stdc++.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-65.0.3325.162/build/config/posix/BUILD.gn.epel7 chromium-65.0.3325.162/build/config/posix/BUILD.gn ---- chromium-65.0.3325.162/build/config/posix/BUILD.gn.epel7 2018-03-20 16:14:42.425926323 -0400 -+++ chromium-65.0.3325.162/build/config/posix/BUILD.gn 2018-03-20 16:15:10.150152245 -0400 -@@ -74,6 +74,8 @@ config("runtime_library") { - "rt", - ] - } -+ } else { -+ libs += [ "stdc++" ] - } - - if (!is_mac && !is_ios && sysroot != "") { diff --git a/chromium-65.0.3325.162-skia-aarch64-buildfix.patch b/chromium-65.0.3325.162-skia-aarch64-buildfix.patch deleted file mode 100644 index e48346c..0000000 --- a/chromium-65.0.3325.162-skia-aarch64-buildfix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp.aarch64fix chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp ---- chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp.aarch64fix 2018-03-15 15:27:35.201345844 -0400 -+++ chromium-65.0.3325.162/third_party/skia/src/jumper/SkJumper_stages.cpp 2018-03-15 15:31:30.471777400 -0400 -@@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) { - } - - SI F from_half(U16 h) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f32_f16(h); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) -@@ -686,7 +686,7 @@ SI F from_half(U16 h) { - } - - SI U16 to_half(F f) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f16_f32(f); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) diff --git a/chromium-66.0.3359.117-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch b/chromium-66.0.3359.117-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch deleted file mode 100644 index 36ade41..0000000 --- a/chromium-66.0.3359.117-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up chromium-66.0.3359.117/services/preferences/tracked/pref_hash_filter.h.gcc-full-decl chromium-66.0.3359.117/services/preferences/tracked/pref_hash_filter.h ---- chromium-66.0.3359.117/services/preferences/tracked/pref_hash_filter.h.gcc-full-decl 2018-04-25 16:29:52.372692179 -0400 -+++ chromium-66.0.3359.117/services/preferences/tracked/pref_hash_filter.h 2018-04-25 16:31:15.698058409 -0400 -@@ -21,9 +21,9 @@ - #include "services/preferences/public/mojom/preferences.mojom.h" - #include "services/preferences/tracked/hash_store_contents.h" - #include "services/preferences/tracked/interceptable_pref_filter.h" -+#include "services/preferences/tracked/pref_hash_store.h" - #include "services/preferences/tracked/tracked_preference.h" - --class PrefHashStore; - class PrefService; - - namespace base { -diff -up chromium-66.0.3359.117/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h.gcc-full-decl chromium-66.0.3359.117/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h ---- chromium-66.0.3359.117/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h.gcc-full-decl 2018-04-17 21:05:12.000000000 -0400 -+++ chromium-66.0.3359.117/third_party/WebKit/Source/modules/webdatabase/SQLTransactionBackend.h 2018-04-25 16:29:52.373692159 -0400 -@@ -30,6 +30,7 @@ - - #include - #include "modules/webdatabase/DatabaseBasicTypes.h" -+#include "modules/webdatabase/SQLError.h" - #include "modules/webdatabase/SQLStatement.h" - #include "modules/webdatabase/SQLStatementBackend.h" - #include "modules/webdatabase/SQLTransactionStateMachine.h" -@@ -41,7 +42,6 @@ - namespace blink { - - class Database; --class SQLErrorData; - class SQLiteTransaction; - class SQLTransaction; - class SQLTransactionBackend; diff --git a/chromium-66.0.3359.117-GCC-do-not-use-initializer-list-for-NoDestructor-of-.patch b/chromium-66.0.3359.117-GCC-do-not-use-initializer-list-for-NoDestructor-of-.patch deleted file mode 100644 index cb68934..0000000 --- a/chromium-66.0.3359.117-GCC-do-not-use-initializer-list-for-NoDestructor-of-.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-66.0.3359.117/chrome/browser/supervised_user/supervised_user_url_filter.cc.flatsetfix chromium-66.0.3359.117/chrome/browser/supervised_user/supervised_user_url_filter.cc ---- chromium-66.0.3359.117/chrome/browser/supervised_user/supervised_user_url_filter.cc.flatsetfix 2018-04-30 14:22:23.997461566 -0400 -+++ chromium-66.0.3359.117/chrome/browser/supervised_user/supervised_user_url_filter.cc 2018-04-30 14:22:51.867920383 -0400 -@@ -368,7 +368,7 @@ SupervisedUserURLFilter::GetFilteringBeh - - // Allow navigations to whitelisted origins (currently families.google.com). - static const base::NoDestructor> kWhitelistedOrigins( -- {GURL(kFamiliesUrl).GetOrigin()}); -+ base::flat_set({GURL(kFamiliesUrl).GetOrigin()})); - if (base::ContainsKey(*kWhitelistedOrigins, effective_url.GetOrigin())) - return ALLOW; - diff --git a/chromium-66.0.3359.117-gcc-copy-constructor-fix.patch b/chromium-66.0.3359.117-gcc-copy-constructor-fix.patch deleted file mode 100644 index 09c5b82..0000000 --- a/chromium-66.0.3359.117-gcc-copy-constructor-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff -up chromium-66.0.3359.117/cc/raster/playback_image_provider.cc.copycon chromium-66.0.3359.117/cc/raster/playback_image_provider.cc ---- chromium-66.0.3359.117/cc/raster/playback_image_provider.cc.copycon 2018-04-23 13:22:43.109126071 -0400 -+++ chromium-66.0.3359.117/cc/raster/playback_image_provider.cc 2018-04-23 13:23:55.761704938 -0400 -@@ -20,7 +20,7 @@ void UnrefImageFromCache(DrawImage draw_ - PlaybackImageProvider::PlaybackImageProvider( - ImageDecodeCache* cache, - const gfx::ColorSpace& target_color_space, -- base::Optional settings) -+ base::Optional&& settings) - : cache_(cache), - target_color_space_(target_color_space), - settings_(std::move(settings)) { -@@ -70,7 +70,10 @@ PlaybackImageProvider::GetDecodedDrawIma - } - - PlaybackImageProvider::Settings::Settings() = default; --PlaybackImageProvider::Settings::Settings(const Settings& other) = default; -+PlaybackImageProvider::Settings::Settings(PlaybackImageProvider::Settings&&) = -+ default; - PlaybackImageProvider::Settings::~Settings() = default; -+PlaybackImageProvider::Settings& PlaybackImageProvider::Settings::operator=( -+ PlaybackImageProvider::Settings&&) = default; - - } // namespace cc -diff -up chromium-66.0.3359.117/cc/raster/playback_image_provider.h.copycon chromium-66.0.3359.117/cc/raster/playback_image_provider.h ---- chromium-66.0.3359.117/cc/raster/playback_image_provider.h.copycon 2018-04-23 13:24:07.699471148 -0400 -+++ chromium-66.0.3359.117/cc/raster/playback_image_provider.h 2018-04-23 13:24:57.080506348 -0400 -@@ -20,8 +20,10 @@ class CC_EXPORT PlaybackImageProvider : - public: - struct CC_EXPORT Settings { - Settings(); -- Settings(const Settings& other); -+ Settings(const Settings&) = delete; -+ Settings(Settings&&); - ~Settings(); -+ Settings& operator=(Settings&&); - - // The set of image ids to skip during raster. - PaintImageIdFlatSet images_to_skip; -@@ -34,7 +36,7 @@ class CC_EXPORT PlaybackImageProvider : - // If no settings are provided, all images are skipped during rasterization. - PlaybackImageProvider(ImageDecodeCache* cache, - const gfx::ColorSpace& target_color_space, -- base::Optional settings); -+ base::Optional&& settings); - ~PlaybackImageProvider() override; - - PlaybackImageProvider(PlaybackImageProvider&& other); -diff -up chromium-66.0.3359.117/cc/raster/playback_image_provider_unittest.cc.copycon chromium-66.0.3359.117/cc/raster/playback_image_provider_unittest.cc diff --git a/chromium-66.0.3359.117-gcc-optional-move-fixes.patch b/chromium-66.0.3359.117-gcc-optional-move-fixes.patch deleted file mode 100644 index 80df7d0..0000000 --- a/chromium-66.0.3359.117-gcc-optional-move-fixes.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up chromium-66.0.3359.117/content/browser/appcache/appcache_request_handler.cc.gccomove chromium-66.0.3359.117/content/browser/appcache/appcache_request_handler.cc ---- chromium-66.0.3359.117/content/browser/appcache/appcache_request_handler.cc.gccomove 2018-04-23 12:53:32.419477463 -0400 -+++ chromium-66.0.3359.117/content/browser/appcache/appcache_request_handler.cc 2018-04-23 12:54:02.497887258 -0400 -@@ -639,7 +639,7 @@ AppCacheRequestHandler::MaybeCreateSubre - - SubresourceLoaderParams params; - params.loader_factory_info = factory_ptr.PassInterface(); -- return params; -+ return base::Optional(std::move(params)); - } - - void AppCacheRequestHandler::MaybeCreateSubresourceLoader( -diff -up chromium-66.0.3359.117/content/browser/service_worker/service_worker_controllee_request_handler.cc.gccomove chromium-66.0.3359.117/content/browser/service_worker/service_worker_controllee_request_handler.cc ---- chromium-66.0.3359.117/content/browser/service_worker/service_worker_controllee_request_handler.cc.gccomove 2018-04-23 12:54:16.614610083 -0400 -+++ chromium-66.0.3359.117/content/browser/service_worker/service_worker_controllee_request_handler.cc 2018-04-23 12:54:38.401182827 -0400 -@@ -271,7 +271,7 @@ ServiceWorkerControlleeRequestHandler::M - controller_info->object_info = provider_host_->GetOrCreateServiceWorkerHandle( - provider_host_->controller()); - params.controller_service_worker_info = std::move(controller_info); -- return params; -+ return base::Optional(std::move(params)); - } - - void ServiceWorkerControlleeRequestHandler::PrepareForMainResource( -diff -up chromium-66.0.3359.117/device/fido/device_response_converter.cc.gccomove chromium-66.0.3359.117/device/fido/device_response_converter.cc ---- chromium-66.0.3359.117/device/fido/device_response_converter.cc.gccomove 2018-04-23 12:54:51.452926482 -0400 -+++ chromium-66.0.3359.117/device/fido/device_response_converter.cc 2018-04-23 12:55:24.248283058 -0400 -@@ -121,7 +121,7 @@ base::Optionalsecond.GetUnsigned()); - } - -- return response; -+ return base::Optional(std::move(response)); - } - - base::Optional ReadCTAPGetInfoResponse( -@@ -241,7 +241,7 @@ base::Optional(std::move(response)); - } - - } // namespace device diff --git a/chromium-66.0.3359.117-gcc-vector-copy-constructor-fix.patch b/chromium-66.0.3359.117-gcc-vector-copy-constructor-fix.patch deleted file mode 100644 index b86c200..0000000 --- a/chromium-66.0.3359.117-gcc-vector-copy-constructor-fix.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff -up chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/DEPS.944404 chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/DEPS ---- chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/DEPS.944404 2018-04-23 14:18:43.702116916 -0400 -+++ chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/DEPS 2018-04-23 14:19:05.854680223 -0400 -@@ -16,6 +16,7 @@ include_rules = [ - "+base/process/process_metrics.h", - "+base/rand_util.h", - "+base/strings", -+ "+base/template_util.h", - "+base/threading/thread_checker.h", - "+base/time/time.h", - "+base/tuple.h", -diff -up chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/Optional.h.944404 chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/Optional.h ---- chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/Optional.h.944404 2018-04-23 14:20:05.718499685 -0400 -+++ chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/Optional.h 2018-04-23 14:20:18.165253615 -0400 -@@ -6,6 +6,7 @@ - #define Optional_h - - #include "base/optional.h" -+#include "platform/wtf/TemplateUtil.h" - - namespace WTF { - -diff -up chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/TemplateUtil.h.944404 chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/TemplateUtil.h ---- chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/TemplateUtil.h.944404 2018-04-23 14:20:31.660987877 -0400 -+++ chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/TemplateUtil.h 2018-04-23 14:21:40.276637297 -0400 -@@ -0,0 +1,27 @@ -+// Copyright 2018 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef TemplateUtil_h -+#define TemplateUtil_h -+ -+#include "base/template_util.h" -+#include "platform/wtf/Vector.h" -+ -+namespace base { -+ -+#if defined(__GNUC__) && !defined(__clang__) && __GNUC__ <= 7 -+// Workaround for g++7 and earlier family. -+// Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80654, without this -+// Optional> where T is non-copyable causes a compile error. -+// As we know it is not trivially copy constructible, explicitly declare so. -+// -+// It completes the declaration in base/template_util.h that was provided -+// for std::vector -+template -+struct is_trivially_copy_constructible> : std::false_type {}; -+#endif -+ -+} // namespace base -+ -+#endif // TemplateUtil_h diff --git a/chromium-66.0.3359.117-gcc5-r3.patch b/chromium-66.0.3359.117-gcc5-r3.patch deleted file mode 100644 index 56abcf1..0000000 --- a/chromium-66.0.3359.117-gcc5-r3.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up chromium-66.0.3359.117/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-66.0.3359.117/gpu/ipc/common/mailbox_struct_traits.h ---- chromium-66.0.3359.117/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2018-04-17 21:04:33.000000000 -0400 -+++ chromium-66.0.3359.117/gpu/ipc/common/mailbox_struct_traits.h 2018-04-18 12:12:40.065663210 -0400 -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; -diff -up chromium-66.0.3359.117/services/viz/public/cpp/compositing/filter_operation_struct_traits.h.gcc5-r3 chromium-66.0.3359.117/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -diff -up chromium-66.0.3359.117/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-66.0.3359.117/services/viz/public/cpp/compositing/quads_struct_traits.h ---- chromium-66.0.3359.117/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2018-04-17 21:04:43.000000000 -0400 -+++ chromium-66.0.3359.117/services/viz/public/cpp/compositing/quads_struct_traits.h 2018-04-18 12:12:40.067663160 -0400 -@@ -308,7 +308,7 @@ struct StructTraits vertex_opacity(const viz::DrawQuad& input) { - const viz::TextureDrawQuad* quad = - viz::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const viz::DrawQuad& input) { -diff -up chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h.gcc5-r3 chromium-66.0.3359.117/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -diff -up chromium-66.0.3359.117/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-66.0.3359.117/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc ---- chromium-66.0.3359.117/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2018-04-17 21:06:20.000000000 -0400 -+++ chromium-66.0.3359.117/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2018-04-18 12:12:40.068663134 -0400 -@@ -10,7 +10,7 @@ - - #include "modules/audio_processing/aec3/aec_state.h" - --#include -+#include - - #include - #include diff --git a/chromium-66.0.3359.117-nounrar.patch b/chromium-66.0.3359.117-nounrar.patch deleted file mode 100644 index 67a517b..0000000 --- a/chromium-66.0.3359.117-nounrar.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up chromium-66.0.3359.117/chrome/services/file_util/public/cpp/BUILD.gn.nounrar chromium-66.0.3359.117/chrome/services/file_util/public/cpp/BUILD.gn ---- chromium-66.0.3359.117/chrome/services/file_util/public/cpp/BUILD.gn.nounrar 2018-04-25 12:17:13.858139109 -0400 -+++ chromium-66.0.3359.117/chrome/services/file_util/public/cpp/BUILD.gn 2018-04-25 12:19:53.639532053 -0400 -@@ -27,9 +27,9 @@ source_set("cpp") { - } - - #TODO(crbug/750327): This dependency is here temporarily. -- deps = [ -- "//third_party/unrar:unrar", -- ] -+ # deps = [ -+ # "//third_party/unrar:unrar", -+ # ] - - public_deps += [ "//chrome/common/safe_browsing" ] - } diff --git a/chromium-66.0.3359.139-arm-init-fix.patch b/chromium-66.0.3359.139-arm-init-fix.patch deleted file mode 100644 index 754af5b..0000000 --- a/chromium-66.0.3359.139-arm-init-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-66.0.3359.139/skia/ext/convolver_neon.cc.arm-init-fix chromium-66.0.3359.139/skia/ext/convolver_neon.cc ---- chromium-66.0.3359.139/skia/ext/convolver_neon.cc.arm-init-fix 2018-05-05 10:07:03.624424987 -0400 -+++ chromium-66.0.3359.139/skia/ext/convolver_neon.cc 2018-05-05 10:07:45.417503001 -0400 -@@ -23,7 +23,7 @@ AccumRemainder(const unsigned char* pixe - remainder[2] += coeff * pixels_left[i * 4 + 2]; - remainder[3] += coeff * pixels_left[i * 4 + 3]; - } -- return {remainder[0], remainder[1], remainder[2], remainder[3]}; -+ return vld1q_s32(remainder); - } - - // Convolves horizontally along a single row. The row data is given in diff --git a/chromium-66.0.3359.170-gcc8-alignof.patch b/chromium-66.0.3359.170-gcc8-alignof.patch deleted file mode 100644 index 0c2b356..0000000 --- a/chromium-66.0.3359.170-gcc8-alignof.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up chromium-66.0.3359.170/mojo/public/c/system/macros.h.gcc8-alignof chromium-66.0.3359.170/mojo/public/c/system/macros.h ---- chromium-66.0.3359.170/mojo/public/c/system/macros.h.gcc8-alignof 2018-05-15 14:58:46.448912634 -0400 -+++ chromium-66.0.3359.170/mojo/public/c/system/macros.h 2018-05-15 14:58:52.041784613 -0400 -@@ -18,7 +18,13 @@ - #endif - - // Like the C++11 |alignof| operator. --#if __cplusplus >= 201103L -+#if defined(__GNUC__) && __GNUC__ >= 8 -+// GCC 8 has changed the alignof operator to return the minimal alignment -+// required by the target ABI, instead of the preferred alignment. -+// This means that on 32-bit x86, it will return 4 instead of 8. -+// Use __alignof__ instead to avoid this. -+#define MOJO_ALIGNOF(type) __alignof__(type) -+#elif __cplusplus >= 201103L - #define MOJO_ALIGNOF(type) alignof(type) - #elif defined(__GNUC__) - #define MOJO_ALIGNOF(type) __alignof__(type) diff --git a/chromium-67.0.3396.62-boolfix.patch b/chromium-67.0.3396.62-boolfix.patch deleted file mode 100644 index d0ed189..0000000 --- a/chromium-67.0.3396.62-boolfix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h ---- chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2018-05-30 04:43:17.000000000 -0400 -+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2018-05-30 12:33:03.268912315 -0400 -@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo { - - bool is_valid() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return (bool) handle_; } - - ScopedInterfaceEndpointHandle PassHandle() { - return std::move(handle_); -diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h ---- chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2018-05-30 04:43:17.000000000 -0400 -+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/associated_interface_request.h 2018-05-30 12:33:03.269912294 -0400 -@@ -50,7 +50,7 @@ class AssociatedInterfaceRequest { - // handle. - bool is_pending() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_; } -+ explicit operator bool() const { return (bool) handle_; } - - ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); } - -diff -up chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h ---- chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h.boolfix 2018-05-30 12:33:03.270912274 -0400 -+++ chromium-67.0.3396.62/mojo/public/cpp/bindings/interface_request.h 2018-05-30 12:34:05.156637922 -0400 -@@ -54,7 +54,7 @@ class InterfaceRequest { - // Indicates whether the request currently contains a valid message pipe. - bool is_pending() const { return handle_.is_valid(); } - -- explicit operator bool() const { return handle_.is_valid(); } -+ explicit operator bool() const { return (bool) handle_.is_valid(); } - - // Removes the message pipe from the request and returns it. - ScopedMessagePipeHandle PassMessagePipe() { return std::move(handle_); } diff --git a/chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch b/chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch deleted file mode 100644 index e19d726..0000000 --- a/chromium-67.0.3396.62-crashpad-aarch64-buildfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S.aarch64fix chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S ---- chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S.aarch64fix 2018-06-04 14:58:04.730083967 -0400 -+++ chromium-67.0.3396.62/third_party/crashpad/crashpad/util/misc/capture_context_linux.S 2018-06-04 14:58:24.896572816 -0400 -@@ -288,7 +288,7 @@ CAPTURECONTEXT_SYMBOL2: - #elif defined(__aarch64__) - - // Zero out fault_address, which is unused. -- str x31, [x0, #0xb0] // context->uc_mcontext.fault_address -+ str xzr, [x0, #0xb0] // context->uc_mcontext.fault_address - - // Save general purpose registers in context->uc_mcontext.regs[i]. - // The original x0 can't be recovered. -diff -up chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h diff --git a/chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch b/chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch deleted file mode 100644 index 1aa5600..0000000 --- a/chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-67.0.3396.62/tools/gn/bootstrap/bootstrap.py.oldexec chromium-67.0.3396.62/tools/gn/bootstrap/bootstrap.py ---- chromium-67.0.3396.62/tools/gn/bootstrap/bootstrap.py.oldexec 2018-06-06 10:13:40.862084284 -0400 -+++ chromium-67.0.3396.62/tools/gn/bootstrap/bootstrap.py 2018-06-06 10:14:08.809490819 -0400 -@@ -112,7 +112,7 @@ def windows_prepare_toolchain(tempdir): - - _globals = {"__builtins__":None} - _locals = {} -- exec(response, _globals, _locals) -+ exec response in _globals, _locals - - return _locals - diff --git a/chromium-67.0.3396.62-skia-aarch64-buildfix.patch b/chromium-67.0.3396.62-skia-aarch64-buildfix.patch deleted file mode 100644 index 6b37b08..0000000 --- a/chromium-67.0.3396.62-skia-aarch64-buildfix.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h ---- chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix 2018-05-30 12:38:06.131467092 -0400 -+++ chromium-67.0.3396.62/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-05-30 12:38:39.861734819 -0400 -@@ -653,7 +653,7 @@ SI F approx_powf(F x, F y) { - } - - SI F from_half(U16 h) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f32_f16(h); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) -@@ -673,7 +673,7 @@ SI F from_half(U16 h) { - } - - SI U16 to_half(F f) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. - return vcvt_f16_f32(f); - - #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) diff --git a/chromium-67.0.3396.87-fedora-user-agent.patch b/chromium-67.0.3396.87-fedora-user-agent.patch deleted file mode 100644 index 8df304d..0000000 --- a/chromium-67.0.3396.87-fedora-user-agent.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-67.0.3396.87/content/common/user_agent.cc.fedora-user-agent chromium-67.0.3396.87/content/common/user_agent.cc ---- chromium-67.0.3396.87/content/common/user_agent.cc.fedora-user-agent 2018-06-25 16:01:48.092188102 -0400 -+++ chromium-67.0.3396.87/content/common/user_agent.cc 2018-06-25 16:02:42.634878954 -0400 -@@ -141,7 +141,7 @@ std::string getUserAgentPlatform() { - #elif defined(OS_MACOSX) - "Macintosh; "; - #elif defined(USE_X11) || defined(USE_OZONE) -- "X11; "; // strange, but that's what Firefox uses -+ "X11; Fedora; "; // strange, but that's what Firefox uses - #elif defined(OS_ANDROID) - "Linux; "; - #else diff --git a/chromium-67.0.3396.99-py2-bootstrap.patch b/chromium-67.0.3396.99-py2-bootstrap.patch deleted file mode 100644 index b59c84b..0000000 --- a/chromium-67.0.3396.99-py2-bootstrap.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -up chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py ---- chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2018-07-25 14:14:02.004886479 -0400 -+++ chromium-67.0.3396.99/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-07-25 14:15:30.167896461 -0400 -@@ -58,7 +58,7 @@ def _MinifyJS(input_js): - - with tempfile.NamedTemporaryFile() as _: - args = [ -- 'python', -+ 'python2', - rjsmin_path - ] - p = subprocess.Popen(args, -@@ -177,7 +177,7 @@ def _MinifyCSS(css_text): - os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py')) - - with tempfile.NamedTemporaryFile() as _: -- rcssmin_args = ['python', rcssmin_path] -+ rcssmin_args = ['python2', rcssmin_path] - p = subprocess.Popen(rcssmin_args, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, -diff -up chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py.py2 chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py ---- chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py.py2 2018-07-24 16:58:53.372022183 -0400 -+++ chromium-67.0.3396.99/tools/gn/bootstrap/bootstrap.py 2018-07-24 17:00:03.200279816 -0400 -@@ -983,7 +983,7 @@ def build_gn_with_gn(temp_gn, build_dir, - gn_gen_args = options.gn_gen_args or '' - if not options.debug: - gn_gen_args += ' is_debug=false' -- cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args, -+ cmd = [temp_gn, 'gen', '--script-executable=/usr/bin/python2', build_dir, '--args=%s' % gn_gen_args, - "--root="+SRC_ROOT - ] - check_call(cmd) -@@ -997,7 +997,7 @@ def build_gn_with_gn(temp_gn, build_dir, - # build.ninja currently refers back to gn from the temporary directory. - # Regenerate the build files using the gn we just built so that the reference - # gets updated to "./gn". -- cmd = [os.path.join(build_dir, 'gn'), 'gen', build_dir, -+ cmd = [os.path.join(build_dir, 'gn'), 'gen', '--script-executable=/usr/bin/python2', build_dir, - '--args=%s' % gn_gen_args] - check_call(cmd) - diff --git a/chromium-68.0.3440.106-fedora-user-agent.patch b/chromium-68.0.3440.106-fedora-user-agent.patch deleted file mode 100644 index 6c4cb82..0000000 --- a/chromium-68.0.3440.106-fedora-user-agent.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent chromium-68.0.3440.106/content/common/user_agent.cc ---- chromium-68.0.3440.106/content/common/user_agent.cc.fedora-user-agent 2018-08-09 03:27:45.965769824 -0400 -+++ chromium-68.0.3440.106/content/common/user_agent.cc 2018-08-09 03:28:34.001586650 -0400 -@@ -135,7 +135,7 @@ std::string getUserAgentPlatform() { - #elif defined(OS_MACOSX) - "Macintosh; "; - #elif defined(USE_X11) || defined(USE_OZONE) -- "X11; "; // strange, but that's what Firefox uses -+ "X11; Fedora; "; // strange, but that's what Firefox uses - #elif defined(OS_ANDROID) - "Linux; "; - #elif defined(OS_POSIX) || defined(OS_FUCHSIA) diff --git a/chromium-68.0.3440.106-fix-build-networking_private.patch b/chromium-68.0.3440.106-fix-build-networking_private.patch deleted file mode 100644 index 787d3db..0000000 --- a/chromium-68.0.3440.106-fix-build-networking_private.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up chromium-68.0.3440.106/extensions/browser/api/networking_private/BUILD.gn.fixb chromium-68.0.3440.106/extensions/browser/api/networking_private/BUILD.gn ---- chromium-68.0.3440.106/extensions/browser/api/networking_private/BUILD.gn.fixb 2018-08-09 03:56:36.091622243 -0400 -+++ chromium-68.0.3440.106/extensions/browser/api/networking_private/BUILD.gn 2018-08-09 03:57:03.047001659 -0400 -@@ -61,7 +61,7 @@ source_set("networking_private") { - ] - deps += [ "//chromeos" ] - } else { -- not_needed(default_sources) -+ not_needed([ "default_sources" ]) - sources = [ - "networking_private_stubs.cc", - ] diff --git a/chromium-68.0.3440.106-notest.patch b/chromium-68.0.3440.106-notest.patch deleted file mode 100644 index c20a40e..0000000 --- a/chromium-68.0.3440.106-notest.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd.notest chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd ---- chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd.notest 2018-08-09 03:08:33.953029806 -0400 -+++ chromium-68.0.3440.106/chrome/test/data/webui_test_resources.grd 2018-08-09 03:09:40.264567818 -0400 -@@ -8,7 +8,6 @@ - - - -- - - - diff --git a/chromium-68.0.3440.84-cors-string.patch b/chromium-68.0.3440.84-cors-string.patch deleted file mode 100644 index b724cd4..0000000 --- a/chromium-68.0.3440.84-cors-string.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Thu, 31 May 2018 17:03:37 +0000 -Subject: [PATCH] CORS legacy: add missing string include -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The cors_legacy.h file includes declarations using std::string, but -it is not declared due to missing #include . - -Also drop unneeded declarations in .cpp file. - -Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd -Reviewed-on: https://chromium-review.googlesource.com/1080707 -Reviewed-by: Tom Sepez -Commit-Queue: José Dapena Paz -Cr-Commit-Position: refs/heads/master@{#563282} ---- - services/network/public/cpp/cors/cors_legacy.cc | 2 -- - services/network/public/cpp/cors/cors_legacy.h | 1 + - 2 files changed, 1 insertion(+), 2 deletions(-) - -diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc -index 8f32ac3be64e..f01af63619b5 100644 ---- a/services/network/public/cpp/cors/cors_legacy.cc -+++ b/services/network/public/cpp/cors/cors_legacy.cc -@@ -5,8 +5,6 @@ - #include "services/network/public/cpp/cors/cors_legacy.h" - - #include --#include --#include - - #include "url/gurl.h" - #include "url/url_util.h" -diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h -index d2cdf026ca3a..dc9295a92c47 100644 ---- a/services/network/public/cpp/cors/cors_legacy.h -+++ b/services/network/public/cpp/cors/cors_legacy.h -@@ -5,6 +5,7 @@ - #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ - #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ - -+#include - #include - - #include "base/component_export.h" --- -2.17.1 - diff --git a/chromium-68.0.3440.84-libjpeg.patch b/chromium-68.0.3440.84-libjpeg.patch deleted file mode 100644 index 5354281..0000000 --- a/chromium-68.0.3440.84-libjpeg.patch +++ /dev/null @@ -1,62 +0,0 @@ -From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001 -From: Daniel Bratell -Date: Mon, 28 May 2018 13:13:01 +0000 -Subject: [PATCH] Use the same libjpeg in all of blink/platform - -The normal libjpeg renames some symbols with macros so if its -headers are included together with libjpeg-turbo's headers -in the same translation unit, there will be an inconsistent -renaming of libjpeg symbols. This happened in some extreme -jumbo configuration and resulted in confising linker errors. - -This patch changes an include so that jpeglib.h becomes included -the same way everywhere. - -Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e -Reviewed-on: https://chromium-review.googlesource.com/1073423 -Reviewed-by: Kentaro Hara -Commit-Queue: Daniel Bratell -Cr-Commit-Position: refs/heads/master@{#562243} ---- - .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++ - .../renderer/platform/image-encoders/image_encoder.h | 2 -- - 2 files changed, 11 insertions(+), 2 deletions(-) - -diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -index 0c7f14c7c0e4..4c450f5d6783 100644 ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -@@ -4,6 +4,17 @@ - - #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" - -+#include "build/build_config.h" -+ -+#if defined(OS_WIN) -+#include // Included before jpeglib.h because of INT32 clash -+#endif // OS_WIN -+#include // Needed by jpeglib.h -+ -+#include "jpeglib.h" // for JPEG_MAX_DIMENSION -+ -+#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION -+ - namespace blink { - - bool ImageEncoder::Encode(Vector* dst, -diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h -index 0d1460f34827..40306097d507 100644 ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h -@@ -7,8 +7,6 @@ - - #include "third_party/blink/renderer/platform/platform_export.h" - #include "third_party/blink/renderer/platform/wtf/vector.h" --#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION --#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION - #include "third_party/skia/include/core/SkStream.h" - #include "third_party/skia/include/encode/SkJpegEncoder.h" - #include "third_party/skia/include/encode/SkPngEncoder.h" --- -2.17.1 - diff --git a/chromium-68.0.3440.84-libwebp-shim.patch b/chromium-68.0.3440.84-libwebp-shim.patch deleted file mode 100644 index cb387a4..0000000 --- a/chromium-68.0.3440.84-libwebp-shim.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn -index ab92adecf400..12574d87be58 100644 ---- a/build/linux/unbundle/libwebp.gn -+++ b/build/linux/unbundle/libwebp.gn -@@ -2,12 +2,34 @@ - # Use of this source code is governed by a BSD-style license that can be - # found in the LICENSE file. - -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_libwebp") { -+ packages = [ -+ "libwebp", -+ "libwebpdemux", -+ "libwebpmux", -+ ] -+} -+ -+shim_headers("libwebp_shim") { -+ root_path = "src" -+ headers = [ -+ "webp/decode.h", -+ "webp/demux.h", -+ "webp/encode.h", -+ "webp/mux.h", -+ "webp/mux_types.h", -+ "webp/types.h", -+ ] -+} -+ - source_set("libwebp_webp") { -- libs = [ -- "webp", -- "webpdemux", -- "webpmux", -+ deps = [ -+ ":libwebp_shim", - ] -+ public_configs = [ ":system_libwebp" ] - } - - group("libwebp") { diff --git a/chromium-68.0.3440.84-move-unique-ptr.patch b/chromium-68.0.3440.84-move-unique-ptr.patch deleted file mode 100644 index 2942a8f..0000000 --- a/chromium-68.0.3440.84-move-unique-ptr.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 56cb5f7da1025f6db869e840ed34d3b98b9ab899 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz -Date: Tue, 29 May 2018 16:04:14 +0000 -Subject: [PATCH] GCC: do not std::move unique ptr of forward declared UrlIndex -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -GCC fails to resolve the size of UrlIndex, needed -for moving a std::unique_ptr of UrlIndex. This is because -moved is done on a forward-declared UrlIndex. - -To avoid the problem, move the call to std::move to the .cc -file so the full declaration is available. - -Build error: -../../buildtools/third_party/libc++/trunk/include/memory: In instantiation of ‘void std::__1::default_delete<_Tp>::operator()(_Tp*) const [with _Tp = bookmarks::UrlIndex]’: -../../buildtools/third_party/libc++/trunk/include/memory:2634:22: required from ‘void std::__1::unique_ptr<_Tp, _Dp>::reset(std::__1::unique_ptr<_Tp, _Dp>::pointer) [with _Tp = bookmarks::UrlIndex; _Dp = std::__1::default_delete; std::__1::unique_ptr<_Tp, _Dp>::pointer = bookmarks::UrlIndex*]’ -../../buildtools/third_party/libc++/trunk/include/memory:2588:24: required from ‘std::__1::unique_ptr<_Tp, _Dp>::~unique_ptr() [with _Tp = bookmarks::UrlIndex; _Dp = std::__1::default_delete]’ -../../components/bookmarks/browser/bookmark_storage.h:107:76: required from here -../../buildtools/third_party/libc++/trunk/include/memory:2317:25: error: invalid application of ‘sizeof’ to incomplete type ‘bookmarks::UrlIndex’ - static_assert(sizeof(_Tp) > 0, - -Bug: 819294 -Change-Id: I793a807c28e797aaa2e31d9c8b7e09fb6ca6b9e7 -Reviewed-on: https://chromium-review.googlesource.com/1071648 -Commit-Queue: Scott Violet -Reviewed-by: Scott Violet -Cr-Commit-Position: refs/heads/master@{#562446} ---- - components/bookmarks/browser/bookmark_storage.cc | 4 ++++ - components/bookmarks/browser/bookmark_storage.h | 2 +- - 2 files changed, 5 insertions(+), 1 deletion(-) - -diff --git a/components/bookmarks/browser/bookmark_storage.cc b/components/bookmarks/browser/bookmark_storage.cc -index 1633ba1df2a4..3ae0c62292e7 100644 ---- a/components/bookmarks/browser/bookmark_storage.cc -+++ b/components/bookmarks/browser/bookmark_storage.cc -@@ -158,6 +158,10 @@ void BookmarkLoadDetails::CreateUrlIndex() { - url_index_ = std::make_unique(std::move(root_node_)); - } - -+std::unique_ptr BookmarkLoadDetails::owned_url_index() { -+ return std::move(url_index_); -+} -+ - BookmarkPermanentNode* BookmarkLoadDetails::CreatePermanentNode( - BookmarkClient* client, - BookmarkNode::Type type) { -diff --git a/components/bookmarks/browser/bookmark_storage.h b/components/bookmarks/browser/bookmark_storage.h -index 08df5bb65d83..0a1b1a1b65b9 100644 ---- a/components/bookmarks/browser/bookmark_storage.h -+++ b/components/bookmarks/browser/bookmark_storage.h -@@ -104,7 +104,7 @@ class BookmarkLoadDetails { - bool ids_reassigned() const { return ids_reassigned_; } - - void CreateUrlIndex(); -- std::unique_ptr owned_url_index() { return std::move(url_index_); } -+ std::unique_ptr owned_url_index(); - - private: - // Creates one of the possible permanent nodes (bookmark bar node, other node --- -2.17.1 - diff --git a/chromium-69.0.3497.81-gcc8-alignof.patch b/chromium-69.0.3497.81-gcc8-alignof.patch deleted file mode 100644 index 234b391..0000000 --- a/chromium-69.0.3497.81-gcc8-alignof.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up chromium-69.0.3497.81/mojo/public/c/system/macros.h.gcc8-alignof chromium-69.0.3497.81/mojo/public/c/system/macros.h ---- chromium-69.0.3497.81/mojo/public/c/system/macros.h.gcc8-alignof 2018-09-06 10:11:54.336432699 -0400 -+++ chromium-69.0.3497.81/mojo/public/c/system/macros.h 2018-09-06 10:13:56.555727572 -0400 -@@ -27,7 +27,13 @@ - (sizeof(void*) == 4 ? 32 : 0) - - // Like the C++11 |alignof| operator. --#if __cplusplus >= 201103L -+#if defined(__GNUC__) && __GNUC__ >= 8 -+// GCC 8 has changed the alignof operator to return the minimal alignment -+// required by the target ABI, instead of the preferred alignment. -+// This means that on 32-bit x86, it will return 4 instead of 8. -+// Use __alignof__ instead to avoid this. -+#define MOJO_ALIGNOF(type) __alignof__(type) -+#elif __cplusplus >= 201103L - #define MOJO_ALIGNOF(type) alignof(type) - #elif defined(__GNUC__) - #define MOJO_ALIGNOF(type) __alignof__(type) diff --git a/chromium-69.0.3497.81-norar.patch b/chromium-69.0.3497.81-norar.patch deleted file mode 100644 index 9545b60..0000000 --- a/chromium-69.0.3497.81-norar.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn ---- chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn.nounrar 2018-09-06 13:29:47.114511569 -0400 -+++ chromium-69.0.3497.81/chrome/common/safe_browsing/BUILD.gn 2018-09-06 13:29:47.120511452 -0400 -@@ -55,40 +55,6 @@ if (safe_browsing_mode == 1) { - "//components/safe_browsing:csd_proto", - ] - } -- -- source_set("rar_analyzer") { -- sources = [ -- "rar_analyzer.cc", -- "rar_analyzer.h", -- ] -- -- deps = [ -- ":archive_analyzer_results", -- ":download_protection_util", -- ":file_type_policies", -- "//base", -- "//base:i18n", -- "//third_party/unrar:unrar", -- ] -- -- defines = [ -- "_FILE_OFFSET_BITS=64", -- "LARGEFILE_SOURCE", -- "RAR_SMP", -- "SILENT", -- -- # The following is set to disable certain macro definitions in the unrar -- # source code. -- "CHROMIUM_UNRAR", -- -- # Disables exceptions in unrar, replaces them with process termination. -- "UNRAR_NO_EXCEPTIONS", -- ] -- -- public_deps = [ -- "//components/safe_browsing:csd_proto", -- ] -- } - } - - source_set("safe_browsing") { -@@ -121,7 +87,6 @@ source_set("safe_browsing") { - deps += [ - ":archive_analyzer_results", - ":download_protection_util", -- ":rar_analyzer", - "//components/safe_browsing:features", - ] - -diff -up chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS.nounrar chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS ---- chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS.nounrar 2018-09-06 13:29:47.119511472 -0400 -+++ chromium-69.0.3497.81/chrome/common/safe_browsing/DEPS 2018-09-06 13:29:47.116511530 -0400 -@@ -1,6 +1,5 @@ - include_rules = [ - "+components/safe_browsing", - "+third_party/protobuf", -- "+third_party/unrar", - "+third_party/zlib", - ] -diff -up chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc ---- chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2018-09-07 10:10:42.286041744 -0400 -+++ chromium-69.0.3497.81/chrome/services/file_util/safe_archive_analyzer.cc 2018-09-07 10:11:14.934308285 -0400 -@@ -47,9 +47,13 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile - - void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file, - AnalyzeRarFileCallback callback) { -+#if 0 - DCHECK(rar_file.IsValid()); - - safe_browsing::ArchiveAnalyzerResults results; - safe_browsing::rar_analyzer::AnalyzeRarFile(std::move(rar_file), &results); - std::move(callback).Run(results); -+#else -+ NOTREACHED(); -+#endif - } diff --git a/chromium-69.0.3497.81-py2-bootstrap.patch b/chromium-69.0.3497.81-py2-bootstrap.patch deleted file mode 100644 index 8a5db71..0000000 --- a/chromium-69.0.3497.81-py2-bootstrap.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -up chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py ---- chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py.py2 2018-09-06 10:45:17.919774145 -0400 -+++ chromium-69.0.3497.81/third_party/catapult/common/py_vulcanize/py_vulcanize/generate.py 2018-09-06 10:45:17.914774254 -0400 -@@ -58,7 +58,7 @@ def _MinifyJS(input_js): - - with tempfile.NamedTemporaryFile() as _: - args = [ -- 'python', -+ 'python2', - rjsmin_path - ] - p = subprocess.Popen(args, -@@ -177,7 +177,7 @@ def _MinifyCSS(css_text): - os.path.join(py_vulcanize_path, 'third_party', 'rcssmin', 'rcssmin.py')) - - with tempfile.NamedTemporaryFile() as _: -- rcssmin_args = ['python', rcssmin_path] -+ rcssmin_args = ['python2', rcssmin_path] - p = subprocess.Popen(rcssmin_args, - stdin=subprocess.PIPE, - stdout=subprocess.PIPE, -diff -up chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py.py2 chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py ---- chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py.py2 2018-09-06 10:44:42.225550561 -0400 -+++ chromium-69.0.3497.81/tools/gn/bootstrap/bootstrap.py 2018-09-06 13:06:24.251636231 -0400 -@@ -87,7 +87,7 @@ def main(argv): - if not options.debug: - gn_gen_args += ' is_debug=false' - subprocess.check_call([ -- gn_path, 'gen', out_dir, -+ gn_path, 'gen', out_dir, ' --script-executable=/usr/bin/python2', - '--args=%s' % gn_gen_args, "--root=" + SRC_ROOT - ]) - diff --git a/chromium-69.0.3497.81-widevine-r2.patch b/chromium-69.0.3497.81-widevine-r2.patch deleted file mode 100644 index a66a0fb..0000000 --- a/chromium-69.0.3497.81-widevine-r2.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up chromium-69.0.3497.81/third_party/widevine/cdm/BUILD.gn.wvhack chromium-69.0.3497.81/third_party/widevine/cdm/BUILD.gn ---- chromium-69.0.3497.81/third_party/widevine/cdm/BUILD.gn.wvhack 2018-09-06 13:28:22.655272555 -0400 -+++ chromium-69.0.3497.81/third_party/widevine/cdm/BUILD.gn 2018-09-06 13:28:22.655272555 -0400 -@@ -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 -diff -up chromium-69.0.3497.81/third_party/widevine/cdm/stub/widevine_cdm_version.h.wvhack chromium-69.0.3497.81/third_party/widevine/cdm/stub/widevine_cdm_version.h ---- chromium-69.0.3497.81/third_party/widevine/cdm/stub/widevine_cdm_version.h.wvhack 2018-09-06 13:28:22.654272577 -0400 -+++ chromium-69.0.3497.81/third_party/widevine/cdm/stub/widevine_cdm_version.h 2018-09-06 13:28:22.654272577 -0400 -@@ -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_ diff --git a/chromium-70.0.3538.110-remove-sysroot-options.patch b/chromium-70.0.3538.110-remove-sysroot-options.patch deleted file mode 100644 index 9eb99d1..0000000 --- a/chromium-70.0.3538.110-remove-sysroot-options.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py.sysrootfix chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py ---- chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py.sysrootfix 2018-11-26 13:40:19.324713204 -0500 -+++ chromium-70.0.3538.110/tools/gn/bootstrap/bootstrap.py 2018-11-26 13:40:43.199180888 -0500 -@@ -46,10 +46,6 @@ def main(argv): - '--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') - options, args = parser.parse_args(argv) - if args: -@@ -71,8 +67,6 @@ def main(argv): - '--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) diff --git a/chromium-70.0.3538.77-harfbuzz2-fix.patch b/chromium-70.0.3538.77-harfbuzz2-fix.patch deleted file mode 100644 index 2d5602d..0000000 --- a/chromium-70.0.3538.77-harfbuzz2-fix.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 7ae38170a117e909bb28e1470842b68de3501197 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert -Date: Sun, 21 Oct 2018 10:06:53 -0400 -Subject: [PATCH] blink: add 'const' modifier for harfbuzz hb_codepoint_t - pointers - -This resolves a build failure against harfbuzz 2.0. - -Based on a patch by Alexandre Fierreira. - -Bug: https://bugs.gentoo.org/669034 ---- - .../renderer/platform/fonts/shaping/harfbuzz_face.cc | 2 +- - .../renderer/platform/fonts/skia/skia_text_metrics.cc | 9 +++++++-- - .../renderer/platform/fonts/skia/skia_text_metrics.h | 2 +- - 3 files changed, 9 insertions(+), 4 deletions(-) - -diff --git a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc -index 8e7d91ca371f..e279a5876cb3 100644 ---- a/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc -+++ b/third_party/blink/renderer/platform/fonts/shaping/harfbuzz_face.cc -@@ -139,7 +139,7 @@ static hb_position_t HarfBuzzGetGlyphHorizontalAdvance(hb_font_t* hb_font, - static void HarfBuzzGetGlyphHorizontalAdvances(hb_font_t* font, - void* font_data, - unsigned count, -- hb_codepoint_t* first_glyph, -+ const hb_codepoint_t* first_glyph, - unsigned int glyph_stride, - hb_position_t* first_advance, - unsigned int advance_stride, -diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc -index 77ec6209fab9..9f9070921448 100644 ---- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc -+++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.cc -@@ -18,6 +18,11 @@ T* advance_by_byte_size(T* p, unsigned byte_size) { - return reinterpret_cast(reinterpret_cast(p) + byte_size); - } - -+template -+T* advance_by_byte_size_const(T* p, unsigned byte_size) { -+ return reinterpret_cast(reinterpret_cast(p) + byte_size); -+} -+ - } // namespace - - SkiaTextMetrics::SkiaTextMetrics(const SkPaint* paint) : paint_(paint) { -@@ -39,7 +44,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(hb_codepoint_t codepoint, - } - - void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, -- hb_codepoint_t* glyphs, -+ const hb_codepoint_t* glyphs, - unsigned glyph_stride, - hb_position_t* advances, - unsigned advance_stride) { -@@ -48,7 +53,7 @@ void SkiaTextMetrics::GetGlyphWidthForHarfBuzz(unsigned count, - // array that copy them to a regular array. - Vector glyph_array(count); - for (unsigned i = 0; i < count; -- i++, glyphs = advance_by_byte_size(glyphs, glyph_stride)) { -+ i++, glyphs = advance_by_byte_size_const(glyphs, glyph_stride)) { - glyph_array[i] = *glyphs; - } - Vector sk_width_array(count); -diff --git a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h -index 787d8af0375a..3bc4407c641b 100644 ---- a/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h -+++ b/third_party/blink/renderer/platform/fonts/skia/skia_text_metrics.h -@@ -19,7 +19,7 @@ class SkiaTextMetrics final { - - void GetGlyphWidthForHarfBuzz(hb_codepoint_t, hb_position_t* width); - void GetGlyphWidthForHarfBuzz(unsigned count, -- hb_codepoint_t* first_glyph, -+ const hb_codepoint_t* first_glyph, - unsigned glyph_stride, - hb_position_t* first_advance, - unsigned advance_stride); --- -2.19.1 - diff --git a/chromium-71-gcc-0.patch b/chromium-71-gcc-0.patch deleted file mode 100644 index 711b827..0000000 --- a/chromium-71-gcc-0.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 65be571f6ac2f7942b4df9e50b24da517f829eec Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Mon, 15 Oct 2018 20:26:10 +0000 -Subject: [PATCH] google_util: Explicitly use std::initializer_list with - base::NoDestructor -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Follow-up to ac53c5c53 ("Remove CR_DEFINE_STATIC_LOCAL from /components"). -Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having -base::NoDestructor> and passing an initializer list of Us does not -work if this is not done explicitly, as GCC incorrectly fails to determine -which constructor overload to use: - - ../../components/google/core/common/google_util.cc: In function ‘bool google_util::{anonymous}::IsCanonicalHostGoogleHostname(base::StringPiece, google_util::SubdomainPermission)’: - ../../components/google/core/common/google_util.cc:120:24: error: call of overloaded ‘NoDestructor()’ is ambiguous - {GOOGLE_TLD_LIST}); - -See also: https://chromium-review.googlesource.com/c/chromium/src/+/1170905 - -Bug: 819294 -Change-Id: Ie1490b6646d7998d636c485769caabf56c1cf44c -Reviewed-on: https://chromium-review.googlesource.com/c/1275854 -Reviewed-by: Peter Kasting -Commit-Queue: Raphael Kubo da Costa (CET) -Cr-Commit-Position: refs/heads/master@{#599733} ---- - components/google/core/common/google_util.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/components/google/core/common/google_util.cc b/components/google/core/common/google_util.cc -index a44c84393820..7733848a0443 100644 ---- a/components/google/core/common/google_util.cc -+++ b/components/google/core/common/google_util.cc -@@ -117,7 +117,7 @@ bool IsCanonicalHostGoogleHostname(base::StringPiece canonical_host, - StripTrailingDot(&tld); - - static base::NoDestructor> google_tlds( -- {GOOGLE_TLD_LIST}); -+ std::initializer_list({GOOGLE_TLD_LIST})); - return base::ContainsKey(*google_tlds, tld.as_string()); - } - -@@ -132,7 +132,8 @@ bool IsGoogleSearchSubdomainUrl(const GURL& url) { - StripTrailingDot(&host); - - static base::NoDestructor> google_subdomains( -- {"ipv4.google.com", "ipv6.google.com"}); -+ std::initializer_list( -+ {"ipv4.google.com", "ipv6.google.com"})); - - return base::ContainsKey(*google_subdomains, host.as_string()); - } --- -2.19.1 - diff --git a/chromium-71.0.3578.98-el7-fix-noexcept.patch b/chromium-71.0.3578.98-el7-fix-noexcept.patch deleted file mode 100644 index 234f0a9..0000000 --- a/chromium-71.0.3578.98-el7-fix-noexcept.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up chromium-71.0.3578.98/chrome/common/media_router/media_sink.cc.fix-noexcept chromium-71.0.3578.98/chrome/common/media_router/media_sink.cc ---- chromium-71.0.3578.98/chrome/common/media_router/media_sink.cc.fix-noexcept 2019-01-02 14:44:40.449801789 -0500 -+++ chromium-71.0.3578.98/chrome/common/media_router/media_sink.cc 2019-01-02 14:44:54.167481936 -0500 -@@ -24,7 +24,7 @@ MediaSink::MediaSink() = default; - MediaSink::~MediaSink() = default; - - MediaSink& MediaSink::operator=(const MediaSink& other) = default; --MediaSink& MediaSink::operator=(MediaSink&& other) noexcept = default; -+MediaSink& MediaSink::operator=(MediaSink&& other) = default; - - bool MediaSink::Equals(const MediaSink& other) const { - return sink_id_ == other.sink_id_; -diff -up chromium-71.0.3578.98/components/policy/core/common/policy_map.cc.fix-noexcept chromium-71.0.3578.98/components/policy/core/common/policy_map.cc ---- chromium-71.0.3578.98/components/policy/core/common/policy_map.cc.fix-noexcept 2019-01-02 12:06:10.867313533 -0500 -+++ chromium-71.0.3578.98/components/policy/core/common/policy_map.cc 2019-01-02 12:06:27.544980078 -0500 -@@ -18,7 +18,7 @@ PolicyMap::Entry::Entry() = default; - PolicyMap::Entry::~Entry() = default; - - PolicyMap::Entry::Entry(Entry&&) noexcept = default; --PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) noexcept = default; -+PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) = default; - - PolicyMap::Entry PolicyMap::Entry::DeepCopy() const { - Entry copy; -diff -up chromium-71.0.3578.98/components/signin/core/browser/account_info.cc.fix-noexcept chromium-71.0.3578.98/components/signin/core/browser/account_info.cc ---- chromium-71.0.3578.98/components/signin/core/browser/account_info.cc.fix-noexcept 2019-01-02 10:57:29.194710662 -0500 -+++ chromium-71.0.3578.98/components/signin/core/browser/account_info.cc 2019-01-02 10:58:57.829965474 -0500 -@@ -32,7 +32,7 @@ AccountInfo::AccountInfo(AccountInfo&& o - - AccountInfo& AccountInfo::operator=(const AccountInfo& other) = default; - --AccountInfo& AccountInfo::operator=(AccountInfo&& other) noexcept = default; -+AccountInfo& AccountInfo::operator=(AccountInfo&& other) = default; - - bool AccountInfo::IsEmpty() const { - return account_id.empty() && email.empty() && gaia.empty() && -diff -up chromium-71.0.3578.98/gpu/config/gpu_info.cc.fix-noexcept chromium-71.0.3578.98/gpu/config/gpu_info.cc ---- chromium-71.0.3578.98/gpu/config/gpu_info.cc.fix-noexcept 2018-12-20 09:50:03.320449807 -0500 -+++ chromium-71.0.3578.98/gpu/config/gpu_info.cc 2018-12-20 09:50:25.768849091 -0500 -@@ -116,7 +116,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice:: - const GPUInfo::GPUDevice& other) = default; - - GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=( -- GPUInfo::GPUDevice&& other) noexcept = default; -+ GPUInfo::GPUDevice&& other) = default; - - GPUInfo::GPUInfo() - : optimus(false), diff --git a/chromium-71.0.3578.98-norar.patch b/chromium-71.0.3578.98-norar.patch deleted file mode 100644 index 1259088..0000000 --- a/chromium-71.0.3578.98-norar.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up chromium-71.0.3578.98/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-71.0.3578.98/chrome/common/safe_browsing/BUILD.gn ---- chromium-71.0.3578.98/chrome/common/safe_browsing/BUILD.gn.nounrar 2018-12-12 16:56:04.000000000 -0500 -+++ chromium-71.0.3578.98/chrome/common/safe_browsing/BUILD.gn 2018-12-14 11:44:52.172805635 -0500 -@@ -56,40 +56,6 @@ if (safe_browsing_mode == 1) { - ] - } - -- source_set("rar_analyzer") { -- sources = [ -- "rar_analyzer.cc", -- "rar_analyzer.h", -- ] -- -- deps = [ -- ":archive_analyzer_results", -- ":download_protection_util", -- ":file_type_policies", -- "//base", -- "//base:i18n", -- "//third_party/unrar:unrar", -- ] -- -- defines = [ -- "_FILE_OFFSET_BITS=64", -- "LARGEFILE_SOURCE", -- "RAR_SMP", -- "SILENT", -- -- # The following is set to disable certain macro definitions in the unrar -- # source code. -- "CHROMIUM_UNRAR", -- -- # Disables exceptions in unrar, replaces them with process termination. -- "UNRAR_NO_EXCEPTIONS", -- ] -- -- public_deps = [ -- "//components/safe_browsing:csd_proto", -- ] -- } -- - source_set("disk_image_type_sniffer_mac") { - sources = [ - "disk_image_type_sniffer_mac.cc", -@@ -136,7 +102,6 @@ source_set("safe_browsing") { - deps += [ - ":archive_analyzer_results", - ":download_protection_util", -- ":rar_analyzer", - "//components/safe_browsing:features", - ] - -diff -up chromium-71.0.3578.98/chrome/common/safe_browsing/DEPS.nounrar chromium-71.0.3578.98/chrome/common/safe_browsing/DEPS ---- chromium-71.0.3578.98/chrome/common/safe_browsing/DEPS.nounrar 2018-12-12 16:56:04.000000000 -0500 -+++ chromium-71.0.3578.98/chrome/common/safe_browsing/DEPS 2018-12-14 11:23:58.628142952 -0500 -@@ -1,6 +1,5 @@ - include_rules = [ - "+components/safe_browsing", - "+third_party/protobuf", -- "+third_party/unrar", - "+third_party/zlib", - ] -diff -up chromium-71.0.3578.98/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-71.0.3578.98/chrome/services/file_util/safe_archive_analyzer.cc ---- chromium-71.0.3578.98/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2018-12-12 16:56:04.000000000 -0500 -+++ chromium-71.0.3578.98/chrome/services/file_util/safe_archive_analyzer.cc 2018-12-14 11:23:58.628142952 -0500 -@@ -47,9 +47,13 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile - - void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file, - AnalyzeRarFileCallback callback) { -+#if 0 - DCHECK(rar_file.IsValid()); - - safe_browsing::ArchiveAnalyzerResults results; - safe_browsing::rar_analyzer::AnalyzeRarFile(std::move(rar_file), &results); - std::move(callback).Run(results); -+#else -+ NOTREACHED(); -+#endif - } diff --git a/chromium-71.0.3578.98-remove-sysroot-options.patch b/chromium-71.0.3578.98-remove-sysroot-options.patch deleted file mode 100644 index a9af73b..0000000 --- a/chromium-71.0.3578.98-remove-sysroot-options.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py.sysrootfix chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py ---- chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py.sysrootfix 2018-12-14 12:52:04.144860836 -0500 -+++ chromium-71.0.3578.98/tools/gn/bootstrap/bootstrap.py 2018-12-14 12:57:54.791539599 -0500 -@@ -46,10 +46,6 @@ def main(argv): - '--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 @@ def main(argv): - '--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) diff --git a/chromium-71.0.3578.98-vaapi-libva1-compatibility.patch b/chromium-71.0.3578.98-vaapi-libva1-compatibility.patch deleted file mode 100644 index 5b51e3d..0000000 --- a/chromium-71.0.3578.98-vaapi-libva1-compatibility.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up chromium-71.0.3578.98/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc.va1compat chromium-71.0.3578.98/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc ---- chromium-71.0.3578.98/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc.va1compat 2018-12-17 15:07:48.158717055 -0500 -+++ chromium-71.0.3578.98/media/gpu/vaapi/vaapi_jpeg_decode_accelerator.cc 2018-12-17 15:09:49.780316983 -0500 -@@ -38,6 +38,10 @@ enum VAJDADecoderFailure { - VAJDA_DECODER_FAILURES_MAX, - }; - -+#ifndef VA_FOURCC_I420 -+#define VA_FOURCC_I420 VA_FOURCC('I', '4', '2', '0') -+#endif -+ - static void ReportToUMA(VAJDADecoderFailure failure) { - UMA_HISTOGRAM_ENUMERATION("Media.VAJDA.DecoderFailure", failure, - VAJDA_DECODER_FAILURES_MAX + 1); diff --git a/chromium-72.0.3626.121-fix-va-check.patch b/chromium-72.0.3626.121-fix-va-check.patch deleted file mode 100644 index aa0eb71..0000000 --- a/chromium-72.0.3626.121-fix-va-check.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc.fixvacheck chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc ---- chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc.fixvacheck 2019-03-10 14:54:38.744305074 -0400 -+++ chromium-72.0.3626.121/media/gpu/vaapi/vaapi_wrapper.cc 2019-03-10 14:55:34.383221574 -0400 -@@ -334,15 +334,16 @@ bool VADisplayState::InitializeOnce() { - << va_vendor_string_; - - // The VAAPI version is determined from what is loaded on the system by -- // calling vaInitialize(). We want a runtime evaluation of libva version, -- // of what is loaded on the system, with, what browser is compiled with. -- // Also since the libva is now ABI-compatible, relax the version check -- // which helps in upgrading the libva, without breaking any existing -- // functionality. -- if (!VA_CHECK_VERSION(major_version, minor_version, 0)) { -- LOG(ERROR) << "This build of Chromium requires VA-API version " -- << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION -- << ", system version: " << major_version << "." << minor_version; -+ // calling vaInitialize(). Since the libva is now ABI-compatible, relax the -+ // version check which helps in upgrading the libva, without breaking any -+ // existing functionality. Make sure the system version is not older than -+ // the version with which the chromium is built since libva is only -+ // guaranteed to be backward (and not forward) compatible. -+ if (VA_MAJOR_VERSION > major_version || -+ (VA_MAJOR_VERSION == major_version && VA_MINOR_VERSION > minor_version)) { -+ LOG(ERROR) << "The system version " << major_version << "." << minor_version -+ << " should be greater than or equal to " -+ << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION; - return false; - } - return true; diff --git a/chromium-72.0.3626.121-norar.patch b/chromium-72.0.3626.121-norar.patch deleted file mode 100644 index d5d2632..0000000 --- a/chromium-72.0.3626.121-norar.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up chromium-72.0.3626.121/chrome/common/safe_browsing/BUILD.gn.nounrar chromium-72.0.3626.121/chrome/common/safe_browsing/BUILD.gn ---- chromium-72.0.3626.121/chrome/common/safe_browsing/BUILD.gn.nounrar 2019-03-10 14:15:47.187705953 -0400 -+++ chromium-72.0.3626.121/chrome/common/safe_browsing/BUILD.gn 2019-03-10 14:16:47.154138649 -0400 -@@ -56,40 +56,6 @@ if (safe_browsing_mode == 1) { - ] - } - -- source_set("rar_analyzer") { -- sources = [ -- "rar_analyzer.cc", -- "rar_analyzer.h", -- ] -- -- deps = [ -- ":archive_analyzer_results", -- ":download_type_util", -- ":file_type_policies", -- "//base", -- "//base:i18n", -- "//third_party/unrar:unrar", -- ] -- -- defines = [ -- "_FILE_OFFSET_BITS=64", -- "LARGEFILE_SOURCE", -- "RAR_SMP", -- "SILENT", -- -- # The following is set to disable certain macro definitions in the unrar -- # source code. -- "CHROMIUM_UNRAR", -- -- # Disables exceptions in unrar, replaces them with process termination. -- "UNRAR_NO_EXCEPTIONS", -- ] -- -- public_deps = [ -- "//components/safe_browsing:csd_proto", -- ] -- } -- - source_set("disk_image_type_sniffer_mac") { - sources = [ - "disk_image_type_sniffer_mac.cc", -@@ -150,7 +116,6 @@ source_set("safe_browsing") { - deps += [ - ":archive_analyzer_results", - ":download_type_util", -- ":rar_analyzer", - "//components/safe_browsing:features", - ] - -diff -up chromium-72.0.3626.121/chrome/common/safe_browsing/DEPS.nounrar chromium-72.0.3626.121/chrome/common/safe_browsing/DEPS ---- chromium-72.0.3626.121/chrome/common/safe_browsing/DEPS.nounrar 2019-03-01 23:10:03.000000000 -0500 -+++ chromium-72.0.3626.121/chrome/common/safe_browsing/DEPS 2019-03-10 14:14:55.430058716 -0400 -@@ -1,6 +1,5 @@ - include_rules = [ - "+components/safe_browsing", - "+third_party/protobuf", -- "+third_party/unrar", - "+third_party/zlib", - ] -diff -up chromium-72.0.3626.121/chrome/services/file_util/safe_archive_analyzer.cc.nounrar chromium-72.0.3626.121/chrome/services/file_util/safe_archive_analyzer.cc ---- chromium-72.0.3626.121/chrome/services/file_util/safe_archive_analyzer.cc.nounrar 2019-03-01 23:10:04.000000000 -0500 -+++ chromium-72.0.3626.121/chrome/services/file_util/safe_archive_analyzer.cc 2019-03-10 14:14:55.433058638 -0400 -@@ -47,9 +47,13 @@ void SafeArchiveAnalyzer::AnalyzeDmgFile - - void SafeArchiveAnalyzer::AnalyzeRarFile(base::File rar_file, - AnalyzeRarFileCallback callback) { -+#if 0 - DCHECK(rar_file.IsValid()); - - safe_browsing::ArchiveAnalyzerResults results; - safe_browsing::rar_analyzer::AnalyzeRarFile(std::move(rar_file), &results); - std::move(callback).Run(results); -+#else -+ NOTREACHED(); -+#endif - } diff --git a/chromium-73-gcc-0.patch b/chromium-73-gcc-0.patch deleted file mode 100644 index 5a50700..0000000 --- a/chromium-73-gcc-0.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 2c3b57cafbbb38c13a519c9d2fda8b65691d9564 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Thu, 7 Feb 2019 22:55:37 +0000 -Subject: [PATCH] allocator shim: Swap ALIGN_LINKAGE and SHIM_ALWAYS_EXPORT's - positions -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes the GCC build. GCC seems to be stricter with the position of the -linkage specification, so just swap the terms to prevent an error that looks -like: - -In file included from ../../base/allocator/allocator_shim.cc:333: -../../base/allocator/allocator_shim_override_cpp_symbols.h:39:30: error: expected unqualified-id before string constant - #define ALIGN_LINKAGE extern "C" - ^~~ -../../base/allocator/allocator_shim_override_cpp_symbols.h:99:20: note: in expansion of macro ‘ALIGN_LINKAGE’ - SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size, - ^~~~~~~~~~~~~ - -Bug: 819294 -Change-Id: I0aa16ea88cead42e83796a1c86afad8b447ddc50 -Reviewed-on: https://chromium-review.googlesource.com/c/1458256 -Auto-Submit: Raphael Kubo da Costa -Reviewed-by: Thomas Anderson -Reviewed-by: Primiano Tucci -Commit-Queue: Raphael Kubo da Costa -Cr-Commit-Position: refs/heads/master@{#630084} ---- - .../allocator_shim_override_cpp_symbols.h | 20 +++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/base/allocator/allocator_shim_override_cpp_symbols.h b/base/allocator/allocator_shim_override_cpp_symbols.h -index 1228f5e33d28..01d25b7f6437 100644 ---- a/base/allocator/allocator_shim_override_cpp_symbols.h -+++ b/base/allocator/allocator_shim_override_cpp_symbols.h -@@ -96,57 +96,57 @@ SHIM_ALWAYS_EXPORT void operator delete[](void* p, size_t) __THROW { - ShimCppDelete(p); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW(std::size_t size, -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW(std::size_t size, - ALIGN_VAL_T alignment) { - return ShimCppAlignedNew(size, static_cast(alignment)); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_NOTHROW( -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_NOTHROW( - std::size_t size, - ALIGN_VAL_T alignment, - const std::nothrow_t&) __THROW { - return ShimCppAlignedNew(size, static_cast(alignment)); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW { -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL(void* p, ALIGN_VAL_T) __THROW { - ShimCppDelete(p); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_SIZED(void* p, -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_SIZED(void* p, - std::size_t size, - ALIGN_VAL_T) __THROW { - ShimCppDelete(p); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void - ALIGN_DEL_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW { - ShimCppDelete(p); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR(std::size_t size, -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR(std::size_t size, - ALIGN_VAL_T alignment) { - return ShimCppAlignedNew(size, static_cast(alignment)); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void* ALIGN_NEW_ARR_NOTHROW( -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void* ALIGN_NEW_ARR_NOTHROW( - std::size_t size, - ALIGN_VAL_T alignment, - const std::nothrow_t&) __THROW { - return ShimCppAlignedNew(size, static_cast(alignment)); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR(void* p, -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR(void* p, - ALIGN_VAL_T) __THROW { - ShimCppDelete(p); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void ALIGN_DEL_ARR_SIZED(void* p, -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void ALIGN_DEL_ARR_SIZED(void* p, - std::size_t size, - ALIGN_VAL_T) __THROW { - ShimCppDelete(p); - } - --SHIM_ALWAYS_EXPORT ALIGN_LINKAGE void -+ALIGN_LINKAGE SHIM_ALWAYS_EXPORT void - ALIGN_DEL_ARR_NOTHROW(void* p, ALIGN_VAL_T, const std::nothrow_t&) __THROW { - ShimCppDelete(p); - } --- -2.20.1 - diff --git a/chromium-73-gcc-1.patch b/chromium-73-gcc-1.patch deleted file mode 100644 index c3f8e42..0000000 --- a/chromium-73-gcc-1.patch +++ /dev/null @@ -1,99 +0,0 @@ -From 130a5ae24a02daba8729ba2216bcaf3dbfacea69 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Fri, 8 Feb 2019 16:58:38 +0000 -Subject: [PATCH] media::learning: Make LabelledExample's move assignment - operator noexcept -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The GCC build is currently broken with an error like this: - - ../../media/learning/common/labelled_example.cc:20:1: error: function ‘media::learning::LabelledExample::LabelledExample(media::learning::LabelledExample&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ - LabelledExample::LabelledExample(LabelledExample&& rhs) noexcept = default; - ^~~~~~~~~~~~~~~ - -With GCC, having that noexcept marker requires all members to be marked with -noexcept themselves, and TargetValue was missing some assignment operators -and noexcept markers. - -clang is fine because we pass -fno-exceptions and it disables the same error -there, while GCC continues to raise it (bug 843143 and its corresponding CL -have a longer discussion on this issue). - -Bug: 819294 -Change-Id: Ide30932fc466ccb52d6883a82777e703dae48798 -Reviewed-on: https://chromium-review.googlesource.com/c/1458210 -Commit-Queue: Frank Liberato -Reviewed-by: Frank Liberato -Auto-Submit: Raphael Kubo da Costa -Cr-Commit-Position: refs/heads/master@{#630355} ---- - media/learning/common/labelled_example.cc | 3 ++- - media/learning/common/labelled_example.h | 2 +- - media/learning/common/value.cc | 6 ++++++ - media/learning/common/value.h | 4 ++++ - 4 files changed, 13 insertions(+), 2 deletions(-) - -diff --git a/media/learning/common/labelled_example.cc b/media/learning/common/labelled_example.cc -index 76d08509298e..43e834f9f3cf 100644 ---- a/media/learning/common/labelled_example.cc -+++ b/media/learning/common/labelled_example.cc -@@ -59,7 +59,8 @@ bool LabelledExample::operator<(const LabelledExample& rhs) const { - LabelledExample& LabelledExample::operator=(const LabelledExample& rhs) = - default; - --LabelledExample& LabelledExample::operator=(LabelledExample&& rhs) = default; -+LabelledExample& LabelledExample::operator=(LabelledExample&& rhs) noexcept = -+ default; - - TrainingData::TrainingData() = default; - -diff --git a/media/learning/common/labelled_example.h b/media/learning/common/labelled_example.h -index 4f43c54e7a76..365abc3c0ebf 100644 ---- a/media/learning/common/labelled_example.h -+++ b/media/learning/common/labelled_example.h -@@ -40,7 +40,7 @@ struct COMPONENT_EXPORT(LEARNING_COMMON) LabelledExample { - bool operator<(const LabelledExample& rhs) const; - - LabelledExample& operator=(const LabelledExample& rhs); -- LabelledExample& operator=(LabelledExample&& rhs); -+ LabelledExample& operator=(LabelledExample&& rhs) noexcept; - - // Observed feature values. - // Note that to interpret these values, you probably need to have the -diff --git a/media/learning/common/value.cc b/media/learning/common/value.cc -index 9c9395c25d4e..12ea399d24c3 100644 ---- a/media/learning/common/value.cc -+++ b/media/learning/common/value.cc -@@ -23,6 +23,12 @@ Value::Value(const std::string& x) : value_(base::PersistentHash(x)) {} - - Value::Value(const Value& other) : value_(other.value_) {} - -+Value::Value(Value&& rhs) noexcept = default; -+ -+Value& Value::operator=(const Value& rhs) = default; -+ -+Value& Value::operator=(Value&& rhs) noexcept = default; -+ - bool Value::operator==(const Value& rhs) const { - return value_ == rhs.value_; - } -diff --git a/media/learning/common/value.h b/media/learning/common/value.h -index 0e64da961f34..62f4953f691c 100644 ---- a/media/learning/common/value.h -+++ b/media/learning/common/value.h -@@ -38,6 +38,10 @@ class COMPONENT_EXPORT(LEARNING_COMMON) Value { - explicit Value(const std::string& x); - - Value(const Value& other); -+ Value(Value&&) noexcept; -+ -+ Value& operator=(const Value&); -+ Value& operator=(Value&&) noexcept; - - bool operator==(const Value& rhs) const; - bool operator!=(const Value& rhs) const; --- -2.20.1 - diff --git a/chromium-73-gcc-2.patch b/chromium-73-gcc-2.patch deleted file mode 100644 index 9d1f05a..0000000 --- a/chromium-73-gcc-2.patch +++ /dev/null @@ -1,51 +0,0 @@ -From a5ba6f9bb7665040045dc0f8087407096630ad7b Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Fri, 8 Feb 2019 02:57:28 +0000 -Subject: [PATCH] color_utils: Use std::sqrt() instead of std::sqrtf() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes the build with libstdc++: - - ../../ui/gfx/color_utils.cc: In function ‘SkColor color_utils::SetDarkestColorForTesting(SkColor)’: - ../../ui/gfx/color_utils.cc:434:12: error: ‘sqrtf’ is not a member of ‘std’ - std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; - ^~~~~ - ../../ui/gfx/color_utils.cc:434:12: note: suggested alternative: ‘sqrt’ - std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; - ^~~~~ - sqrt - -sqrtf() is not formally part of C++14 as far as I can see even though libc++ -has it in . Additionally, we're only dealing with floats in all parts -of the expression above, so using the float sqrt() overload should be -harmless anyway. - -Bug: 819294 -Change-Id: If6c7bf31819df97a761e6963def6d6506154c34d -Reviewed-on: https://chromium-review.googlesource.com/c/1458193 -Auto-Submit: Raphael Kubo da Costa -Reviewed-by: Peter Kasting -Commit-Queue: Raphael Kubo da Costa -Cr-Commit-Position: refs/heads/master@{#630140} ---- - ui/gfx/color_utils.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ui/gfx/color_utils.cc b/ui/gfx/color_utils.cc -index c868cd54bac3..92ba1407d594 100644 ---- a/ui/gfx/color_utils.cc -+++ b/ui/gfx/color_utils.cc -@@ -431,7 +431,7 @@ SkColor SetDarkestColorForTesting(SkColor color) { - // GetContrastRatio(kWhiteLuminance, g_luminance_midpoint). The formula below - // can be verified by plugging it into how GetContrastRatio() operates. - g_luminance_midpoint = -- std::sqrtf((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; -+ std::sqrt((dark_luminance + 0.05f) * (kWhiteLuminance + 0.05f)) - 0.05f; - - return previous_darkest_color; - } --- -2.20.1 - diff --git a/chromium-73-gcc-3.patch b/chromium-73-gcc-3.patch deleted file mode 100644 index 9cc6cf2..0000000 --- a/chromium-73-gcc-3.patch +++ /dev/null @@ -1,69 +0,0 @@ -From c33e832cc145c696d2157796c7640e659740dafa Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Fri, 8 Feb 2019 08:44:00 +0000 -Subject: [PATCH] quic_flags_impl: Fix GCC build after #618558 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Due to https://gcc.gnu.org/bugzilla/show_bug.cgi?id=84849, having -base::NoDestructor> and passing an initializer list of Us does not -work if this is not done explicitly, as GCC incorrectly fails to determine -which constructor overload to use: - - ../../net/third_party/quic/platform/impl/quic_flags_impl.cc: In member function ‘bool quic::TypedQuicFlagHelper::SetFlag(const string&) const [with T = bool; std::__cxx11::string = std::__cxx11::basic_string]’: - ../../net/third_party/quic/platform/impl/quic_flags_impl.cc:156:41: error: call of overloaded ‘NoDestructor()’ is ambiguous - {"", "1", "t", "true", "y", "yes"}); - ^ - In file included from ../../net/third_party/quic/platform/impl/quic_flags_impl.h:16, - from ../../net/third_party/quic/platform/impl/quic_flags_impl.cc:5: - ../../base/no_destructor.h:62:3: note: candidate: ‘base::NoDestructor::NoDestructor(const base::NoDestructor&) [with T = std::set >]’ - NoDestructor(const NoDestructor&) = delete; - ^~~~~~~~~~~~ - ../../base/no_destructor.h:60:12: note: candidate: ‘base::NoDestructor::NoDestructor(T&&) [with T = std::set >]’ - explicit NoDestructor(T&& x) { new (storage_) T(std::move(x)); } - ^~~~~~~~~~~~ - ../../base/no_destructor.h:59:12: note: candidate: ‘base::NoDestructor::NoDestructor(const T&) [with T = std::set >]’ - explicit NoDestructor(const T& x) { new (storage_) T(x); } - ^~~~~~~~~~~~ - -Explicitly use an std::initializer_list to make the build work everywhere. - -Bug: 819294 -Change-Id: I775be20e3766a88a656b58c94c40869cb1bee2a8 -Reviewed-on: https://chromium-review.googlesource.com/c/1458214 -Auto-Submit: Raphael Kubo da Costa -Reviewed-by: Ryan Hamilton -Commit-Queue: Raphael Kubo da Costa -Cr-Commit-Position: refs/heads/master@{#630249} ---- - net/third_party/quic/platform/impl/quic_flags_impl.cc | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/net/third_party/quic/platform/impl/quic_flags_impl.cc b/net/third_party/quic/platform/impl/quic_flags_impl.cc -index 5e6962d1e770..3fa45fc6892d 100644 ---- a/net/third_party/quic/platform/impl/quic_flags_impl.cc -+++ b/net/third_party/quic/platform/impl/quic_flags_impl.cc -@@ -5,6 +5,7 @@ - #include "net/third_party/quic/platform/impl/quic_flags_impl.h" - - #include -+#include - #include - #include - -@@ -153,9 +154,9 @@ std::string QuicFlagRegistry::GetHelp() const { - template <> - bool TypedQuicFlagHelper::SetFlag(const std::string& s) const { - static const base::NoDestructor> kTrueValues( -- {"", "1", "t", "true", "y", "yes"}); -+ std::initializer_list({"", "1", "t", "true", "y", "yes"})); - static const base::NoDestructor> kFalseValues( -- {"0", "f", "false", "n", "no"}); -+ std::initializer_list({"0", "f", "false", "n", "no"})); - if (kTrueValues->find(base::ToLowerASCII(s)) != kTrueValues->end()) { - *flag_ = true; - return true; --- -2.20.1 - diff --git a/chromium-73-gcc-4.patch b/chromium-73-gcc-4.patch deleted file mode 100644 index df7d630..0000000 --- a/chromium-73-gcc-4.patch +++ /dev/null @@ -1,59 +0,0 @@ -From bdd76190e54e6a0e11343dd19e4bf1d06956fa48 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Wed, 13 Feb 2019 01:02:27 +0000 -Subject: [PATCH] BaseRenderingContext2D: Use base::CheckMul and simplify code - in putImageData() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Follow-up to commit e0b3253a56 ("Fix image conversion truncation issues"). -The current code does not build with GCC due to -https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89287: - - ../../third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc: In member function ‘void blink::BaseRenderingContext2D::putImageData(blink::ImageData*, int, int, int, int, int, int, blink::ExceptionState&)’: - ../../third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc:1777:44: error: default type conversion can't deduce template argument for ‘template::value, void>::type* > constexpr base::internal::StrictNumeric::operator Dst() const [with Dst = Dst; typename std::enable_if::value>::type* = ; T = long unsigned int]’ - new uint8_t[data_length.ValueOrDie()]); - ^ - -Work around it by using the more idiomatic base::CheckMul() with -AssignIfValid, so that we can have |data_length| be a size_t again and not -leave it to the compiler to figure out the type we want when creating the -|converted_pixels| array. - -Bug: 819294 -Change-Id: Id124cc4f3d749b45def4708e21e4badafd708578 -Reviewed-on: https://chromium-review.googlesource.com/c/1467201 -Auto-Submit: Raphael Kubo da Costa -Commit-Queue: Kentaro Hara -Reviewed-by: Kentaro Hara -Cr-Commit-Position: refs/heads/master@{#631472} ---- - .../canvas/canvas2d/base_rendering_context_2d.cc | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -index d9fa696c9a9d..34a8a202bfd3 100644 ---- a/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -+++ b/third_party/blink/renderer/modules/canvas/canvas2d/base_rendering_context_2d.cc -@@ -1769,12 +1769,12 @@ void BaseRenderingContext2D::putImageData(ImageData* data, - CanvasColorParams(ColorParams().ColorSpace(), PixelFormat(), kNonOpaque); - if (data_color_params.NeedsColorConversion(context_color_params) || - PixelFormat() == kF16CanvasPixelFormat) { -- base::CheckedNumeric data_length = data->Size().Area(); -- data_length *= context_color_params.BytesPerPixel(); -- if (!data_length.IsValid()) -+ size_t data_length; -+ if (!base::CheckMul(data->Size().Area(), -+ context_color_params.BytesPerPixel()) -+ .AssignIfValid(&data_length)) - return; -- std::unique_ptr converted_pixels( -- new uint8_t[data_length.ValueOrDie()]); -+ std::unique_ptr converted_pixels(new uint8_t[data_length]); - if (data->ImageDataInCanvasColorSettings( - ColorParams().ColorSpace(), PixelFormat(), converted_pixels.get(), - kRGBAColorType)) { --- -2.20.1 - diff --git a/chromium-73-gcc-5.patch b/chromium-73-gcc-5.patch deleted file mode 100644 index 033861e..0000000 --- a/chromium-73-gcc-5.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 78b0f0dfa9e6f3c37b71102c01def92f1ab8c330 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Wed, 13 Feb 2019 23:28:46 +0000 -Subject: [PATCH] CastActivityManager: Do not make DoLaunchSessionParams' move - constructor noexcept -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes the GCC build: - - ../../chrome/browser/media/router/providers/cast/cast_activity_manager.cc:806:1: error: function ‘media_router::CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams(media_router::CastActivityManager::DoLaunchSessionParams&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ - CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams( - ^~~~~~~~~~~~~~~~~~~ - -With GCC, having that noexcept marker requires all members to be marked with -noexcept themselves, and MediaRoute, CastMediaSource and url::Origin need -the right annotations. Just making DoLaunchSessionParams not noexcept is the -least intrusive solution for now. - -clang is fine because we pass -fno-exceptions and it disables the same error -there, while GCC continues to raise it (bug 843143 and its corresponding CL -have a longer discussion on this issue). - -Bug: 819294 -Change-Id: Ia3a5fb60b5e74e68bd35cfa50e2fcc728b64e5eb -Reviewed-on: https://chromium-review.googlesource.com/c/1469942 -Commit-Queue: mark a. foltz -Auto-Submit: Raphael Kubo da Costa -Reviewed-by: mark a. foltz -Cr-Commit-Position: refs/heads/master@{#631962} ---- - .../media/router/providers/cast/cast_activity_manager.cc | 2 +- - .../browser/media/router/providers/cast/cast_activity_manager.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager.cc b/chrome/browser/media/router/providers/cast/cast_activity_manager.cc -index b7ee9695f69a..8569e0cd30a3 100644 ---- a/chrome/browser/media/router/providers/cast/cast_activity_manager.cc -+++ b/chrome/browser/media/router/providers/cast/cast_activity_manager.cc -@@ -804,7 +804,7 @@ CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams( - callback(std::move(callback)) {} - - CastActivityManager::DoLaunchSessionParams::DoLaunchSessionParams( -- DoLaunchSessionParams&& other) noexcept = default; -+ DoLaunchSessionParams&& other) = default; - - CastActivityManager::DoLaunchSessionParams::~DoLaunchSessionParams() = default; - -diff --git a/chrome/browser/media/router/providers/cast/cast_activity_manager.h b/chrome/browser/media/router/providers/cast/cast_activity_manager.h -index 325bffc725ee..08fe0ccca603 100644 ---- a/chrome/browser/media/router/providers/cast/cast_activity_manager.h -+++ b/chrome/browser/media/router/providers/cast/cast_activity_manager.h -@@ -295,7 +295,7 @@ class CastActivityManager : public cast_channel::CastMessageHandler::Observer, - const url::Origin& origin, - int tab_id, - mojom::MediaRouteProvider::CreateRouteCallback callback); -- DoLaunchSessionParams(DoLaunchSessionParams&& other) noexcept; -+ DoLaunchSessionParams(DoLaunchSessionParams&& other); - ~DoLaunchSessionParams(); - DoLaunchSessionParams& operator=(DoLaunchSessionParams&&) = delete; - --- -2.20.1 - diff --git a/chromium-73-gcc-6.patch b/chromium-73-gcc-6.patch deleted file mode 100644 index 752f83c..0000000 --- a/chromium-73-gcc-6.patch +++ /dev/null @@ -1,88 +0,0 @@ -From cf4c534f04c223f8a9d65407852e2a531a6d7fb6 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Thu, 14 Feb 2019 22:22:21 +0000 -Subject: [PATCH] chrome/browser: Replace some forward declarations with actual - includes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This fixes the GCC build which was failing like this: - - ../../base/scoped_observer.h: In instantiation of ‘void ScopedObserver::RemoveAll() [with Source = TabStripModel; Observer = TabStripModelObserver]’: - ../../base/scoped_observer.h:26:5: required from ‘ScopedObserver::~ScopedObserver() [with Source = TabStripModel; Observer = TabStripModelObserver]’ - ../../chrome/browser/ui/views/extensions/extension_popup.h:115:70: required from here - ../../base/scoped_observer.h:45:20: error: invalid use of incomplete type ‘class TabStripModel’ - sources_[i]->RemoveObserver(observer_); - ~~~~~~~~~~~~~^~~~~~~~~~~~~~ - -This is caused by https://gcc.gnu.org/bugzilla/show_bug.cgi?id=89311 ("Brace -initialization needlessly invokes destructor"), i.e. having something like - - ScopedObserver observer_{this}; - -in a header declaration requires T and U to be fully declared because -ScopedObserver's destructor references them. In a few cases, T was only -forward-declared. - -Bug: 819294 -Change-Id: Ie5b9dc2745e27d4532c5539e3845a8c9147a0595 -Reviewed-on: https://chromium-review.googlesource.com/c/1472576 -Auto-Submit: Raphael Kubo da Costa -Commit-Queue: Alan Cutter -Reviewed-by: Finnur Thorarinsson -Reviewed-by: Alan Cutter -Cr-Commit-Position: refs/heads/master@{#632385} ---- - chrome/browser/ui/views/extensions/extension_popup.cc | 1 - - chrome/browser/ui/views/extensions/extension_popup.h | 1 + - chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.cc | 1 - - chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h | 2 +- - .../web_applications/extensions/bookmark_app_tab_helper.cc | 1 - - .../web_applications/extensions/bookmark_app_tab_helper.h | 2 +- - 6 files changed, 3 insertions(+), 5 deletions(-) - -diff --git a/chrome/browser/ui/views/extensions/extension_popup.cc b/chrome/browser/ui/views/extensions/extension_popup.cc -index 3f0985d383dd..57d16aba9e9f 100644 ---- a/chrome/browser/ui/views/extensions/extension_popup.cc -+++ b/chrome/browser/ui/views/extensions/extension_popup.cc -@@ -8,7 +8,6 @@ - #include "chrome/browser/devtools/devtools_window.h" - #include "chrome/browser/extensions/extension_view_host.h" - #include "chrome/browser/ui/browser.h" --#include "chrome/browser/ui/tabs/tab_strip_model.h" - #include "content/public/browser/devtools_agent_host.h" - #include "content/public/browser/notification_details.h" - #include "content/public/browser/notification_source.h" -diff --git a/chrome/browser/ui/views/extensions/extension_popup.h b/chrome/browser/ui/views/extensions/extension_popup.h -index 3661b5bda950..9018efa0fea5 100644 ---- a/chrome/browser/ui/views/extensions/extension_popup.h -+++ b/chrome/browser/ui/views/extensions/extension_popup.h -@@ -9,6 +9,7 @@ - #include "base/compiler_specific.h" - #include "base/macros.h" - #include "base/scoped_observer.h" -+#include "chrome/browser/ui/tabs/tab_strip_model.h" - #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" - #include "chrome/browser/ui/views/extensions/extension_view_views.h" - #include "content/public/browser/devtools_agent_host_observer.h" -diff --git a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h -index 2a3ea8e4f91f..ac44a4f05dec 100644 ---- a/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h -+++ b/chrome/browser/ui/views/toolbar/extension_toolbar_menu_view.h -@@ -8,6 +8,7 @@ - #include "base/macros.h" - #include "base/memory/weak_ptr.h" - #include "base/scoped_observer.h" -+#include "chrome/browser/ui/toolbar/toolbar_actions_bar.h" - #include "chrome/browser/ui/toolbar/toolbar_actions_bar_observer.h" - #include "chrome/browser/ui/views/toolbar/app_menu_observer.h" - #include "ui/views/controls/scroll_view.h" -@@ -15,7 +16,6 @@ class AppMenu; - class AppMenu; - class Browser; - class BrowserActionsContainer; --class ToolbarActionsBar; - - namespace views { - class MenuItemView; diff --git a/chromium-73.0.3683.103-glibc-2.29-clone-vfork.patch b/chromium-73.0.3683.103-glibc-2.29-clone-vfork.patch deleted file mode 100644 index 8ff952b..0000000 --- a/chromium-73.0.3683.103-glibc-2.29-clone-vfork.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -up chromium-73.0.3683.103/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.glibc229 chromium-73.0.3683.103/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ---- chromium-73.0.3683.103/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc.glibc229 2019-04-16 11:49:35.353081246 -0400 -+++ chromium-73.0.3683.103/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc 2019-04-16 11:51:22.105794620 -0400 -@@ -134,7 +134,8 @@ namespace sandbox { - #if !defined(OS_NACL_NONSFI) - // Allow Glibc's and Android pthread creation flags, crash on any other - // thread creation attempts and EPERM attempts to use neither --// CLONE_VM, nor CLONE_THREAD, which includes all fork() implementations. -+// CLONE_VM nor CLONE_THREAD (all fork implementations), unless CLONE_VFORK is -+// present (as in posix_spawn). - ResultExpr RestrictCloneToThreadsAndEPERMFork() { - const Arg flags(0); - -@@ -153,8 +154,14 @@ ResultExpr RestrictCloneToThreadsAndEPER - AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, - flags == kGlibcPthreadFlags); - -+ const uint64_t kImportantSpawnFlags = CLONE_VFORK | CLONE_VM; -+ -+ const BoolExpr isForkOrSpawn = -+ AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0, -+ (flags & kImportantSpawnFlags) == kImportantSpawnFlags); -+ - return If(IsAndroid() ? android_test : glibc_test, Allow()) -- .ElseIf((flags & (CLONE_VM | CLONE_THREAD)) == 0, Error(EPERM)) -+ .ElseIf(isForkOrSpawn, Error(EPERM)) - .Else(CrashSIGSYSClone()); - } - diff --git a/chromium-73.0.3683.75-aarch64-crashpad-limits.patch b/chromium-73.0.3683.75-aarch64-crashpad-limits.patch deleted file mode 100644 index 4eb9529..0000000 --- a/chromium-73.0.3683.75-aarch64-crashpad-limits.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up chromium-73.0.3683.75/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc.aarch64-limits chromium-73.0.3683.75/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc ---- chromium-73.0.3683.75/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc.aarch64-limits 2019-03-15 12:08:21.208676651 -0400 -+++ chromium-73.0.3683.75/third_party/crashpad/crashpad/snapshot/linux/cpu_context_linux.cc 2019-03-15 12:08:40.934251685 -0400 -@@ -16,6 +16,7 @@ - - #include - #include -+#include - - #include "base/logging.h" - diff --git a/chromium-73.0.3683.75-el7-fix-noexcept.patch b/chromium-73.0.3683.75-el7-fix-noexcept.patch deleted file mode 100644 index 3fc69ba..0000000 --- a/chromium-73.0.3683.75-el7-fix-noexcept.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc.el7-noexcept chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc ---- chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc.el7-noexcept 2019-03-11 18:00:54.000000000 -0400 -+++ chromium-73.0.3683.75/chrome/common/media_router/media_sink.cc 2019-03-20 09:45:29.400426336 -0400 -@@ -19,12 +19,12 @@ MediaSink::MediaSink(const MediaSink::Id - provider_id_(provider_id) {} - - MediaSink::MediaSink(const MediaSink& other) = default; --MediaSink::MediaSink(MediaSink&& other) noexcept = default; -+MediaSink::MediaSink(MediaSink&& other) = default; - MediaSink::MediaSink() = default; - MediaSink::~MediaSink() = default; - - MediaSink& MediaSink::operator=(const MediaSink& other) = default; --MediaSink& MediaSink::operator=(MediaSink&& other) noexcept = default; -+MediaSink& MediaSink::operator=(MediaSink&& other) = default; - - bool MediaSink::IsMaybeCloudSink() const { - switch (icon_type_) { -diff -up chromium-73.0.3683.75/components/policy/core/common/policy_map.cc.el7-noexcept chromium-73.0.3683.75/components/policy/core/common/policy_map.cc ---- chromium-73.0.3683.75/components/policy/core/common/policy_map.cc.el7-noexcept 2019-03-11 18:00:56.000000000 -0400 -+++ chromium-73.0.3683.75/components/policy/core/common/policy_map.cc 2019-03-19 11:11:38.310689134 -0400 -@@ -25,7 +25,7 @@ PolicyMap::Entry::Entry() = default; - PolicyMap::Entry::~Entry() = default; - - PolicyMap::Entry::Entry(Entry&&) noexcept = default; --PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) noexcept = default; -+PolicyMap::Entry& PolicyMap::Entry::operator=(Entry&&) = default; - - PolicyMap::Entry PolicyMap::Entry::DeepCopy() const { - Entry copy; -diff -up chromium-73.0.3683.75/components/signin/core/browser/account_info.cc.el7-noexcept chromium-73.0.3683.75/components/signin/core/browser/account_info.cc ---- chromium-73.0.3683.75/components/signin/core/browser/account_info.cc.el7-noexcept 2019-03-11 18:00:57.000000000 -0400 -+++ chromium-73.0.3683.75/components/signin/core/browser/account_info.cc 2019-03-19 11:11:38.311689112 -0400 -@@ -50,7 +50,7 @@ AccountInfo::AccountInfo(AccountInfo&& o - - AccountInfo& AccountInfo::operator=(const AccountInfo& other) = default; - --AccountInfo& AccountInfo::operator=(AccountInfo&& other) noexcept = default; -+AccountInfo& AccountInfo::operator=(AccountInfo&& other) = default; - - bool AccountInfo::IsEmpty() const { - return account_id.empty() && email.empty() && gaia.empty() && -diff -up chromium-73.0.3683.75/gpu/config/gpu_info.cc.el7-noexcept chromium-73.0.3683.75/gpu/config/gpu_info.cc ---- chromium-73.0.3683.75/gpu/config/gpu_info.cc.el7-noexcept 2019-03-19 11:12:36.992435015 -0400 -+++ chromium-73.0.3683.75/gpu/config/gpu_info.cc 2019-03-19 11:12:37.061433540 -0400 -@@ -118,7 +118,7 @@ GPUInfo::GPUDevice& GPUInfo::GPUDevice:: - const GPUInfo::GPUDevice& other) = default; - - GPUInfo::GPUDevice& GPUInfo::GPUDevice::operator=( -- GPUInfo::GPUDevice&& other) noexcept = default; -+ GPUInfo::GPUDevice&& other) = default; - - GPUInfo::GPUInfo() - : optimus(false), diff --git a/chromium-73.0.3683.75-no-header-hygiene.patch b/chromium-73.0.3683.75-no-header-hygiene.patch deleted file mode 100644 index a8d2a19..0000000 --- a/chromium-73.0.3683.75-no-header-hygiene.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -up chromium-73.0.3683.75/third_party/swiftshader/third_party/llvm-7.0/BUILD.gn.nohh chromium-73.0.3683.75/third_party/swiftshader/third_party/llvm-7.0/BUILD.gn ---- chromium-73.0.3683.75/third_party/swiftshader/third_party/llvm-7.0/BUILD.gn.nohh 2019-03-15 09:02:26.167929864 -0400 -+++ chromium-73.0.3683.75/third_party/swiftshader/third_party/llvm-7.0/BUILD.gn 2019-03-15 09:03:30.334433446 -0400 -@@ -74,9 +74,12 @@ config("swiftshader_llvm_private_config" - "-Wno-unused-private-field", - "-Wno-unused-result", - "-Wno-unused-variable", -- "-Wno-error=header-hygiene", - ] - -+ if (is_clang) { -+ cflags += [ "-Wno-error=header-hygiene" ] -+ } -+ - defines = [ - "__STDC_CONSTANT_MACROS", - "__STDC_LIMIT_MACROS", diff --git a/chromium-gcc5-r3.patch b/chromium-gcc5-r3.patch deleted file mode 100644 index 7605df6..0000000 --- a/chromium-gcc5-r3.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - ---- a/gpu/ipc/common/mailbox_struct_traits.h -+++ b/gpu/ipc/common/mailbox_struct_traits.h -@@ -15,7 +15,7 @@ namespace mojo { - template <> - struct StructTraits { - static base::span name(const gpu::Mailbox& mailbox) { -- return mailbox.name; -+ return base::make_span(mailbox.name); - } - static bool Read(gpu::mojom::MailboxDataView data, gpu::Mailbox* out); - }; ---- a/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -+++ b/services/viz/public/cpp/compositing/filter_operation_struct_traits.h -@@ -134,7 +134,7 @@ struct StructTraits { - static base::span matrix(const cc::FilterOperation& operation) { - if (operation.type() != cc::FilterOperation::COLOR_MATRIX) - return base::span(); -- return operation.matrix(); -+ return base::make_span(operation.matrix()); - } - - static base::span shape( ---- a/services/viz/public/cpp/compositing/quads_struct_traits.h -+++ b/services/viz/public/cpp/compositing/quads_struct_traits.h -@@ -284,7 +284,7 @@ - - static base::span vertex_opacity(const cc::DrawQuad& input) { - const cc::TextureDrawQuad* quad = cc::TextureDrawQuad::MaterialCast(&input); -- return quad->vertex_opacity; -+ return base::make_span(quad->vertex_opacity); - } - - static bool y_flipped(const cc::DrawQuad& input) { ---- a/third_party/WebKit/Source/platform/exported/WebCORS.cpp -+++ b/third_party/WebKit/Source/platform/exported/WebCORS.cpp -@@ -480,7 +480,7 @@ WebString AccessControlErrorString( - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -512,7 +512,7 @@ WebString PreflightErrorString(const PreflightStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - -@@ -533,7 +533,7 @@ WebString RedirectErrorString(const RedirectStatus status, - } - default: - NOTREACHED(); -- return ""; -+ return WebString(); - } - } - diff --git a/chromium-gcc8-r588316.patch b/chromium-gcc8-r588316.patch deleted file mode 100644 index d980805..0000000 --- a/chromium-gcc8-r588316.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 87902b3202f81d689dd314c17006ffc907fe12a1 Mon Sep 17 00:00:00 2001 -From: Wang Qing -Date: Mon, 3 Sep 2018 02:41:08 +0000 -Subject: [PATCH] Fix build error for blink. -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -This CLs fixed the error of constexpr function call to non-constexpr function. - -Bug: 878202 -Change-Id: I6ad217a687e62a9a384980d852743a56479de3a9 -Reviewed-on: https://chromium-review.googlesource.com/1192467 -Commit-Queue: 汪 清 -Reviewed-by: Eric Willigers -Cr-Commit-Position: refs/heads/master@{#588316} ---- - .../core/animation/animation_time_delta.cc | 22 ++++++++++++++ - .../core/animation/animation_time_delta.h | 30 +++++++------------ - 2 files changed, 32 insertions(+), 20 deletions(-) - -diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.cc b/third_party/blink/renderer/core/animation/animation_time_delta.cc -index 1b25469c7f2f..2e30a18890da 100644 ---- a/third_party/blink/renderer/core/animation/animation_time_delta.cc -+++ b/third_party/blink/renderer/core/animation/animation_time_delta.cc -@@ -7,6 +7,28 @@ - namespace blink { - - #if !defined(BLINK_ANIMATION_USE_TIME_DELTA) -+// Comparison operators on AnimationTimeDelta. -+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs) { -+ return lhs.InSecondsF() == rhs.InSecondsF(); -+} -+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs) { -+ return lhs.InSecondsF() != rhs.InSecondsF(); -+} -+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs) { -+ return lhs.InSecondsF() > rhs.InSecondsF(); -+} -+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs) { -+ return lhs.InSecondsF() >= rhs.InSecondsF(); -+} -+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs) { -+ return lhs.InSecondsF() <= rhs.InSecondsF(); -+} -+ - std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time) { - return os << time.InSecondsF() << " s"; - } -diff --git a/third_party/blink/renderer/core/animation/animation_time_delta.h b/third_party/blink/renderer/core/animation/animation_time_delta.h -index 1903c1150d3e..95d218466d90 100644 ---- a/third_party/blink/renderer/core/animation/animation_time_delta.h -+++ b/third_party/blink/renderer/core/animation/animation_time_delta.h -@@ -90,26 +90,16 @@ AnimationTimeDelta operator*(T a, AnimationTimeDelta td) { - } - - // Comparison operators on AnimationTimeDelta. --constexpr bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, -- const AnimationTimeDelta& rhs) { -- return lhs.InSecondsF() == rhs.InSecondsF(); --} --constexpr bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, -- const AnimationTimeDelta& rhs) { -- return lhs.InSecondsF() != rhs.InSecondsF(); --} --constexpr bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, -- const AnimationTimeDelta& rhs) { -- return lhs.InSecondsF() > rhs.InSecondsF(); --} --constexpr bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, -- const AnimationTimeDelta& rhs) { -- return lhs.InSecondsF() >= rhs.InSecondsF(); --} --constexpr bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, -- const AnimationTimeDelta& rhs) { -- return lhs.InSecondsF() <= rhs.InSecondsF(); --} -+bool CORE_EXPORT operator==(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs); -+bool CORE_EXPORT operator!=(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs); -+bool CORE_EXPORT operator>(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs); -+bool CORE_EXPORT operator>=(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs); -+bool CORE_EXPORT operator<=(const AnimationTimeDelta& lhs, -+ const AnimationTimeDelta& rhs); - - // Defined to allow DCHECK_EQ/etc to work with the class. - CORE_EXPORT std::ostream& operator<<(std::ostream& os, AnimationTimeDelta time); --- -2.17.2 - diff --git a/chromium-gcc8-r588547.patch b/chromium-gcc8-r588547.patch deleted file mode 100644 index 5f12f7f..0000000 --- a/chromium-gcc8-r588547.patch +++ /dev/null @@ -1,30 +0,0 @@ -From e3ad3deb6a6e79284f3748fa7410311d87df91c5 Mon Sep 17 00:00:00 2001 -From: Henrique Nakashima -Date: Tue, 4 Sep 2018 16:49:51 +0000 -Subject: [PATCH] IWYU: stdint.h in pdfium_mem_buffer_file_write.h for uint8_t - -Bug: 879900 -Change-Id: I9c15d1c280a23c53d31f2d72c9d0d1db79eab886 -Reviewed-on: https://chromium-review.googlesource.com/1204410 -Reviewed-by: Lei Zhang -Commit-Queue: Henrique Nakashima -Cr-Commit-Position: refs/heads/master@{#588547} ---- - pdf/pdfium/pdfium_mem_buffer_file_write.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/pdf/pdfium/pdfium_mem_buffer_file_write.h b/pdf/pdfium/pdfium_mem_buffer_file_write.h -index 03c54bb63800..82e82d23684d 100644 ---- a/pdf/pdfium/pdfium_mem_buffer_file_write.h -+++ b/pdf/pdfium/pdfium_mem_buffer_file_write.h -@@ -6,6 +6,7 @@ - #define PDF_PDFIUM_PDFIUM_MEM_BUFFER_FILE_WRITE_H_ - - #include -+#include - - #include - --- -2.17.2 - diff --git a/chromium-gcc8-r589614.patch b/chromium-gcc8-r589614.patch deleted file mode 100644 index 0c187fd..0000000 --- a/chromium-gcc8-r589614.patch +++ /dev/null @@ -1,37 +0,0 @@ -From cbdb8bd6567c8143dc8c1e5e86a21a8ea064eea4 Mon Sep 17 00:00:00 2001 -From: Maksim Sisov -Date: Fri, 7 Sep 2018 18:57:42 +0000 -Subject: [PATCH] OmniboxTextView: fix gcc error for structure initialization - -It looks like there is bug in GCC 6, which cannot go through -structure initialization normally. - -Thus, instead of a default initialization of one of the members, -explicitly initialize it to a default value. - -Change-Id: Ia55cc6658e6b6b2f8a80c2582dd28f001c9e648c -Reviewed-on: https://chromium-review.googlesource.com/1213181 -Reviewed-by: Scott Violet -Commit-Queue: Maksim Sisov -Cr-Commit-Position: refs/heads/master@{#589614} ---- - chrome/browser/ui/views/omnibox/omnibox_text_view.cc | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc -index f0a8083dc930..9021284f166d 100644 ---- a/chrome/browser/ui/views/omnibox/omnibox_text_view.cc -+++ b/chrome/browser/ui/views/omnibox/omnibox_text_view.cc -@@ -175,7 +175,8 @@ void ApplyTextStyleForType(SuggestionAnswer::TextStyle text_style, - style = {part_color, .baseline = gfx::SUPERIOR}; - break; - case SuggestionAnswer::TextStyle::BOLD: -- style = {part_color, .weight = gfx::Font::Weight::BOLD}; -+ style = {part_color, .baseline = gfx::NORMAL_BASELINE, -+ .weight = gfx::Font::Weight::BOLD}; - break; - case SuggestionAnswer::TextStyle::NORMAL: - case SuggestionAnswer::TextStyle::NORMAL_DIM: --- -2.17.2 - diff --git a/chromium-gcc8-r591015.patch b/chromium-gcc8-r591015.patch deleted file mode 100644 index 65c09e8..0000000 --- a/chromium-gcc8-r591015.patch +++ /dev/null @@ -1,70 +0,0 @@ -From e98f8ef8b2f236ecbb01df8c39e6ee1c8fbe8d7d Mon Sep 17 00:00:00 2001 -From: Maksim Sisov -Date: Thu, 13 Sep 2018 15:17:29 +0000 -Subject: [PATCH] ScrollPaintPropertyNode: Rename SnapContainerData() to - GetSnapContainerData() - -GCC is stricter than clang when it comes to class members' names and how -they can change the meaning of a previously existing symbol with the same -name. - -Here is a short error message: - -error: changes meaning of 'SnapContainerData' from 'using SnapContainerData = -class cc::SnapContainerData' [-fpermissive] using SnapContainerData = -cc::SnapContainerData; - -Cq-Include-Trybots: luci.chromium.try:linux_layout_tests_slimming_paint_v2;master.tryserver.blink:linux_trusty_blink_rel -Change-Id: I0de5460f17b13484253e1ff0538b111c9a3b0d13 -Reviewed-on: https://chromium-review.googlesource.com/1213180 -Commit-Queue: Maksim Sisov -Reviewed-by: Philip Rogers -Cr-Commit-Position: refs/heads/master@{#591015} ---- - .../blink/renderer/core/paint/paint_property_tree_update_tests.cc | 2 +- - .../renderer/platform/graphics/compositing/property_tree_manager.cc | 2 +- - .../blink/renderer/platform/graphics/paint/scroll_paint_property_node.h | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc -index 0d999d45076f..1fe1815a5659 100644 ---- a/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc -+++ b/third_party/blink/renderer/core/paint/paint_property_tree_update_tests.cc -@@ -1310,7 +1310,7 @@ TEST_P(PaintPropertyTreeUpdateTest, EnsureSnapContainerData) { - GetDocument().View()->Resize(300, 300); - GetDocument().View()->UpdateAllLifecyclePhases(); - -- auto doc_snap_container_data = DocScroll()->SnapContainerData(); -+ auto doc_snap_container_data = DocScroll()->GetSnapContainerData(); - ASSERT_TRUE(doc_snap_container_data); - EXPECT_EQ(doc_snap_container_data->scroll_snap_type().axis, SnapAxis::kBoth); - EXPECT_EQ(doc_snap_container_data->scroll_snap_type().strictness, -diff --git a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc -index 745b8c8b387e..5f87eeea9435 100644 ---- a/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc -+++ b/third_party/blink/renderer/platform/graphics/compositing/property_tree_manager.cc -@@ -333,7 +333,7 @@ void PropertyTreeManager::CreateCompositorScrollNode( - scroll_node->OverscrollBehaviorX()), - static_cast( - scroll_node->OverscrollBehaviorY())); -- compositor_node.snap_container_data = scroll_node->SnapContainerData(); -+ compositor_node.snap_container_data = scroll_node->GetSnapContainerData(); - - auto compositor_element_id = scroll_node->GetCompositorElementId(); - if (compositor_element_id) { -diff --git a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h -index e1479269ccc3..5bd7f65f10ba 100644 ---- a/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h -+++ b/third_party/blink/renderer/platform/graphics/paint/scroll_paint_property_node.h -@@ -99,7 +99,7 @@ class PLATFORM_EXPORT ScrollPaintPropertyNode - return state_.overscroll_behavior.y; - } - -- base::Optional SnapContainerData() const { -+ base::Optional GetSnapContainerData() const { - return state_.snap_container_data; - } - --- -2.14.3 - diff --git a/chromium-gn-bootstrap-r17.patch b/chromium-gn-bootstrap-r17.patch deleted file mode 100644 index 6cfd08d..0000000 --- a/chromium-gn-bootstrap-r17.patch +++ /dev/null @@ -1,68 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options): - - write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h', - { -+ 'ENABLE_LOCATION_SOURCE': 'false', - 'ENABLE_PROFILING': 'false', - 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false' - }) -@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options): - - write_gn_ninja(os.path.join(tempdir, 'build.ninja'), - root_gen_dir, options) -- cmd = ['ninja', '-C', tempdir] -+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err'] - if options.verbose: - cmd.append('-v') - -@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/metrics/bucket_ranges.cc', - 'base/metrics/field_trial.cc', - 'base/metrics/field_trial_param_associator.cc', -+ 'base/metrics/field_trial_params.cc', - 'base/metrics/histogram.cc', - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', -@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/task_scheduler/scheduler_lock_impl.cc', - 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc', - 'base/task_scheduler/scheduler_worker.cc', -+ 'base/task_scheduler/scheduler_worker_pool.cc', - 'base/task_scheduler/scheduler_worker_pool_impl.cc', - 'base/task_scheduler/scheduler_worker_pool_params.cc', - 'base/task_scheduler/scheduler_worker_stack.cc', -@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/third_party/icu/icu_utf.cc', - 'base/third_party/nspr/prtime.cc', - 'base/threading/post_task_and_reply_impl.cc', -+ 'base/threading/scoped_blocking_call.cc', - 'base/threading/sequence_local_storage_map.cc', - 'base/threading/sequenced_task_runner_handle.cc', - 'base/threading/sequenced_worker_pool.cc', -@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/unguessable_token.cc', - 'base/value_iterators.cc', - 'base/values.cc', -- 'base/value_iterators.cc', - 'base/vlog.cc', - ]) - -@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options): - static_libraries['base']['sources'].extend([ - 'base/memory/shared_memory_handle_posix.cc', - 'base/memory/shared_memory_posix.cc', -- 'base/memory/shared_memory_tracker.cc', - 'base/nix/xdg_util.cc', - 'base/process/internal_linux.cc', - 'base/process/memory_linux.cc', -@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options): - cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args] - check_call(cmd) - -- cmd = ['ninja', '-C', build_dir] -+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err'] - if options.verbose: - cmd.append('-v') - cmd.append('gn') diff --git a/chromium-math.h-r0.patch b/chromium-math.h-r0.patch deleted file mode 100644 index 6c7c747..0000000 --- a/chromium-math.h-r0.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9f63f94a11abc34d40ede8b8712fa15b5844a8c0 Mon Sep 17 00:00:00 2001 -From: Tom Anderson -Date: Sat, 27 Jan 2018 20:03:37 +0000 -Subject: [PATCH] Fix build with glibc 2.27 - -BUG=806340 -TBR=hamelphi@chromium.org - -Change-Id: Ib4e5091212d874d9ad88f3e9a1fdfee3ed7e0d5e -Reviewed-on: https://chromium-review.googlesource.com/890059 -Reviewed-by: Thomas Anderson -Reviewed-by: Philippe Hamel -Commit-Queue: Thomas Anderson -Cr-Commit-Position: refs/heads/master@{#532249} ---- - -diff --git a/components/assist_ranker/ranker_example_util.cc b/components/assist_ranker/ranker_example_util.cc -index 54d4dbd..ceedd8f 100644 ---- a/components/assist_ranker/ranker_example_util.cc -+++ b/components/assist_ranker/ranker_example_util.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "components/assist_ranker/ranker_example_util.h" - #include "base/bit_cast.h" - #include "base/format_macros.h" diff --git a/chromium-stdint.patch b/chromium-stdint.patch deleted file mode 100644 index 8774439..0000000 --- a/chromium-stdint.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0235c2b657d936f3cdb09053776e5929fc84704b Mon Sep 17 00:00:00 2001 -From: Tomas Popela -Date: Wed, 31 Jan 2018 18:57:07 +0000 -Subject: [PATCH] Add missing stdint include - -diff --git a/chrome/browser/vr/sample_queue.cc b/chrome/browser/vr/sample_queue.cc -index c2ca777ce90c..53cb3aab1576 100644 ---- a/chrome/browser/vr/sample_queue.cc -+++ b/chrome/browser/vr/sample_queue.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "chrome/browser/vr/sample_queue.h" - - namespace vr { --- -2.16.2 - diff --git a/chromium.spec b/chromium.spec index a741cda..0f9d7f8 100644 --- a/chromium.spec +++ b/chromium.spec @@ -174,175 +174,130 @@ License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and Open Patch0: chromium-67.0.3396.62-gcc5.patch Patch1: chromium-45.0.2454.101-linux-path-max.patch Patch2: chromium-55.0.2883.75-addrfix.patch -Patch4: chromium-72.0.3626.121-notest.patch +Patch3: chromium-72.0.3626.121-notest.patch +# Use libusb_interrupt_event_handler from current libusbx (1.0.21-0.1.git448584a) +Patch4: chromium-48.0.2564.116-libusb_interrupt_event_handler.patch +# Ignore deprecations in cups 2.2 +# https://bugs.chromium.org/p/chromium/issues/detail?id=622493 +Patch5: chromium-55.0.2883.75-cups22.patch +# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora) +Patch6: chromium-70.0.3538.67-sandbox-pie.patch +# Use /etc/chromium for master_prefs +Patch7: chromium-68.0.3440.106-master-prefs-path.patch +# Use gn system files +Patch8: chromium-67.0.3396.62-gn-system.patch +# Fix issue where timespec is not defined when sys/stat.h is included. +Patch9: chromium-53.0.2785.92-boringssl-time-fix.patch +# I wouldn't have to do this if there was a standard way to append extra compiler flags +Patch10: chromium-63.0.3289.84-nullfix.patch +# Add explicit includedir for jpeglib.h +Patch11: chromium-54.0.2840.59-jpeg-include-dir.patch +# On i686, pass --no-keep-memory --reduce-memory-overheads to ld. +Patch12: chromium-59.0.3071.86-i686-ld-memory-tricks.patch +# Revert https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8db6940240c563cf4%5E%21/#F0 +# https://bugs.chromium.org/p/chromium/issues/detail?id=712737 +# https://bugzilla.redhat.com/show_bug.cgi?id=1446851 +Patch13: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch +# Correctly compile the stdatomic.h in ffmpeg with gcc 4.8 +Patch14: chromium-64.0.3282.119-ffmpeg-stdatomic.patch +# Nacl can't die soon enough +Patch15: chromium-66.0.3359.117-system-clang.patch +# Do not prefix libpng functions +Patch16: chromium-60.0.3112.78-no-libpng-prefix.patch +# Do not mangle libjpeg +Patch17: chromium-60.0.3112.78-jpeg-nomangle.patch +# Do not mangle zlib +Patch18: chromium-75.0.3770.80-no-zlib-mangle.patch +# Fix libavutil include pathing to find arch specific timer.h +# For some reason, this only fails on aarch64. No idea why. +Patch19: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch +# from gentoo +Patch20: chromium-61.0.3163.79-gcc-no-opt-safe-math.patch +# From gentoo +Patch21: chromium-72.0.3626.121-gcc5-r3.patch +# To use round with gcc, you need to #include +Patch22: chromium-65.0.3325.146-gcc-round-fix.patch +# Include proper headers to invoke memcpy() +Patch23: chromium-65.0.3325.146-memcpy-fix.patch +# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return +Patch24: chromium-68.0.3440.106-boolfix.patch +# From Debian +Patch25: chromium-71.0.3578.98-skia-aarch64-buildfix.patch +# Missing files in tarball +Patch26: chromium-66.0.3359.117-missing-files.patch +# Do not use unrar code, it is non-free +Patch27: chromium-73.0.3683.75-norar.patch +# Upstream GCC fixes +Patch28: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch +# Add "Fedora" to the user agent string +Patch29: chromium-72.0.3626.121-fedora-user-agent.patch +# Try to fix version.py for Rawhide +Patch30: chromium-71.0.3578.98-py2-bootstrap.patch +# Fix default on redeclaration error +# https://chromium.googlesource.com/chromium/src/+/122692ccee62223f266a988c575ae687e3f4c056%5E%21/#F0 +Patch31: chromium-68.0.3440.106-fix-default-on-redeclaration.patch +# Use Gentoo's Widevine hack +# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch +Patch32: chromium-71.0.3578.98-widevine-r3.patch +# Do not require sysroot +# Forget about trying to make libc++ +# BUILD SANELY PLEASE +Patch33: chromium-69.0.3497.81-build-sanely-please.patch +# Disable fontconfig cache magic that breaks remoting +Patch34: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch +# Fix aarch64 build against latest linux kernel headers +Patch35: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch +# drop rsp clobber, which breaks gcc9 (thanks to Jeff Law) +Patch36: chromium-71.0.3578.98-gcc9-drop-rsp-clobber.patch +# Try to load widevine from other places +Patch37: chromium-widevine-other-locations.patch +# Disable -fno-delete-null-pointer-checks +Patch38: chromium-73.0.3683.75-disable-fno-delete-null-pointer-checks.patch +# Add #include to get pipewire code to build +Patch39: chromium-73.0.3683.75-pipewire-cstring-fix.patch +# gcc does not have __assume +Patch40: chromium-75.0.3770.80-gcc-no-assume.patch +# Linux 5.2 defines SIOCGSTAMP in a slightly different way, so we need to teach chromium where to find it +Patch41: chromium-75.0.3770.80-SIOCGSTAMP.patch +# https://chromium.googlesource.com/chromium/src/+/aeed4d1f15ce84a17ea0bc219e258dc4982b2368%5E%21/#F0 +Patch42: chromium-75.0.3770.80-aeed4d-gcc-dcheck_ne-fix.patch +# Revert https://chromium.googlesource.com/chromium/src/+/daff6b66faae53a0cefb88987c9ff4843629b728%5E%21/#F0 +# It might make clang happy but it breaks gcc. F*** clang. +Patch43: chromium-75.0.3770.80-revert-daff6b.patch +# Avoid pure virtual crash destroying RenderProcessUserData +# https://chromium.googlesource.com/chromium/src/+/cdf306db81efaaaa954487585d5a5a16205a5ebd%5E%21/ +Patch44: chromium-75.0.3770.80-pure-virtual-crash-fix.patch +# rename function to avoid conflict with rawhide glibc "gettid()" +Patch45: chromium-75.0.3770.80-grpc-gettid-fix.patch +# fix v8 compile with gcc +# https://chromium.googlesource.com/v8/v8/+/3b8c624bda58d05aea80dd9626cd550537d6ac3f%5E%21/#F1 +Patch46: chromium-75.0.3770.100-fix-v8-gcc.patch +# https://chromium.googlesource.com/chromium/src/+/00281713519dbd84b90d2996a009bf3a7e294435%5E%21/#F0 +Patch47: chromium-75.0.3770.100-git00281713.patch + +# Apply these changes to work around EPEL7 compiler issues +Patch100: chromium-62.0.3202.62-kmaxskip-constexpr.patch +# Use lstdc++ on EPEL7 only +Patch101: chromium-75.0.3770.100-epel7-stdc++.patch +# el7 only patch +Patch102: chromium-75.0.3770.100-el7-fix-noexcept.patch + # In file included from ../linux/directory.c:21: # In file included from ../../../../native_client/src/nonsfi/linux/abi_conversion.h:20: # ../../../../native_client/src/nonsfi/linux/linux_syscall_structs.h:44:13: error: GNU-style inline assembly is disabled # __asm__ __volatile__("mov %%gs, %0" : "=r"(gs)); # ^ # 1 error generated. -Patch6: chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch +Patch200: chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch # Ignore broken nacl open fd counter -Patch7: chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch -# Use libusb_interrupt_event_handler from current libusbx (1.0.21-0.1.git448584a) -Patch9: chromium-48.0.2564.116-libusb_interrupt_event_handler.patch -# Ignore deprecations in cups 2.2 -# https://bugs.chromium.org/p/chromium/issues/detail?id=622493 -Patch12: chromium-55.0.2883.75-cups22.patch -# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora) -Patch15: chromium-70.0.3538.67-sandbox-pie.patch -# Use /etc/chromium for master_prefs -Patch18: chromium-68.0.3440.106-master-prefs-path.patch -# Disable MADV_FREE (if set by glibc) -# https://bugzilla.redhat.com/show_bug.cgi?id=1361157 -Patch19: chromium-52.0.2743.116-unset-madv_free.patch -# Use gn system files -Patch20: chromium-67.0.3396.62-gn-system.patch -# Fix last commit position issue -# https://groups.google.com/a/chromium.org/forum/#!topic/gn-dev/7nlJv486bD4 -# Patch21: chromium-60.0.3112.78-last-commit-position.patch -# Fix issue where timespec is not defined when sys/stat.h is included. -Patch22: chromium-53.0.2785.92-boringssl-time-fix.patch -# I wouldn't have to do this if there was a standard way to append extra compiler flags -Patch24: chromium-63.0.3289.84-nullfix.patch -# Add explicit includedir for jpeglib.h -Patch25: chromium-54.0.2840.59-jpeg-include-dir.patch -# On i686, pass --no-keep-memory --reduce-memory-overheads to ld. -Patch26: chromium-59.0.3071.86-i686-ld-memory-tricks.patch -# obj/content/renderer/renderer/child_frame_compositing_helper.o: In function `content::ChildFrameCompositingHelper::OnSetSurface(cc::SurfaceId const&, gfx::Size const&, float, cc::SurfaceSequence const&)': -# /builddir/build/BUILD/chromium-54.0.2840.90/out/Release/../../content/renderer/child_frame_compositing_helper.cc:214: undefined reference to `cc_blink::WebLayerImpl::setOpaque(bool)' -# Patch27: chromium-63.0.3289.84-setopaque.patch -# Use -fpermissive to build WebKit -# Patch31: chromium-56.0.2924.87-fpermissive.patch -# Fix issue with compilation on gcc7 -# Thanks to Ben Noordhuis -# Patch33: chromium-65.0.3325.146-gcc7.patch -# Revert https://chromium.googlesource.com/chromium/src/+/b794998819088f76b4cf44c8db6940240c563cf4%5E%21/#F0 -# https://bugs.chromium.org/p/chromium/issues/detail?id=712737 -# https://bugzilla.redhat.com/show_bug.cgi?id=1446851 -Patch36: chromium-58.0.3029.96-revert-b794998819088f76b4cf44c8db6940240c563cf4.patch -# Correctly compile the stdatomic.h in ffmpeg with gcc 4.8 -Patch37: chromium-64.0.3282.119-ffmpeg-stdatomic.patch -# Nacl can't die soon enough -Patch39: chromium-66.0.3359.117-system-clang.patch -# Do not prefix libpng functions -Patch42: chromium-60.0.3112.78-no-libpng-prefix.patch -# Do not mangle libjpeg -Patch43: chromium-60.0.3112.78-jpeg-nomangle.patch -# Do not mangle zlib -Patch45: chromium-75.0.3770.80-no-zlib-mangle.patch -# Apply these changes to work around EPEL7 compiler issues -Patch46: chromium-62.0.3202.62-kmaxskip-constexpr.patch -Patch47: chromium-60.0.3112.90-vulkan-force-c99.patch -# Fix libavutil include pathing to find arch specific timer.h -# For some reason, this only fails on aarch64. No idea why. -Patch50: chromium-60.0.3112.113-libavutil-timer-include-path-fix.patch -# from gentoo -Patch53: chromium-61.0.3163.79-gcc-no-opt-safe-math.patch -# Only needed when glibc 2.26.90 or later is used -Patch57: chromium-63.0.3289.84-aarch64-glibc-2.26.90.patch -# From gentoo -Patch62: chromium-72.0.3626.121-gcc5-r3.patch -# Do not try to use libc++ in the remoting stack -# Patch63: chromium-63.0.3289.84-nolibc++.patch -# To use round with gcc, you need to #include -Patch65: chromium-65.0.3325.146-gcc-round-fix.patch -# Include proper headers to invoke memcpy() -Patch67: chromium-65.0.3325.146-memcpy-fix.patch -# ../../mojo/public/cpp/bindings/associated_interface_ptr_info.h:48:43: error: cannot convert 'const mojo::ScopedInterfaceEndpointHandle' to 'bool' in return -Patch85: chromium-68.0.3440.106-boolfix.patch -# From Debian -Patch86: chromium-71.0.3578.98-skia-aarch64-buildfix.patch -# Use lstdc++ on EPEL7 only -Patch87: chromium-75.0.3770.100-epel7-stdc++.patch -# Missing files in tarball -Patch88: chromium-66.0.3359.117-missing-files.patch -# https://chromium.googlesource.com/chromium/src/+/ba4141e451f4e0b1b19410b1b503bd32e150df06%5E%21/#F0 -# Patch89: chromium-66.0.3359.117-gcc-optional-move-fixes.patch -# https://chromium.googlesource.com/chromium/src/+/4f2b52281ce1649ea8347489443965ad33262ecc%5E%21 -# Patch90: chromium-66.0.3359.117-gcc-copy-constructor-fix.patch -# https://bugs.chromium.org/p/chromium/issues/detail?id=816952 -# Patch91: chromium-66.0.3359.117-gcc-vector-copy-constructor-fix.patch -# Do not use unrar code, it is non-free -Patch92: chromium-73.0.3683.75-norar.patch -# Upstream GCC fixes -Patch93: chromium-66.0.3359.117-GCC-build-fix-base-Optional-T-requires-the-full-decl.patch -Patch94: chromium-66.0.3359.117-GCC-fully-declare-ConfigurationPolicyProvider.patch -# Patch95: chromium-65.0.3325.146-GCC-IDB-methods-String-renamed-to-GetString.patch -# https://github.com/archlinuxarm/PKGBUILDs/blob/master/extra/chromium/0006-GCC-do-not-use-initializer-list-for-NoDestructor-of-.patch -# Patch96: chromium-66.0.3359.117-GCC-do-not-use-initializer-list-for-NoDestructor-of-.patch -# https://chromium.googlesource.com/chromium/src/+/b84682f31dc99b9c90f5a04947075815697c68d9%5E%21/#F0 -# Patch97: chromium-66.0.3359.139-arm-init-fix.patch -# GCC8 has changed the alignof operator to return the minimal alignment required by the target ABI -# instead of the preferred alignment. This means int64_t is now 4 on i686 (instead of 8). -# Use __alignof__ to get the value we expect (and chromium checks for). -# Patch98: chromium-69.0.3497.81-gcc8-alignof.patch -# RHEL 7 has a bug in its python2.7 which does not propely handle exec with a tuple -# https://bugs.python.org/issue21591 -Patch100: chromium-67.0.3396.62-epel7-use-old-python-exec-syntax.patch -# Add "Fedora" to the user agent string -Patch101: chromium-72.0.3626.121-fedora-user-agent.patch -# Try to fix version.py for Rawhide -Patch103: chromium-71.0.3578.98-py2-bootstrap.patch -# Fix default on redeclaration error -# https://chromium.googlesource.com/chromium/src/+/122692ccee62223f266a988c575ae687e3f4c056%5E%21/#F0 -Patch110: chromium-68.0.3440.106-fix-default-on-redeclaration.patch -# Use Gentoo's Widevine hack -# https://gitweb.gentoo.org/repo/gentoo.git/tree/www-client/chromium/files/chromium-widevine-r3.patch -Patch111: chromium-71.0.3578.98-widevine-r3.patch -# Do not require sysroot -# Forget about trying to make libc++ -# BUILD SANELY PLEASE -Patch112: chromium-69.0.3497.81-build-sanely-please.patch -# Still moar GCC cleanups from upstream -# Patch113: chromium-gcc8-r588316.patch -# Patch114: chromium-gcc8-r588547.patch -# Patch115: chromium-gcc8-r589614.patch -# Patch116: chromium-gcc8-r591015.patch -# Disable fontconfig cache magic that breaks remoting -Patch117: chromium-70.0.3538.67-disable-fontconfig-cache-magic.patch -# Fix aarch64 build against latest linux kernel headers -Patch119: chromium-70.0.3538.77-aarch64-arch-want-new-stat.patch +Patch201: chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch + # Enable VAAPI support on Linux # NOTE: This patch will never land upstream -Patch121: enable-vaapi.patch -Patch122: chromium-75.0.3770.80-vaapi-i686-fpermissive.patch +Patch202: enable-vaapi.patch +Patch203: chromium-75.0.3770.80-vaapi-i686-fpermissive.patch # Fix compatibility with VA-API library (libva) version 1 -Patch124: chromium-75.0.3770.80-vaapi-libva1-compatibility.patch -# drop rsp clobber, which breaks gcc9 (thanks to Jeff Law) -Patch126: chromium-71.0.3578.98-gcc9-drop-rsp-clobber.patch -# Thanks Ubuntu -# Disable these two patches when v75 lands -Patch130: revert-gn-4980.patch -Patch131: revert-gn-4960.patch -# Try to load widevine from other places -Patch132: chromium-widevine-other-locations.patch -# Disable -fno-delete-null-pointer-checks -Patch135: chromium-73.0.3683.75-disable-fno-delete-null-pointer-checks.patch -# Add #include to get pipewire code to build -Patch136: chromium-73.0.3683.75-pipewire-cstring-fix.patch -# el7 only patch -Patch139: chromium-75.0.3770.100-el7-fix-noexcept.patch -# gcc does not have __assume -Patch140: chromium-75.0.3770.80-gcc-no-assume.patch -# Linux 5.2 defines SIOCGSTAMP in a slightly different way, so we need to teach chromium where to find it -Patch141: chromium-75.0.3770.80-SIOCGSTAMP.patch -# https://chromium.googlesource.com/chromium/src/+/aeed4d1f15ce84a17ea0bc219e258dc4982b2368%5E%21/#F0 -Patch142: chromium-75.0.3770.80-aeed4d-gcc-dcheck_ne-fix.patch -# Revert https://chromium.googlesource.com/chromium/src/+/daff6b66faae53a0cefb88987c9ff4843629b728%5E%21/#F0 -# It might make clang happy but it breaks gcc. F*** clang. -Patch143: chromium-75.0.3770.80-revert-daff6b.patch -# Avoid pure virtual crash destroying RenderProcessUserData -# https://chromium.googlesource.com/chromium/src/+/cdf306db81efaaaa954487585d5a5a16205a5ebd%5E%21/ -Patch144: chromium-75.0.3770.80-pure-virtual-crash-fix.patch -# rename function to avoid conflict with rawhide glibc "gettid()" -Patch145: chromium-75.0.3770.80-grpc-gettid-fix.patch -# fix v8 compile with gcc -# https://chromium.googlesource.com/v8/v8/+/3b8c624bda58d05aea80dd9626cd550537d6ac3f%5E%21/#F1 -Patch146: chromium-75.0.3770.100-fix-v8-gcc.patch -# https://chromium.googlesource.com/chromium/src/+/00281713519dbd84b90d2996a009bf3a7e294435%5E%21/#F0 -Patch147: chromium-75.0.3770.100-git00281713.patch - +Patch204: chromium-75.0.3770.80-vaapi-libva1-compatibility.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -837,97 +792,73 @@ udev. %patch0 -p1 -b .gcc5 %patch1 -p1 -b .pathmax %patch2 -p1 -b .addrfix -%patch4 -p1 -b .notest -# %%patch6 -p1 -b .gnu-inline -%patch7 -p1 -b .ignore-fd-count -%patch9 -p1 -b .modern-libusbx -%patch12 -p1 -b .cups22 -%patch15 -p1 -b .sandboxpie -%patch18 -p1 -b .etc -# %%patch19 -p1 -b .madv_free -%patch20 -p1 -b .gnsystem -# %%patch21 -p1 -b .lastcommit -%patch22 -p1 -b .timefix -%patch24 -p1 -b .nullfix -%patch25 -p1 -b .jpegfix -%patch26 -p1 -b .ldmemory -# %%patch27 -p1 -b .setopaque -# %%patch31 -p1 -b .permissive -# %%patch33 -p1 -b .gcc7 -%patch36 -p1 -b .revert -%patch37 -p1 -b .ffmpeg-stdatomic -%patch39 -p1 -b .system-clang -%patch42 -p1 -b .noprefix -%patch43 -p1 -b .nomangle -%patch45 -p1 -b .nozmangle +%patch3 -p1 -b .notest +%patch4 -p1 -b .modern-libusbx +%patch5 -p1 -b .cups22 +%patch6 -p1 -b .sandboxpie +%patch7 -p1 -b .etc +%patch8 -p1 -b .gnsystem +%patch9 -p1 -b .timefix +%patch10 -p1 -b .nullfix +%patch11 -p1 -b .jpegfix +%patch12 -p1 -b .ldmemory +%patch13 -p1 -b .revert +%patch14 -p1 -b .ffmpeg-stdatomic +%patch15 -p1 -b .system-clang +%patch16 -p1 -b .noprefix +%patch17 -p1 -b .nomangle +%patch18 -p1 -b .nozmangle +%patch19 -p1 -b .pathfix +%patch20 -p1 -b .nogccoptmath +%patch21 -p1 -b .gcc5-r3 +%patch22 -p1 -b .gcc-round-fix +%patch23 -p1 -b .memcpyfix +%patch24 -p1 -b .boolfix +%patch25 -p1 -b .aarch64fix +%patch26 -p1 -b .missing-files +%patch27 -p1 -b .nounrar +%patch28 -p1 -b .gcc-cpolicyprovider +%patch29 -p1 -b .fedora-user-agent +%patch30 -p1 -b .py2 +%patch31 -p1 -b .fix-default-redeclaration +%patch32 -p1 -b .wvhack +%patch33 -p1 -b .sanebuild +%patch34 -p1 -b .nofc +%patch35 -p1 -b .aarch64-new-stat +%patch36 -p1 -b .gcc9 +%patch37 -p1 -b .widevine-other-locations +%patch38 -p1 -b .disable-ndnpc +%patch39 -p1 -b .cstring-fix +%patch40 -p1 -b .gcc-assume +%patch41 -p1 -b .SIOCGSTAMP +%patch42 -p1 -b .gcc-dcheck_ne-fix +%patch43 -p1 -b .revert-daff6b +%patch44 -p1 -b .pure-virtual-fix +%patch45 -p1 -b .gettid-fix +%patch46 -p1 -b .fix-v8-gcc +%patch47 -p1 -b .git00281713 + +# EPEL specific patches %if 0%{?rhel} == 7 -%patch46 -p1 -b .kmaxskip -# %%patch47 -p1 -b .c99 +%patch100 -p1 -b .kmaxskip +%patch101 -p1 -b .epel7 +%patch102 -p1 -b .el7-noexcept %endif -%patch50 -p1 -b .pathfix -%patch53 -p1 -b .nogccoptmath -# %%if 0%%{?fedora} >= 28 -# %%patch57 -p1 -b .aarch64glibc -# %%endif -%patch62 -p1 -b .gcc5-r3 -# %%patch63 -p1 -b .nolibc++ -%patch65 -p1 -b .gcc-round-fix -%patch67 -p1 -b .memcpyfix -%patch85 -p1 -b .boolfix -%patch86 -p1 -b .aarch64fix -%if 0%{?rhel} == 7 -%patch87 -p1 -b .epel7 + +# Feature specific patches +%if ! 0%{?killnacl} +%patch200 -p1 -b .gnu-inline +%patch201 -p1 -b .ignore-fd-count %endif -%patch88 -p1 -b .missing -# %%patch89 -p1 -b .gccomove -# %%patch90 -p1 -b .copycon -# %%patch91 -p1 -b .944404 -%patch92 -p1 -b .nounrar -# %%patch93 -p1 -b .gcc-full-decl -%patch94 -p1 -b .gcc-cpolicyprovider -# %%patch95 -p1 -b .gcc-getstring -# %%patch96 -p1 -b .flatsetfix -# %%patch97 -p1 -b .arm-init-fix -# %%patch98 -p1 -b .gcc8-alignof -%if 0%{?rhel} == 7 -# %%patch100 -p1 -b .oldexec -%endif -%patch101 -p1 -b .fedora-user-agent -%patch103 -p1 -b .py2 -# %%patch108 -p1 -b .move-unique-ptr -%patch110 -p1 -b .fix-default-redeclaration -%patch111 -p1 -b .wvhack -%patch112 -p1 -b .sanebuild -# %%patch113 -p1 -b .r588316 -# %%patch114 -p1 -b .r588547 -# %%patch115 -p1 -b .r589614 -# %%patch116 -p1 -b .r591015 -%patch117 -p1 -b .nofc -%patch119 -p1 -b .aarch64-new-stat + %if %{use_vaapi} -%patch121 -p1 -b .vaapi -%endif +%patch202 -p1 -b .vaapi %ifarch i686 -%patch122 -p1 -b .i686permissive +%patch203 -p1 -b .i686permissive +%patch204 -p1 -b .va1compat %endif -%patch124 -p1 -b .va1compat -%patch126 -p1 -b .gcc9 -# %%patch130 -p1 -b .revert-gn-4980 -# %%patch131 -p1 -b .revert-gn-4960 -%patch132 -p1 -b .widevine-other-locations -%patch135 -p1 -b .disable-ndnpc -%patch136 -p1 -b .cstring-fix -%if 0%{?rhel} == 7 -%patch139 -p1 -b .el7-noexcept %endif -%patch140 -p1 -b .gcc-assume -%patch141 -p1 -b .SIOCGSTAMP -%patch142 -p1 -b .gcc-dcheck_ne-fix -%patch143 -p1 -b .revert-daff6b -%patch144 -p1 -b .pure-virtual-fix -%patch145 -p1 -b .gettid-fix -%patch146 -p1 -b .fix-v8-gcc -%patch147 -p1 -b .git00281713 + # Change shebang in all relevant files in this directory and all subdirectories # See `man find` for how the `-exec command {} +` syntax works diff --git a/relax-libva-version.patch b/relax-libva-version.patch deleted file mode 100644 index e297fd6..0000000 --- a/relax-libva-version.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 6f1309ef8fe10965e4d0018b4f1b80ac6deccdaa Mon Sep 17 00:00:00 2001 -From: Azhar Shaikh -Date: Fri, 30 Nov 2018 23:11:57 +0000 -Subject: [PATCH] media/gpu/vaapi: Relax the version check for VA-API - -Since the newer versions of VA-API are ABI compatible, relax the -version checks for VA-API, by using VA_CHECK_VERSION(). -This will help in updating the libva to the latest releases, -while still supporting the old versions, till the new version of -libva is merged and picked by the builds. Thus ensuring that -hardware accleration is not broken while updating the libva. - -Bug: 905814 -TEST=libva-2.3.0 and libva-2.1.0 are able to do hardware acceleration. - -Suggested-by: Alexandre Courbot -Signed-off-by: Azhar Shaikh -Change-Id: I510549f72290d20676927eeeeb89a87199c062af -Reviewed-on: https://chromium-review.googlesource.com/c/1352519 -Reviewed-by: Alexandre Courbot -Reviewed-by: Hirokazu Honda -Commit-Queue: Miguel Casas -Cr-Commit-Position: refs/heads/master@{#612832} ---- - -diff --git a/AUTHORS b/AUTHORS -index 567fe15..ff42fc5 100644 ---- a/AUTHORS -+++ b/AUTHORS -@@ -103,6 +103,7 @@ - Attila Dusnoki - Avinaash Doreswamy - Ayush Khandelwal -+Azhar Shaikh - Balazs Kelemen - Baul Eun - Behara Mani Shyam Patro -diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc -index b415642..053384d 100644 ---- a/media/gpu/vaapi/vaapi_wrapper.cc -+++ b/media/gpu/vaapi/vaapi_wrapper.cc -@@ -333,7 +333,13 @@ - DVLOG(1) << "VAAPI version: " << major_version << "." << minor_version << " " - << va_vendor_string_; - -- if (major_version != VA_MAJOR_VERSION || minor_version != VA_MINOR_VERSION) { -+ // The VAAPI version is determined from what is loaded on the system by -+ // calling vaInitialize(). We want a runtime evaluation of libva version, -+ // of what is loaded on the system, with, what browser is compiled with. -+ // Also since the libva is now ABI-compatible, relax the version check -+ // which helps in upgrading the libva, without breaking any existing -+ // functionality. -+ if (!VA_CHECK_VERSION(major_version, minor_version, 0)) { - LOG(ERROR) << "This build of Chromium requires VA-API version " - << VA_MAJOR_VERSION << "." << VA_MINOR_VERSION - << ", system version: " << major_version << "." << minor_version; diff --git a/revert-gn-4960.patch b/revert-gn-4960.patch deleted file mode 100644 index bb51ada..0000000 --- a/revert-gn-4960.patch +++ /dev/null @@ -1,655 +0,0 @@ -Description: revert https://gn.googlesource.com/gn/+/0d038c2e0a32a528713d3dfaf1f1e0cdfe87fd46, which breaks the chromium build - ---- a/tools/gn/build/gen.py -+++ b/tools/gn/build/gen.py -@@ -522,6 +522,7 @@ def WriteGNNinja(path, platform, host, o - 'tools/gn/setup.cc', - 'tools/gn/source_dir.cc', - 'tools/gn/source_file.cc', -+ 'tools/gn/source_file_type.cc', - 'tools/gn/standard_out.cc', - 'tools/gn/string_utils.cc', - 'tools/gn/substitution_list.cc', ---- a/tools/gn/tools/gn/c_tool.h -+++ b/tools/gn/tools/gn/c_tool.h -@@ -12,6 +12,7 @@ - #include "tools/gn/label.h" - #include "tools/gn/label_ptr.h" - #include "tools/gn/scope.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_list.h" - #include "tools/gn/substitution_pattern.h" - #include "tools/gn/tool.h" ---- a/tools/gn/tools/gn/compile_commands_writer.cc -+++ b/tools/gn/tools/gn/compile_commands_writer.cc -@@ -122,7 +122,7 @@ void WriteCommand(const Target* target, - const CompileFlags& flags, - std::vector& tool_outputs, - PathOutput& path_output, -- SourceFile::Type source_type, -+ SourceFileType source_type, - const char* tool_name, - EscapeOptions opts, - std::string* compile_commands) { -@@ -144,16 +144,16 @@ void WriteCommand(const Target* target, - } else if (range.type == &CSubstitutionCFlags) { - command_out << flags.cflags; - } else if (range.type == &CSubstitutionCFlagsC) { -- if (source_type == SourceFile::SOURCE_C) -+ if (source_type == SOURCE_C) - command_out << flags.cflags_c; - } else if (range.type == &CSubstitutionCFlagsCc) { -- if (source_type == SourceFile::SOURCE_CPP) -+ if (source_type == SOURCE_CPP) - command_out << flags.cflags_cc; - } else if (range.type == &CSubstitutionCFlagsObjC) { -- if (source_type == SourceFile::SOURCE_M) -+ if (source_type == SOURCE_M) - command_out << flags.cflags_objc; - } else if (range.type == &CSubstitutionCFlagsObjCc) { -- if (source_type == SourceFile::SOURCE_MM) -+ if (source_type == SOURCE_MM) - command_out << flags.cflags_objcc; - } else if (range.type == &SubstitutionLabel || - range.type == &SubstitutionLabelName || -@@ -222,11 +222,9 @@ void CompileCommandsWriter::RenderJSON(c - for (const auto& source : target->sources()) { - // If this source is not a C/C++/ObjC/ObjC++ source (not header) file, - // continue as it does not belong in the compilation database. -- SourceFile::Type source_type = source.type(); -- if (source_type != SourceFile::SOURCE_CPP && -- source_type != SourceFile::SOURCE_C && -- source_type != SourceFile::SOURCE_M && -- source_type != SourceFile::SOURCE_MM) -+ SourceFileType source_type = GetSourceFileType(source); -+ if (source_type != SOURCE_CPP && source_type != SOURCE_C && -+ source_type != SOURCE_M && source_type != SOURCE_MM) - continue; - - const char* tool_name = Tool::kToolNone; -@@ -324,4 +322,4 @@ void CompileCommandsWriter::VisitDeps(co - VisitDeps(pair.ptr, visited); - } - } --} -+} -\ No newline at end of file ---- a/tools/gn/tools/gn/general_tool.h -+++ b/tools/gn/tools/gn/general_tool.h -@@ -11,6 +11,7 @@ - #include "base/macros.h" - #include "tools/gn/label.h" - #include "tools/gn/label_ptr.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_list.h" - #include "tools/gn/substitution_pattern.h" - #include "tools/gn/tool.h" ---- a/tools/gn/tools/gn/header_checker.cc -+++ b/tools/gn/tools/gn/header_checker.cc -@@ -18,6 +18,7 @@ - #include "tools/gn/err.h" - #include "tools/gn/filesystem_utils.h" - #include "tools/gn/scheduler.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/target.h" - #include "tools/gn/trace.h" - #include "util/worker_pool.h" -@@ -151,10 +152,9 @@ void HeaderChecker::RunCheckOverFiles(co - - for (const auto& file : files) { - // Only check C-like source files (RC files also have includes). -- SourceFile::Type type = file.first.type(); -- if (type != SourceFile::SOURCE_CPP && type != SourceFile::SOURCE_H && -- type != SourceFile::SOURCE_C && type != SourceFile::SOURCE_M && -- type != SourceFile::SOURCE_MM && type != SourceFile::SOURCE_RC) -+ SourceFileType type = GetSourceFileType(file.first); -+ if (type != SOURCE_CPP && type != SOURCE_H && type != SOURCE_C && -+ type != SOURCE_M && type != SOURCE_MM && type != SOURCE_RC) - continue; - - if (!check_generated_) { ---- a/tools/gn/tools/gn/ninja_binary_target_writer.cc -+++ b/tools/gn/tools/gn/ninja_binary_target_writer.cc -@@ -23,23 +23,22 @@ - #include "tools/gn/ninja_utils.h" - #include "tools/gn/scheduler.h" - #include "tools/gn/settings.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/string_utils.h" - #include "tools/gn/substitution_writer.h" - #include "tools/gn/target.h" - - bool NinjaBinaryTargetWriter::SourceFileTypeSet::CSourceUsed() { -- return Get(SourceFile::SOURCE_CPP) || Get(SourceFile::SOURCE_H) || -- Get(SourceFile::SOURCE_C) || Get(SourceFile::SOURCE_M) || -- Get(SourceFile::SOURCE_MM) || Get(SourceFile::SOURCE_RC) || -- Get(SourceFile::SOURCE_S); -+ return Get(SOURCE_CPP) || Get(SOURCE_H) || Get(SOURCE_C) || Get(SOURCE_M) || -+ Get(SOURCE_MM) || Get(SOURCE_RC) || Get(SOURCE_S); - } - - bool NinjaBinaryTargetWriter::SourceFileTypeSet::RustSourceUsed() { -- return Get(SourceFile::SOURCE_RS); -+ return Get(SOURCE_RS); - } - - bool NinjaBinaryTargetWriter::SourceFileTypeSet::GoSourceUsed() { -- return Get(SourceFile::SOURCE_GO); -+ return Get(SOURCE_GO); - } - - NinjaBinaryTargetWriter::NinjaBinaryTargetWriter(const Target* target, -@@ -50,6 +49,10 @@ NinjaBinaryTargetWriter::NinjaBinaryTarg - NinjaBinaryTargetWriter::~NinjaBinaryTargetWriter() = default; - - void NinjaBinaryTargetWriter::Run() { -+ SourceFileTypeSet used_types; -+ for (const auto& source : target_->sources()) -+ used_types.Set(GetSourceFileType(source)); -+ - NinjaCBinaryTargetWriter writer(target_, out_); - writer.Run(); - } ---- a/tools/gn/tools/gn/ninja_binary_target_writer.h -+++ b/tools/gn/tools/gn/ninja_binary_target_writer.h -@@ -23,12 +23,11 @@ class NinjaBinaryTargetWriter : public N - class SourceFileTypeSet { - public: - SourceFileTypeSet() { -- memset(flags_, 0, -- sizeof(bool) * static_cast(SourceFile::SOURCE_NUMTYPES)); -+ memset(flags_, 0, sizeof(bool) * static_cast(SOURCE_NUMTYPES)); - } - -- void Set(SourceFile::Type type) { flags_[static_cast(type)] = true; } -- bool Get(SourceFile::Type type) const { -+ void Set(SourceFileType type) { flags_[static_cast(type)] = true; } -+ bool Get(SourceFileType type) const { - return flags_[static_cast(type)]; - } - -@@ -37,7 +36,7 @@ class NinjaBinaryTargetWriter : public N - bool GoSourceUsed(); - - private: -- bool flags_[static_cast(SourceFile::SOURCE_NUMTYPES)]; -+ bool flags_[static_cast(SOURCE_NUMTYPES)]; - }; - - NinjaBinaryTargetWriter(const Target* target, std::ostream& out); ---- a/tools/gn/tools/gn/ninja_c_binary_target_writer.cc -+++ b/tools/gn/tools/gn/ninja_c_binary_target_writer.cc -@@ -24,6 +24,7 @@ - #include "tools/gn/ninja_utils.h" - #include "tools/gn/scheduler.h" - #include "tools/gn/settings.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/string_utils.h" - #include "tools/gn/substitution_writer.h" - #include "tools/gn/target.h" -@@ -66,27 +67,27 @@ void AddSourceSetObjectFiles(const Targe - if (source_set->GetOutputFilesForSource(source, &tool_name, &tool_outputs)) - obj_files->push_back(tool_outputs[0]); - -- used_types.Set(source.type()); -+ used_types.Set(GetSourceFileType(source)); - } - - // Add MSVC precompiled header object files. GCC .gch files are not object - // files so they are omitted. - if (source_set->config_values().has_precompiled_headers()) { -- if (used_types.Get(SourceFile::SOURCE_C)) { -+ if (used_types.Get(SOURCE_C)) { - const CTool* tool = source_set->toolchain()->GetToolAsC(CTool::kCToolCc); - if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) { - GetPCHOutputFiles(source_set, CTool::kCToolCc, &tool_outputs); - obj_files->Append(tool_outputs.begin(), tool_outputs.end()); - } - } -- if (used_types.Get(SourceFile::SOURCE_CPP)) { -+ if (used_types.Get(SOURCE_CPP)) { - const CTool* tool = source_set->toolchain()->GetToolAsC(CTool::kCToolCxx); - if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) { - GetPCHOutputFiles(source_set, CTool::kCToolCxx, &tool_outputs); - obj_files->Append(tool_outputs.begin(), tool_outputs.end()); - } - } -- if (used_types.Get(SourceFile::SOURCE_M)) { -+ if (used_types.Get(SOURCE_M)) { - const CTool* tool = - source_set->toolchain()->GetToolAsC(CTool::kCToolObjC); - if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) { -@@ -94,7 +95,7 @@ void AddSourceSetObjectFiles(const Targe - obj_files->Append(tool_outputs.begin(), tool_outputs.end()); - } - } -- if (used_types.Get(SourceFile::SOURCE_MM)) { -+ if (used_types.Get(SOURCE_MM)) { - const CTool* tool = - source_set->toolchain()->GetToolAsC(CTool::kCToolObjCxx); - if (tool && tool->precompiled_header_type() == CTool::PCH_MSVC) { -@@ -118,7 +119,7 @@ void NinjaCBinaryTargetWriter::Run() { - // Figure out what source types are needed. - SourceFileTypeSet used_types; - for (const auto& source : target_->sources()) -- used_types.Set(source.type()); -+ used_types.Set(GetSourceFileType(source)); - - WriteCompilerVars(used_types); - -@@ -234,34 +235,31 @@ void NinjaCBinaryTargetWriter::WriteComp - target_->config_values().has_precompiled_headers(); - - EscapeOptions opts = GetFlagOptions(); -- if (used_types.Get(SourceFile::SOURCE_S) || -- used_types.Get(SourceFile::SOURCE_ASM)) { -+ if (used_types.Get(SOURCE_S) || used_types.Get(SOURCE_ASM)) { - WriteOneFlag(target_, &CSubstitutionAsmFlags, false, Tool::kToolNone, - &ConfigValues::asmflags, opts, path_output_, out_); - } -- if (used_types.Get(SourceFile::SOURCE_C) || -- used_types.Get(SourceFile::SOURCE_CPP) || -- used_types.Get(SourceFile::SOURCE_M) || -- used_types.Get(SourceFile::SOURCE_MM)) { -+ if (used_types.Get(SOURCE_C) || used_types.Get(SOURCE_CPP) || -+ used_types.Get(SOURCE_M) || used_types.Get(SOURCE_MM)) { - WriteOneFlag(target_, &CSubstitutionCFlags, false, Tool::kToolNone, - &ConfigValues::cflags, opts, path_output_, out_); - } -- if (used_types.Get(SourceFile::SOURCE_C)) { -+ if (used_types.Get(SOURCE_C)) { - WriteOneFlag(target_, &CSubstitutionCFlagsC, has_precompiled_headers, - CTool::kCToolCc, &ConfigValues::cflags_c, opts, path_output_, - out_); - } -- if (used_types.Get(SourceFile::SOURCE_CPP)) { -+ if (used_types.Get(SOURCE_CPP)) { - WriteOneFlag(target_, &CSubstitutionCFlagsCc, has_precompiled_headers, - CTool::kCToolCxx, &ConfigValues::cflags_cc, opts, path_output_, - out_); - } -- if (used_types.Get(SourceFile::SOURCE_M)) { -+ if (used_types.Get(SOURCE_M)) { - WriteOneFlag(target_, &CSubstitutionCFlagsObjC, has_precompiled_headers, - CTool::kCToolObjC, &ConfigValues::cflags_objc, opts, - path_output_, out_); - } -- if (used_types.Get(SourceFile::SOURCE_MM)) { -+ if (used_types.Get(SOURCE_MM)) { - WriteOneFlag(target_, &CSubstitutionCFlagsObjCc, has_precompiled_headers, - CTool::kCToolObjCxx, &ConfigValues::cflags_objcc, opts, - path_output_, out_); -@@ -321,14 +319,14 @@ void NinjaCBinaryTargetWriter::WritePCHC - - const CTool* tool_c = target_->toolchain()->GetToolAsC(CTool::kCToolCc); - if (tool_c && tool_c->precompiled_header_type() != CTool::PCH_NONE && -- used_types.Get(SourceFile::SOURCE_C)) { -+ used_types.Get(SOURCE_C)) { - WritePCHCommand(&CSubstitutionCFlagsC, CTool::kCToolCc, - tool_c->precompiled_header_type(), input_dep, - order_only_deps, object_files, other_files); - } - const CTool* tool_cxx = target_->toolchain()->GetToolAsC(CTool::kCToolCxx); - if (tool_cxx && tool_cxx->precompiled_header_type() != CTool::PCH_NONE && -- used_types.Get(SourceFile::SOURCE_CPP)) { -+ used_types.Get(SOURCE_CPP)) { - WritePCHCommand(&CSubstitutionCFlagsCc, CTool::kCToolCxx, - tool_cxx->precompiled_header_type(), input_dep, - order_only_deps, object_files, other_files); -@@ -336,7 +334,7 @@ void NinjaCBinaryTargetWriter::WritePCHC - - const CTool* tool_objc = target_->toolchain()->GetToolAsC(CTool::kCToolObjC); - if (tool_objc && tool_objc->precompiled_header_type() == CTool::PCH_GCC && -- used_types.Get(SourceFile::SOURCE_M)) { -+ used_types.Get(SOURCE_M)) { - WritePCHCommand(&CSubstitutionCFlagsObjC, CTool::kCToolObjC, - tool_objc->precompiled_header_type(), input_dep, - order_only_deps, object_files, other_files); -@@ -345,7 +343,7 @@ void NinjaCBinaryTargetWriter::WritePCHC - const CTool* tool_objcxx = - target_->toolchain()->GetToolAsC(CTool::kCToolObjCxx); - if (tool_objcxx && tool_objcxx->precompiled_header_type() == CTool::PCH_GCC && -- used_types.Get(SourceFile::SOURCE_MM)) { -+ used_types.Get(SOURCE_MM)) { - WritePCHCommand(&CSubstitutionCFlagsObjCc, CTool::kCToolObjCxx, - tool_objcxx->precompiled_header_type(), input_dep, - order_only_deps, object_files, other_files); -@@ -478,7 +476,7 @@ void NinjaCBinaryTargetWriter::WriteSour - deps.resize(0); - const char* tool_name = Tool::kToolNone; - if (!target_->GetOutputFilesForSource(source, &tool_name, &tool_outputs)) { -- if (source.type() == SourceFile::SOURCE_DEF) -+ if (GetSourceFileType(source) == SOURCE_DEF) - other_files->push_back(source); - continue; // No output for this source. - } -@@ -599,7 +597,7 @@ void NinjaCBinaryTargetWriter::WriteLink - const SourceFile* optional_def_file = nullptr; - if (!other_files.empty()) { - for (const SourceFile& src_file : other_files) { -- if (src_file.type() == SourceFile::SOURCE_DEF) { -+ if (GetSourceFileType(src_file) == SOURCE_DEF) { - optional_def_file = &src_file; - implicit_deps.push_back( - OutputFile(settings_->build_settings(), src_file)); ---- a/tools/gn/tools/gn/source_file.cc -+++ b/tools/gn/tools/gn/source_file.cc -@@ -21,48 +21,18 @@ void AssertValueSourceFileString(const s - DCHECK(!EndsWithSlash(s)) << s; - } - --SourceFile::Type GetSourceFileType(const std::string& file) { -- base::StringPiece extension = FindExtension(&file); -- if (extension == "cc" || extension == "cpp" || extension == "cxx") -- return SourceFile::SOURCE_CPP; -- if (extension == "h" || extension == "hpp" || extension == "hxx" || -- extension == "hh" || extension == "inc") -- return SourceFile::SOURCE_H; -- if (extension == "c") -- return SourceFile::SOURCE_C; -- if (extension == "m") -- return SourceFile::SOURCE_M; -- if (extension == "mm") -- return SourceFile::SOURCE_MM; -- if (extension == "rc") -- return SourceFile::SOURCE_RC; -- if (extension == "S" || extension == "s" || extension == "asm") -- return SourceFile::SOURCE_S; -- if (extension == "o" || extension == "obj") -- return SourceFile::SOURCE_O; -- if (extension == "def") -- return SourceFile::SOURCE_DEF; -- if (extension == "rs") -- return SourceFile::SOURCE_RS; -- if (extension == "go") -- return SourceFile::SOURCE_GO; -- -- return SourceFile::SOURCE_UNKNOWN; --} -- - } // namespace - --SourceFile::SourceFile() : type_(SOURCE_UNKNOWN) {} -+SourceFile::SourceFile() = default; - - SourceFile::SourceFile(const base::StringPiece& p) -- : value_(p.data(), p.size()), type_(GetSourceFileType(value_)) { -+ : value_(p.data(), p.size()) { - DCHECK(!value_.empty()); - AssertValueSourceFileString(value_); - NormalizePath(&value_); - } - --SourceFile::SourceFile(SwapIn, std::string* value) -- : type_(GetSourceFileType(*value)) { -+SourceFile::SourceFile(SwapIn, std::string* value) { - value_.swap(*value); - DCHECK(!value_.empty()); - AssertValueSourceFileString(value_); ---- a/tools/gn/tools/gn/source_file.h -+++ b/tools/gn/tools/gn/source_file.h -@@ -20,28 +20,6 @@ class SourceDir; - // ends in one. - class SourceFile { - public: -- // This should be sequential integers starting from 0 so they can be used as -- // array indices. -- enum Type { -- SOURCE_UNKNOWN = 0, -- SOURCE_ASM, -- SOURCE_C, -- SOURCE_CPP, -- SOURCE_H, -- SOURCE_M, -- SOURCE_MM, -- SOURCE_S, -- SOURCE_RC, -- SOURCE_O, // Object files can be inputs, too. Also counts .obj. -- SOURCE_DEF, -- -- SOURCE_RS, -- SOURCE_GO, -- -- // Must be last. -- SOURCE_NUMTYPES, -- }; -- - enum SwapIn { SWAP_IN }; - - SourceFile(); -@@ -58,7 +36,6 @@ class SourceFile { - - bool is_null() const { return value_.empty(); } - const std::string& value() const { return value_; } -- Type type() const { return type_; } - - // Returns everything after the last slash. - std::string GetName() const; -@@ -103,7 +80,6 @@ class SourceFile { - friend class SourceDir; - - std::string value_; -- Type type_; - - // Copy & assign supported. - }; ---- /dev/null -+++ b/tools/gn/tools/gn/source_file_type.cc -@@ -0,0 +1,37 @@ -+// Copyright 2014 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#include "tools/gn/source_file_type.h" -+ -+#include "tools/gn/filesystem_utils.h" -+#include "tools/gn/source_file.h" -+ -+SourceFileType GetSourceFileType(const SourceFile& file) { -+ base::StringPiece extension = FindExtension(&file.value()); -+ if (extension == "cc" || extension == "cpp" || extension == "cxx") -+ return SOURCE_CPP; -+ if (extension == "h" || extension == "hpp" || extension == "hxx" || -+ extension == "hh") -+ return SOURCE_H; -+ if (extension == "c") -+ return SOURCE_C; -+ if (extension == "m") -+ return SOURCE_M; -+ if (extension == "mm") -+ return SOURCE_MM; -+ if (extension == "rc") -+ return SOURCE_RC; -+ if (extension == "S" || extension == "s" || extension == "asm") -+ return SOURCE_S; -+ if (extension == "o" || extension == "obj") -+ return SOURCE_O; -+ if (extension == "def") -+ return SOURCE_DEF; -+ if (extension == "rs") -+ return SOURCE_RS; -+ if (extension == "go") -+ return SOURCE_GO; -+ -+ return SOURCE_UNKNOWN; -+} ---- /dev/null -+++ b/tools/gn/tools/gn/source_file_type.h -@@ -0,0 +1,34 @@ -+// Copyright 2014 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef TOOLS_GN_SOURCE_FILE_TYPE_H_ -+#define TOOLS_GN_SOURCE_FILE_TYPE_H_ -+ -+class SourceFile; -+ -+// This should be sequential integers starting from 0 so they can be used as -+// array indices. -+enum SourceFileType { -+ SOURCE_UNKNOWN = 0, -+ SOURCE_ASM, -+ SOURCE_C, -+ SOURCE_CPP, -+ SOURCE_H, -+ SOURCE_M, -+ SOURCE_MM, -+ SOURCE_S, -+ SOURCE_RC, -+ SOURCE_O, // Object files can be inputs, too. Also counts .obj. -+ SOURCE_DEF, -+ -+ SOURCE_RS, -+ SOURCE_GO, -+ -+ // Must be last. -+ SOURCE_NUMTYPES, -+}; -+ -+SourceFileType GetSourceFileType(const SourceFile& file); -+ -+#endif // TOOLS_GN_SOURCE_FILE_TYPE_H_ ---- a/tools/gn/tools/gn/target.cc -+++ b/tools/gn/tools/gn/target.cc -@@ -16,6 +16,7 @@ - #include "tools/gn/filesystem_utils.h" - #include "tools/gn/functions.h" - #include "tools/gn/scheduler.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_writer.h" - #include "tools/gn/tool.h" - #include "tools/gn/toolchain.h" -@@ -486,10 +487,10 @@ bool Target::GetOutputFilesForSource(con - outputs->clear(); - *computed_tool_type = Tool::kToolNone; - -- SourceFile::Type file_type = source.type(); -- if (file_type == SourceFile::SOURCE_UNKNOWN) -+ SourceFileType file_type = GetSourceFileType(source); -+ if (file_type == SOURCE_UNKNOWN) - return false; -- if (file_type == SourceFile::SOURCE_O) { -+ if (file_type == SOURCE_O) { - // Object files just get passed to the output and not compiled. - outputs->push_back(OutputFile(settings()->build_settings(), source)); - return true; ---- a/tools/gn/tools/gn/tool.cc -+++ b/tools/gn/tools/gn/tool.cc -@@ -261,27 +261,27 @@ std::unique_ptr Tool::CreateTool(c - } - - // static --const char* Tool::GetToolTypeForSourceType(SourceFile::Type type) { -+const char* Tool::GetToolTypeForSourceType(SourceFileType type) { - switch (type) { -- case SourceFile::SOURCE_C: -+ case SOURCE_C: - return CTool::kCToolCc; -- case SourceFile::SOURCE_CPP: -+ case SOURCE_CPP: - return CTool::kCToolCxx; -- case SourceFile::SOURCE_M: -+ case SOURCE_M: - return CTool::kCToolObjC; -- case SourceFile::SOURCE_MM: -+ case SOURCE_MM: - return CTool::kCToolObjCxx; -- case SourceFile::SOURCE_ASM: -- case SourceFile::SOURCE_S: -+ case SOURCE_ASM: -+ case SOURCE_S: - return CTool::kCToolAsm; -- case SourceFile::SOURCE_RC: -+ case SOURCE_RC: - return CTool::kCToolRc; -- case SourceFile::SOURCE_UNKNOWN: -- case SourceFile::SOURCE_H: -- case SourceFile::SOURCE_O: -- case SourceFile::SOURCE_DEF: -- case SourceFile::SOURCE_GO: -- case SourceFile::SOURCE_RS: -+ case SOURCE_UNKNOWN: -+ case SOURCE_H: -+ case SOURCE_O: -+ case SOURCE_DEF: -+ case SOURCE_GO: -+ case SOURCE_RS: - return kToolNone; - default: - NOTREACHED(); ---- a/tools/gn/tools/gn/tool.h -+++ b/tools/gn/tools/gn/tool.h -@@ -12,7 +12,7 @@ - #include "tools/gn/label.h" - #include "tools/gn/label_ptr.h" - #include "tools/gn/scope.h" --#include "tools/gn/source_file.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_list.h" - #include "tools/gn/substitution_pattern.h" - -@@ -171,7 +171,7 @@ class Tool { - Toolchain* toolchain, - Err* err); - -- static const char* GetToolTypeForSourceType(SourceFile::Type type); -+ static const char* GetToolTypeForSourceType(SourceFileType type); - static const char* GetToolTypeForTargetFinalOutput(const Target* target); - - protected: ---- a/tools/gn/tools/gn/toolchain.cc -+++ b/tools/gn/tools/gn/toolchain.cc -@@ -88,16 +88,16 @@ void Toolchain::ToolchainSetupComplete() - setup_complete_ = true; - } - --const Tool* Toolchain::GetToolForSourceType(SourceFile::Type type) const { -+const Tool* Toolchain::GetToolForSourceType(SourceFileType type) const { - return GetTool(Tool::GetToolTypeForSourceType(type)); - } - --const CTool* Toolchain::GetToolForSourceTypeAsC(SourceFile::Type type) const { -+const CTool* Toolchain::GetToolForSourceTypeAsC(SourceFileType type) const { - return GetToolAsC(Tool::GetToolTypeForSourceType(type)); - } - - const GeneralTool* Toolchain::GetToolForSourceTypeAsGeneral( -- SourceFile::Type type) const { -+ SourceFileType type) const { - return GetToolAsGeneral(Tool::GetToolTypeForSourceType(type)); - } - ---- a/tools/gn/tools/gn/toolchain.h -+++ b/tools/gn/tools/gn/toolchain.h -@@ -12,6 +12,7 @@ - #include "tools/gn/item.h" - #include "tools/gn/label_ptr.h" - #include "tools/gn/scope.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/substitution_type.h" - #include "tools/gn/tool.h" - #include "tools/gn/value.h" -@@ -87,9 +88,9 @@ class Toolchain : public Item { - } - - // Returns the tool for compiling the given source file type. -- const Tool* GetToolForSourceType(SourceFile::Type type) const; -- const CTool* GetToolForSourceTypeAsC(SourceFile::Type type) const; -- const GeneralTool* GetToolForSourceTypeAsGeneral(SourceFile::Type type) const; -+ const Tool* GetToolForSourceType(SourceFileType type) const; -+ const CTool* GetToolForSourceTypeAsC(SourceFileType type) const; -+ const GeneralTool* GetToolForSourceTypeAsGeneral(SourceFileType type) const; - - // Returns the tool that produces the final output for the given target type. - // This isn't necessarily the tool you would expect. For copy target, this ---- a/tools/gn/tools/gn/visual_studio_writer.cc -+++ b/tools/gn/tools/gn/visual_studio_writer.cc -@@ -24,6 +24,7 @@ - #include "tools/gn/label_pattern.h" - #include "tools/gn/parse_tree.h" - #include "tools/gn/path_output.h" -+#include "tools/gn/source_file_type.h" - #include "tools/gn/standard_out.h" - #include "tools/gn/target.h" - #include "tools/gn/variables.h" diff --git a/revert-gn-4980.patch b/revert-gn-4980.patch deleted file mode 100644 index fe550e9..0000000 --- a/revert-gn-4980.patch +++ /dev/null @@ -1,134 +0,0 @@ -Description: revert https://gn.googlesource.com/gn/+/8730b0feb6b991fa47368566501ab9ccfb453c92, which breaks the chromium build - ---- a/tools/gn/tools/gn/binary_target_generator.cc -+++ b/tools/gn/tools/gn/binary_target_generator.cc -@@ -68,38 +68,6 @@ void BinaryTargetGenerator::DoRun() { - return; - } - --bool BinaryTargetGenerator::FillSources() { -- bool ret = TargetGenerator::FillSources(); -- for (std::size_t i = 0; i < target_->sources().size(); ++i) { -- const auto& source = target_->sources()[i]; -- switch (source.type()) { -- case SourceFile::SOURCE_CPP: -- case SourceFile::SOURCE_H: -- case SourceFile::SOURCE_C: -- case SourceFile::SOURCE_M: -- case SourceFile::SOURCE_MM: -- case SourceFile::SOURCE_S: -- case SourceFile::SOURCE_ASM: -- case SourceFile::SOURCE_O: -- // These are allowed. -- break; -- case SourceFile::SOURCE_RC: -- case SourceFile::SOURCE_DEF: -- case SourceFile::SOURCE_RS: -- case SourceFile::SOURCE_GO: -- case SourceFile::SOURCE_UNKNOWN: -- case SourceFile::SOURCE_NUMTYPES: -- *err_ = -- Err(scope_->GetValue(variables::kSources, true)->list_value()[i], -- std::string("Only source, header, and object files belong in " -- "the sources of a ") + -- Target::GetStringForOutputType(target_->output_type()) + -- ". " + source.value() + " is not one of the valid types."); -- } -- } -- return ret; --} -- - bool BinaryTargetGenerator::FillCompleteStaticLib() { - if (target_->output_type() == Target::STATIC_LIBRARY) { - const Value* value = scope_->GetValue(variables::kCompleteStaticLib, true); ---- a/tools/gn/tools/gn/binary_target_generator.h -+++ b/tools/gn/tools/gn/binary_target_generator.h -@@ -22,7 +22,6 @@ class BinaryTargetGenerator : public Tar - - protected: - void DoRun() override; -- bool FillSources() override; - - private: - bool FillCompleteStaticLib(); ---- a/tools/gn/tools/gn/source_dir.cc -+++ b/tools/gn/tools/gn/source_dir.cc -@@ -98,10 +98,10 @@ SourceFile SourceDir::ResolveRelativeFil - return ret; - - const std::string& input_string = p.string_value(); -- if (!ValidateResolveInput(true, p, input_string, err)) -+ if (!ValidateResolveInput(true, p, input_string, err)) { - return ret; -- -- ret.SetValue(ResolveRelative(input_string, value_, true, source_root)); -+ } -+ ret.value_ = ResolveRelative(input_string, value_, true, source_root); - return ret; - } - ---- a/tools/gn/tools/gn/source_file.cc -+++ b/tools/gn/tools/gn/source_file.cc -@@ -55,19 +55,18 @@ SourceFile::Type GetSourceFileType(const - SourceFile::SourceFile() : type_(SOURCE_UNKNOWN) {} - - SourceFile::SourceFile(const base::StringPiece& p) -- : value_(p.data(), p.size()) { -+ : value_(p.data(), p.size()), type_(GetSourceFileType(value_)) { - DCHECK(!value_.empty()); - AssertValueSourceFileString(value_); - NormalizePath(&value_); -- type_ = GetSourceFileType(value_); - } - --SourceFile::SourceFile(SwapIn, std::string* value) { -+SourceFile::SourceFile(SwapIn, std::string* value) -+ : type_(GetSourceFileType(*value)) { - value_.swap(*value); - DCHECK(!value_.empty()); - AssertValueSourceFileString(value_); - NormalizePath(&value_); -- type_ = GetSourceFileType(value_); - } - - SourceFile::~SourceFile() = default; -@@ -93,8 +92,3 @@ SourceDir SourceFile::GetDir() const { - base::FilePath SourceFile::Resolve(const base::FilePath& source_root) const { - return ResolvePath(value_, true, source_root); - } -- --void SourceFile::SetValue(const std::string& value) { -- value_ = value; -- type_ = GetSourceFileType(value_); --} ---- a/tools/gn/tools/gn/source_file.h -+++ b/tools/gn/tools/gn/source_file.h -@@ -97,16 +97,11 @@ class SourceFile { - return value_ < other.value_; - } - -- void swap(SourceFile& other) { -- value_.swap(other.value_); -- std::swap(type_, other.type_); -- } -+ void swap(SourceFile& other) { value_.swap(other.value_); } - - private: - friend class SourceDir; - -- void SetValue(const std::string& value); -- - std::string value_; - Type type_; - ---- a/tools/gn/tools/gn/target_generator.h -+++ b/tools/gn/tools/gn/target_generator.h -@@ -47,7 +47,7 @@ class TargetGenerator { - - const BuildSettings* GetBuildSettings() const; - -- virtual bool FillSources(); -+ bool FillSources(); - bool FillPublic(); - bool FillConfigs(); - bool FillOutputs(bool allow_substitutions);