Also replace some patches with changes in the SPEC file.epel8
Tomas Popela
5 years ago
parent
3eaa3be79d
commit
3c95810693
@ -1,44 +0,0 @@
|
||||
diff -up chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h.pathmax chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h
|
||||
--- chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h.pathmax 2015-10-07 11:26:11.813477839 -0400
|
||||
+++ chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/path.h 2015-10-07 11:26:40.845845054 -0400
|
||||
@@ -12,6 +12,11 @@
|
||||
|
||||
#include "sdk_util/macros.h"
|
||||
|
||||
+/* Needed for PATH_MAX */
|
||||
+#ifndef PATH_MAX
|
||||
+#define PATH_MAX 4096
|
||||
+#endif
|
||||
+
|
||||
namespace nacl_io {
|
||||
|
||||
class Path {
|
||||
diff -up chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c.pathmax chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c
|
||||
--- chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c.pathmax 2015-08-22 15:02:08.000000000 -0400
|
||||
+++ chromium-45.0.2454.101/native_client/src/untrusted/nacl/getcwd.c 2015-10-07 10:58:56.172018783 -0400
|
||||
@@ -11,6 +11,10 @@
|
||||
|
||||
#include <errno.h>
|
||||
#include <limits.h>
|
||||
+/* Needed for PATH_MAX */
|
||||
+#ifndef PATH_MAX
|
||||
+#define PATH_MAX 4096
|
||||
+#endif
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
diff -up chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c.pathmax chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c
|
||||
--- chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c.pathmax 2015-10-09 10:57:38.424348662 -0400
|
||||
+++ chromium-45.0.2454.101/native_client_sdk/src/libraries/nacl_io/syscalls/realpath.c 2015-10-09 10:57:51.541059938 -0400
|
||||
@@ -13,6 +13,11 @@
|
||||
|
||||
#include "sdk_util/macros.h"
|
||||
|
||||
+/* Needed for PATH_MAX */
|
||||
+#ifndef PATH_MAX
|
||||
+#define PATH_MAX 4096
|
||||
+#endif
|
||||
+
|
||||
EXTERN_C_BEGIN
|
||||
|
||||
#if defined(__native_client__)
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c
|
||||
--- chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c.timefix 2016-09-06 15:20:06.094396255 -0400
|
||||
+++ chromium-53.0.2785.92/third_party/boringssl/src/crypto/x509/by_dir.c 2016-09-06 15:20:16.893187930 -0400
|
||||
@@ -56,6 +56,7 @@
|
||||
* [including the GNU Public Licence.] */
|
||||
|
||||
#include <string.h>
|
||||
+#include <time.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up chromium-54.0.2840.59/third_party/BUILD.gn.jpegfix chromium-54.0.2840.59/third_party/BUILD.gn
|
||||
--- chromium-54.0.2840.59/third_party/BUILD.gn.jpegfix 2016-10-17 11:45:44.995340495 -0400
|
||||
+++ chromium-54.0.2840.59/third_party/BUILD.gn 2016-10-17 11:46:35.254289872 -0400
|
||||
@@ -20,6 +20,7 @@ declare_args() {
|
||||
config("system_libjpeg_config") {
|
||||
libs = [ "jpeg" ]
|
||||
defines = [ "USE_SYSTEM_LIBJPEG" ]
|
||||
+ include_dirs = [ "/usr/include/" ]
|
||||
}
|
||||
|
||||
config("libjpeg_turbo_config") {
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up chromium-55.0.2883.75/third_party/boringssl/BUILD.gn.addrfix chromium-55.0.2883.75/third_party/boringssl/BUILD.gn
|
||||
--- chromium-55.0.2883.75/third_party/boringssl/BUILD.gn.addrfix 2016-12-12 15:30:27.727834891 -0500
|
||||
+++ chromium-55.0.2883.75/third_party/boringssl/BUILD.gn 2016-12-12 15:30:53.095709352 -0500
|
||||
@@ -24,6 +24,7 @@ config("internal_config") {
|
||||
"BORINGSSL_IMPLEMENTATION",
|
||||
"BORINGSSL_NO_STATIC_INITIALIZER",
|
||||
"OPENSSL_SMALL",
|
||||
+ "_POSIX_C_SOURCE=200112L",
|
||||
]
|
||||
configs = [
|
||||
# TODO(davidben): Fix size_t truncations in BoringSSL.
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.ldmemory chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn
|
||||
--- chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.ldmemory 2017-06-07 15:37:09.436616113 -0400
|
||||
+++ chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn 2017-06-07 15:38:04.508519102 -0400
|
||||
@@ -93,7 +93,7 @@ gcc_toolchain("x86") {
|
||||
nm = "nm"
|
||||
ar = "ar"
|
||||
ld = cxx
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = "-fno-delete-null-pointer-checks -g1"
|
||||
|
||||
# Output linker map files for binary size analysis.
|
||||
enable_linker_map = true
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h
|
||||
--- chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix 2017-08-25 15:29:12.143242471 -0400
|
||||
+++ chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h 2017-08-25 15:29:36.941835865 -0400
|
||||
@@ -39,13 +39,13 @@
|
||||
#include "log.h"
|
||||
|
||||
#if ARCH_AARCH64
|
||||
-# include "aarch64/timer.h"
|
||||
+# include "libavutil/aarch64/timer.h"
|
||||
#elif ARCH_ARM
|
||||
-# include "arm/timer.h"
|
||||
+# include "libavutil/arm/timer.h"
|
||||
#elif ARCH_PPC
|
||||
-# include "ppc/timer.h"
|
||||
+# include "libavutil/ppc/timer.h"
|
||||
#elif ARCH_X86
|
||||
-# include "x86/timer.h"
|
||||
+# include "libavutil/x86/timer.h"
|
||||
#endif
|
||||
|
||||
#if !defined(AV_READ_TIME)
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc.kmaxskip chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc
|
||||
--- chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc.kmaxskip 2017-10-18 10:00:28.503714392 -0400
|
||||
+++ chromium-62.0.3202.62/cc/paint/paint_op_buffer.cc 2017-10-18 10:00:43.153430212 -0400
|
||||
@@ -336,7 +336,7 @@ TYPES(M);
|
||||
#undef TYPES
|
||||
|
||||
const SkRect PaintOp::kUnsetRect = {SK_ScalarInfinity, 0, 0, 0};
|
||||
-const size_t PaintOp::kMaxSkip;
|
||||
+constexpr size_t PaintOp::kMaxSkip;
|
||||
|
||||
std::string PaintOpTypeToString(PaintOpType type) {
|
||||
switch (type) {
|
||||
@ -1,43 +0,0 @@
|
||||
diff -up chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn.nullfix chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn
|
||||
--- chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn.nullfix 2017-12-06 15:05:21.000000000 -0500
|
||||
+++ chromium-63.0.3239.84/build/toolchain/linux/BUILD.gn 2017-12-07 10:44:34.507207080 -0500
|
||||
@@ -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"
|
||||
@@ -99,6 +101,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
|
||||
@@ -152,6 +155,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
|
||||
@@ -186,6 +190,7 @@ gcc_toolchain("mipsel") {
|
||||
ld = cxx
|
||||
readelf = "${toolprefix}readelf"
|
||||
nm = "${toolprefix}nm"
|
||||
+ extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
|
||||
toolchain_args = {
|
||||
cc_wrapper = ""
|
||||
@ -1,17 +0,0 @@
|
||||
diff -up chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c
|
||||
--- chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c.ffmpeg-stdatomic 2018-01-25 11:55:57.880936815 -0500
|
||||
+++ chromium-64.0.3282.119/third_party/ffmpeg/libavutil/cpu.c 2018-01-25 11:57:18.456787888 -0500
|
||||
@@ -18,7 +18,13 @@
|
||||
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
+// 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 <compat/atomics/gcc/stdatomic.h>
|
||||
+#else
|
||||
#include <stdatomic.h>
|
||||
+#endif
|
||||
|
||||
#include "attributes.h"
|
||||
#include "cpu.h"
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-65.0.3325.146/third_party/webrtc/p2p/base/port.cc.gcc-round-fix chromium-65.0.3325.146/third_party/webrtc/p2p/base/port.cc
|
||||
--- chromium-65.0.3325.146/third_party/webrtc/p2p/base/port.cc.gcc-round-fix 2018-03-07 10:57:11.284376048 -0500
|
||||
+++ chromium-65.0.3325.146/third_party/webrtc/p2p/base/port.cc 2018-03-07 10:58:16.590742636 -0500
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "p2p/base/port.h"
|
||||
|
||||
-#include <math.h>
|
||||
+#include <cmath>
|
||||
|
||||
#include <algorithm>
|
||||
#include <utility>
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-65.0.3325.146/cc/paint/raw_memory_transfer_cache_entry.cc.memcpyfix chromium-65.0.3325.146/cc/paint/raw_memory_transfer_cache_entry.cc
|
||||
--- chromium-65.0.3325.146/cc/paint/raw_memory_transfer_cache_entry.cc.memcpyfix 2018-03-07 11:04:14.690379817 -0500
|
||||
+++ chromium-65.0.3325.146/cc/paint/raw_memory_transfer_cache_entry.cc 2018-03-07 11:06:04.339878069 -0500
|
||||
@@ -3,7 +3,7 @@
|
||||
// found in the LICENSE file.
|
||||
|
||||
#include "cc/paint/raw_memory_transfer_cache_entry.h"
|
||||
-
|
||||
+#include <memory.h>
|
||||
#include <string.h>
|
||||
|
||||
namespace cc {
|
||||
@ -1,18 +0,0 @@
|
||||
diff -up chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h.gcc-cpolicyprovider chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h
|
||||
--- chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h.gcc-cpolicyprovider 2018-04-25 16:33:40.872222779 -0400
|
||||
+++ chromium-66.0.3359.117/components/policy/core/browser/browser_policy_connector_base.h 2018-04-25 16:37:23.175883637 -0400
|
||||
@@ -11,13 +11,13 @@
|
||||
#include "base/callback_forward.h"
|
||||
#include "base/macros.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;
|
||||
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-66.0.3359.117/build/config/clang/clang.gni.system-clang chromium-66.0.3359.117/build/config/clang/clang.gni
|
||||
--- chromium-66.0.3359.117/build/config/clang/clang.gni.system-clang 2018-04-18 12:08:45.658190297 -0400
|
||||
+++ chromium-66.0.3359.117/build/config/clang/clang.gni 2018-04-18 12:09:37.612032982 -0400
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
import("//build/toolchain/toolchain.gni")
|
||||
|
||||
-default_clang_base_path = "//third_party/llvm-build/Release+Asserts"
|
||||
+default_clang_base_path = "/usr"
|
||||
|
||||
declare_args() {
|
||||
# Indicates if the build should use the Chrome-specific plugins for enforcing
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl
|
||||
--- chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 2018-05-30 04:44:33.000000000 -0400
|
||||
+++ chromium-67.0.3396.62/third_party/webgl/src/specs/latest/2.0/webgl2.idl 2018-05-30 11:59:26.218625660 -0400
|
||||
@@ -262,7 +262,7 @@ interface mixin WebGL2RenderingContextBa
|
||||
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;
|
||||
@ -1,30 +0,0 @@
|
||||
diff -up chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc.122692c chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc
|
||||
--- chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc.122692c 2018-08-17 14:54:30.587338865 -0400
|
||||
+++ chromium-68.0.3440.106/components/search_provider_logos/logo_common.cc 2018-08-17 14:55:20.461184298 -0400
|
||||
@@ -14,22 +14,22 @@ LogoMetadata::LogoMetadata() = default;
|
||||
LogoMetadata::LogoMetadata(const LogoMetadata&) = default;
|
||||
LogoMetadata::LogoMetadata(LogoMetadata&&) noexcept = default;
|
||||
LogoMetadata& LogoMetadata::operator=(const LogoMetadata&) = default;
|
||||
-LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) noexcept = default;
|
||||
+LogoMetadata& LogoMetadata::operator=(LogoMetadata&&) = default;
|
||||
LogoMetadata::~LogoMetadata() = default;
|
||||
|
||||
EncodedLogo::EncodedLogo() = default;
|
||||
EncodedLogo::EncodedLogo(const EncodedLogo&) = default;
|
||||
EncodedLogo::EncodedLogo(EncodedLogo&&) noexcept = default;
|
||||
EncodedLogo& EncodedLogo::operator=(const EncodedLogo&) = default;
|
||||
-EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) noexcept = default;
|
||||
+EncodedLogo& EncodedLogo::operator=(EncodedLogo&&) = default;
|
||||
EncodedLogo::~EncodedLogo() = default;
|
||||
|
||||
Logo::Logo() = default;
|
||||
Logo::~Logo() = default;
|
||||
|
||||
LogoCallbacks::LogoCallbacks() = default;
|
||||
-LogoCallbacks::LogoCallbacks(LogoCallbacks&&) noexcept = default;
|
||||
-LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) noexcept = default;
|
||||
+LogoCallbacks::LogoCallbacks(LogoCallbacks&&) = default;
|
||||
+LogoCallbacks& LogoCallbacks::operator=(LogoCallbacks&&) = default;
|
||||
LogoCallbacks::~LogoCallbacks() = default;
|
||||
|
||||
} // namespace search_provider_logos
|
||||
@ -1,33 +0,0 @@
|
||||
diff -up chromium-69.0.3497.81/build/config/BUILD.gn.fyoursysroot chromium-69.0.3497.81/build/config/BUILD.gn
|
||||
--- chromium-69.0.3497.81/build/config/BUILD.gn.fyoursysroot 2018-09-06 13:43:44.863375238 -0400
|
||||
+++ chromium-69.0.3497.81/build/config/BUILD.gn 2018-09-06 13:43:58.377083290 -0400
|
||||
@@ -284,9 +284,9 @@ group("executable_and_loadable_module_an
|
||||
public_deps += [ "//build/config/sanitizers:deps" ]
|
||||
}
|
||||
|
||||
- if (use_custom_libcxx) {
|
||||
- public_deps += [ "//buildtools/third_party/libc++" ]
|
||||
- }
|
||||
+ # if (use_custom_libcxx) {
|
||||
+ # public_deps += [ "//buildtools/third_party/libc++" ]
|
||||
+ # }
|
||||
|
||||
if (use_afl) {
|
||||
public_deps += [ "//third_party/afl" ]
|
||||
diff -up chromium-69.0.3497.81/build/config/sysroot.gni.fyoursysroot chromium-69.0.3497.81/build/config/sysroot.gni
|
||||
--- chromium-69.0.3497.81/build/config/sysroot.gni.fyoursysroot 2018-09-06 13:40:46.212232232 -0400
|
||||
+++ chromium-69.0.3497.81/build/config/sysroot.gni 2018-09-06 13:41:02.421882529 -0400
|
||||
@@ -15,9 +15,10 @@ declare_args() {
|
||||
# The absolute path to directory containing linux sysroot images
|
||||
target_sysroot_dir = "//build/linux"
|
||||
|
||||
- use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
|
||||
- current_cpu == "arm" || current_cpu == "arm64" ||
|
||||
- current_cpu == "mipsel" || current_cpu == "mips64el"
|
||||
+ use_sysroot = false
|
||||
+ # use_sysroot = current_cpu == "x86" || current_cpu == "x64" ||
|
||||
+ # current_cpu == "arm" || current_cpu == "arm64" ||
|
||||
+ # current_cpu == "mipsel" || current_cpu == "mips64el"
|
||||
}
|
||||
|
||||
if (current_os == target_os && current_cpu == target_cpu &&
|
||||
@ -1,12 +0,0 @@
|
||||
diff -up chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h
|
||||
--- chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h.aarch64-new-stat 2018-11-06 13:27:05.118766581 -0500
|
||||
+++ chromium-70.0.3538.77/sandbox/linux/system_headers/arm64_linux_syscalls.h 2018-11-06 13:27:34.575204504 -0500
|
||||
@@ -5,6 +5,8 @@
|
||||
#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
|
||||
#define SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_
|
||||
|
||||
+#define __ARCH_WANT_NEW_STAT
|
||||
+
|
||||
#include <asm-generic/unistd.h>
|
||||
|
||||
#if !defined(__NR_io_setup)
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||
--- chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix 2018-12-14 11:17:43.249121756 -0500
|
||||
+++ chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-12-14 11:20:07.770030234 -0500
|
||||
@@ -658,7 +658,7 @@ SI F approx_powf(F x, F y) {
|
||||
}
|
||||
|
||||
SI F from_half(U16 h) {
|
||||
-#if defined(SK_CPU_ARM64) && !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)
|
||||
@@ -678,7 +678,7 @@ SI F from_half(U16 h) {
|
||||
}
|
||||
|
||||
SI U16 to_half(F f) {
|
||||
-#if defined(SK_CPU_ARM64) && !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)
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd.notest chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd
|
||||
--- chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd.notest 2019-03-10 13:54:17.843583876 -0400
|
||||
+++ chromium-72.0.3626.121/chrome/test/data/webui_test_resources.grd 2019-03-10 14:03:29.302063637 -0400
|
||||
@@ -8,7 +8,6 @@
|
||||
</outputs>
|
||||
<release seq="1">
|
||||
<includes>
|
||||
- <include name="IDR_WEBUI_TEST_I18N_PROCESS_CSS_TEST" file="webui/i18n_process_css_test.html" flattenhtml="true" allowexternalscript="true" type="BINDATA" />
|
||||
<include name="IDR_WEB_UI_TEST_MOJO_JS" file="${root_gen_dir}/chrome/test/data/webui/web_ui_test.mojom.js" use_base_dir="false" type="BINDATA"/>
|
||||
<include name="IDR_WEB_UI_TEST_MOJO_LITE_JS" file="${root_gen_dir}/chrome/test/data/webui/web_ui_test.mojom-lite.js" use_base_dir="false" type="BINDATA"/>
|
||||
</includes>
|
||||
@ -1,48 +0,0 @@
|
||||
diff -up chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn.disable-ndnpc chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn
|
||||
--- chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn.disable-ndnpc 2019-03-13 10:29:00.331009643 -0400
|
||||
+++ chromium-73.0.3683.75/build/toolchain/linux/BUILD.gn 2019-03-13 10:29:28.344458746 -0400
|
||||
@@ -31,7 +31,7 @@ gcc_toolchain("arm64") {
|
||||
ld = cxx
|
||||
readelf = "${toolprefix}readelf"
|
||||
nm = "${toolprefix}nm"
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = ""
|
||||
|
||||
toolchain_args = {
|
||||
current_cpu = "arm64"
|
||||
@@ -50,7 +50,7 @@ gcc_toolchain("arm") {
|
||||
ld = cxx
|
||||
readelf = "${toolprefix}readelf"
|
||||
nm = "${toolprefix}nm"
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = ""
|
||||
|
||||
toolchain_args = {
|
||||
current_cpu = "arm"
|
||||
@@ -101,7 +101,7 @@ gcc_toolchain("x86") {
|
||||
nm = "nm"
|
||||
ar = "ar"
|
||||
ld = cxx
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks -g1"
|
||||
+ extra_cppflags = "-g1"
|
||||
|
||||
# Output linker map files for binary size analysis.
|
||||
enable_linker_map = true
|
||||
@@ -155,7 +155,7 @@ gcc_toolchain("x64") {
|
||||
nm = "nm"
|
||||
ar = "ar"
|
||||
ld = cxx
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = ""
|
||||
|
||||
# Output linker map files for binary size analysis.
|
||||
enable_linker_map = true
|
||||
@@ -190,7 +190,7 @@ gcc_toolchain("mipsel") {
|
||||
ld = cxx
|
||||
readelf = "${toolprefix}readelf"
|
||||
nm = "${toolprefix}nm"
|
||||
- extra_cppflags = "-fno-delete-null-pointer-checks"
|
||||
+ extra_cppflags = ""
|
||||
|
||||
toolchain_args = {
|
||||
cc_wrapper = ""
|
||||
@ -1,34 +0,0 @@
|
||||
diff -up chromium-75.0.3770.100/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.cc.git00281713 chromium-75.0.3770.100/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.cc
|
||||
--- chromium-75.0.3770.100/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.cc.git00281713 2019-07-02 09:10:38.951369854 -0400
|
||||
+++ chromium-75.0.3770.100/chrome/browser/performance_manager/chrome_content_browser_client_performance_manager_part.cc 2019-07-02 09:11:59.864642942 -0400
|
||||
@@ -12,13 +12,19 @@
|
||||
#include "chrome/browser/performance_manager/graph/process_node_impl.h"
|
||||
#include "chrome/browser/performance_manager/performance_manager.h"
|
||||
#include "chrome/browser/performance_manager/render_process_user_data.h"
|
||||
+#include "content/public/browser/render_process_host.h"
|
||||
#include "services/resource_coordinator/public/mojom/coordination_unit.mojom.h"
|
||||
|
||||
namespace {
|
||||
|
||||
void BindProcessNode(
|
||||
- content::RenderProcessHost* render_process_host,
|
||||
+ int render_process_host_id,
|
||||
resource_coordinator::mojom::ProcessCoordinationUnitRequest request) {
|
||||
+ content::RenderProcessHost* render_process_host =
|
||||
+ content::RenderProcessHost::FromID(render_process_host_id);
|
||||
+ if (!render_process_host)
|
||||
+ return;
|
||||
+
|
||||
performance_manager::RenderProcessUserData* user_data =
|
||||
performance_manager::RenderProcessUserData::GetForRenderProcessHost(
|
||||
render_process_host);
|
||||
@@ -47,8 +53,7 @@ void ChromeContentBrowserClientPerforman
|
||||
blink::AssociatedInterfaceRegistry* associated_registry,
|
||||
content::RenderProcessHost* render_process_host) {
|
||||
registry->AddInterface(
|
||||
- base::BindRepeating(&BindProcessNode,
|
||||
- base::Unretained(render_process_host)),
|
||||
+ base::BindRepeating(&BindProcessNode, render_process_host->GetID()),
|
||||
base::SequencedTaskRunnerHandle::Get());
|
||||
|
||||
// Ideally this would strictly be a "CreateForRenderProcess", but when a
|
||||
@ -1,15 +0,0 @@
|
||||
diff -up chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h.SIOCGSTAMP chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h
|
||||
--- chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h.SIOCGSTAMP 2019-06-06 10:04:57.050403639 -0400
|
||||
+++ chromium-75.0.3770.80/third_party/webrtc/rtc_base/physical_socket_server.h 2019-06-06 10:06:03.975121688 -0400
|
||||
@@ -16,6 +16,11 @@
|
||||
#define WEBRTC_USE_EPOLL 1
|
||||
#endif
|
||||
|
||||
+// for SIOCGSTAMP in Linux 5.2
|
||||
+#if defined(WEBRTC_LINUX)
|
||||
+#include <linux/sockios.h>
|
||||
+#endif
|
||||
+
|
||||
#include <memory>
|
||||
#include <set>
|
||||
#include <vector>
|
||||
@ -1,14 +0,0 @@
|
||||
diff -up chromium-75.0.3770.80/cc/scheduler/compositor_frame_reporting_controller.cc.gcc-dcheck_ne-fix chromium-75.0.3770.80/cc/scheduler/compositor_frame_reporting_controller.cc
|
||||
--- chromium-75.0.3770.80/cc/scheduler/compositor_frame_reporting_controller.cc.gcc-dcheck_ne-fix 2019-06-06 12:42:27.431575032 -0400
|
||||
+++ chromium-75.0.3770.80/cc/scheduler/compositor_frame_reporting_controller.cc 2019-06-06 12:43:05.692848409 -0400
|
||||
@@ -31,8 +31,8 @@ void CompositorFrameReportingController:
|
||||
|
||||
void CompositorFrameReportingController::WillBeginMainFrame() {
|
||||
DCHECK(reporters_[PipelineStage::kBeginImplFrame]);
|
||||
- DCHECK_NE(reporters_[PipelineStage::kBeginMainFrame],
|
||||
- reporters_[PipelineStage::kBeginImplFrame]);
|
||||
+ DCHECK(reporters_[PipelineStage::kBeginMainFrame] !=
|
||||
+ reporters_[PipelineStage::kBeginImplFrame]);
|
||||
reporters_[PipelineStage::kBeginImplFrame]->StartStage(
|
||||
"SendBeginMainFrameToCommit");
|
||||
AdvanceReporterStage(PipelineStage::kBeginImplFrame,
|
||||
@ -1,21 +0,0 @@
|
||||
diff -up chromium-75.0.3770.80/third_party/angle/src/common/debug.h.gcc-assume chromium-75.0.3770.80/third_party/angle/src/common/debug.h
|
||||
--- chromium-75.0.3770.80/third_party/angle/src/common/debug.h.gcc-assume 2019-06-06 17:38:01.876631704 -0400
|
||||
+++ chromium-75.0.3770.80/third_party/angle/src/common/debug.h 2019-06-07 09:30:06.205446547 -0400
|
||||
@@ -248,7 +248,7 @@ std::ostream &FmtHex(std::ostream &os, T
|
||||
# define EVENT(message, ...) (void(0))
|
||||
#endif
|
||||
|
||||
-#if defined(COMPILER_GCC) || defined(__clang__)
|
||||
+#if defined(__GNUC__)
|
||||
# define ANGLE_CRASH() __builtin_trap()
|
||||
#else
|
||||
# define ANGLE_CRASH() ((void)(*(volatile char *)0 = 0)), __assume(0)
|
||||
@@ -336,7 +336,7 @@ std::ostream &FmtHex(std::ostream &os, T
|
||||
# define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
|
||||
_Pragma("clang diagnostic push") _Pragma("clang diagnostic error \"-Wpadded\"")
|
||||
# define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("clang diagnostic pop")
|
||||
-#elif defined(COMPILER_GCC)
|
||||
+#elif defined(__GNUC__)
|
||||
# define ANGLE_ENABLE_STRUCT_PADDING_WARNINGS \
|
||||
_Pragma("GCC diagnostic push") _Pragma("GCC diagnostic error \"-Wpadded\"")
|
||||
# define ANGLE_DISABLE_STRUCT_PADDING_WARNINGS _Pragma("GCC diagnostic pop")
|
||||
@ -1,13 +0,0 @@
|
||||
diff -up chromium-75.0.3770.80/components/omnibox/browser/autocomplete_match.cc.revert-daff6b chromium-75.0.3770.80/components/omnibox/browser/autocomplete_match.cc
|
||||
--- chromium-75.0.3770.80/components/omnibox/browser/autocomplete_match.cc.revert-daff6b 2019-06-06 14:54:13.819190586 -0400
|
||||
+++ chromium-75.0.3770.80/components/omnibox/browser/autocomplete_match.cc 2019-06-06 14:54:31.892839991 -0400
|
||||
@@ -154,8 +154,7 @@ AutocompleteMatch::AutocompleteMatch(con
|
||||
additional_info(match.additional_info),
|
||||
duplicate_matches(match.duplicate_matches) {}
|
||||
|
||||
-AutocompleteMatch::AutocompleteMatch(AutocompleteMatch&& match) noexcept =
|
||||
- default;
|
||||
+AutocompleteMatch::AutocompleteMatch(AutocompleteMatch&& match) = default;
|
||||
|
||||
AutocompleteMatch::~AutocompleteMatch() {
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
diff -up chromium-76.0.3809.100/services/device/usb/usb_context.cc.modern-libusbx chromium-76.0.3809.100/services/device/usb/usb_context.cc
|
||||
--- chromium-76.0.3809.100/services/device/usb/usb_context.cc.modern-libusbx 2019-08-12 15:40:49.034170484 +0200
|
||||
+++ chromium-76.0.3809.100/services/device/usb/usb_context.cc 2019-08-12 15:41:23.775558867 +0200
|
||||
@@ -58,7 +58,11 @@ void UsbContext::UsbEventHandler::Run()
|
||||
|
||||
void UsbContext::UsbEventHandler::Stop() {
|
||||
base::subtle::Release_Store(&running_, 0);
|
||||
+#ifdef LIBUSB_API_VERSION >= 0x01000105
|
||||
+ libusb_interrupt_event_handler(context_);
|
||||
+#else
|
||||
libusb_interrupt_handle_event(context_);
|
||||
+#endif
|
||||
}
|
||||
|
||||
UsbContext::UsbContext(PlatformUsbContext context) : context_(context) {
|
||||
@ -1,24 +0,0 @@
|
||||
diff -up chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h
|
||||
--- chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h.boolfix 2019-09-09 23:55:20.000000000 +0200
|
||||
+++ chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_ptr_info.h 2019-09-12 15:43:30.025360946 +0200
|
||||
@@ -45,7 +45,7 @@ class AssociatedInterfacePtrInfo {
|
||||
|
||||
bool is_valid() const { return handle_.is_valid(); }
|
||||
|
||||
- explicit operator bool() const { return handle_.is_valid(); }
|
||||
+ explicit operator bool() const { return (bool) handle_.is_valid(); }
|
||||
|
||||
ScopedInterfaceEndpointHandle PassHandle() {
|
||||
return std::move(handle_);
|
||||
diff -up chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h.boolfix chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h
|
||||
--- chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h.boolfix 2019-09-09 23:55:20.000000000 +0200
|
||||
+++ chromium-77.0.3865.75/mojo/public/cpp/bindings/associated_interface_request.h 2019-09-12 15:43:30.025360946 +0200
|
||||
@@ -51,7 +51,7 @@ class AssociatedInterfaceRequest {
|
||||
// handle.
|
||||
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(); }
|
||||
|
||||
ScopedInterfaceEndpointHandle PassHandle() { return std::move(handle_); }
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
diff -up chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h
|
||||
--- chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h.nogccoptmath 2019-09-13 14:17:22.726738088 +0200
|
||||
+++ chromium-77.0.3865.75/base/numerics/safe_math_shared_impl.h 2019-09-13 14:31:37.686898493 +0200
|
||||
@@ -23,9 +23,8 @@
|
||||
// Where available use builtin math overflow support on Clang and GCC.
|
||||
#elif !defined(__native_client__) && \
|
||||
((defined(__clang__) && \
|
||||
- ((__clang_major__ > 3) || \
|
||||
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
|
||||
- (defined(__GNUC__) && __GNUC__ >= 5))
|
||||
+ (__clang_major__ > 3) || \
|
||||
+ (__clang_major__ == 3 && __clang_minor__ >= 4)))
|
||||
#include "base/numerics/safe_math_clang_gcc_impl.h"
|
||||
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
|
||||
#else
|
||||
@ -1,36 +0,0 @@
|
||||
diff -up chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h
|
||||
--- chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h.gcc5-r3 2019-09-09 23:55:18.000000000 +0200
|
||||
+++ chromium-77.0.3865.75/gpu/ipc/common/mailbox_struct_traits.h 2019-09-12 10:13:16.710206500 +0200
|
||||
@@ -15,7 +15,7 @@ namespace mojo {
|
||||
template <>
|
||||
struct StructTraits<gpu::mojom::MailboxDataView, gpu::Mailbox> {
|
||||
static base::span<const int8_t> 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-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h
|
||||
--- chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h.gcc5-r3 2019-09-09 23:55:23.000000000 +0200
|
||||
+++ chromium-77.0.3865.75/services/viz/public/cpp/compositing/quads_struct_traits.h 2019-09-12 10:13:16.710206500 +0200
|
||||
@@ -391,7 +391,7 @@ struct StructTraits<viz::mojom::TextureQ
|
||||
static base::span<const float> 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-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc
|
||||
--- chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.gcc5-r3 2019-09-12 10:13:16.711206509 +0200
|
||||
+++ chromium-77.0.3865.75/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2019-09-12 15:41:15.300158849 +0200
|
||||
@@ -10,7 +10,7 @@
|
||||
|
||||
#include "modules/audio_processing/aec3/aec_state.h"
|
||||
|
||||
-#include <math.h>
|
||||
+#include <cmath>
|
||||
|
||||
#include <algorithm>
|
||||
#include <numeric>
|
||||
Loading…
Reference in new issue