Skip to content

Commit e64b811

Browse files
committed
grandiose sync with upstream
1 parent 67e711a commit e64b811

File tree

61 files changed

+1690
-3112
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1690
-3112
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
diff -up chromium-47.0.2526.80/native_client/build/untrusted.gypi.fixme chromium-47.0.2526.80/native_client/build/untrusted.gypi
2+
--- chromium-47.0.2526.80/native_client/build/untrusted.gypi.fixme 2015-12-09 11:54:27.584962337 -0500
3+
+++ chromium-47.0.2526.80/native_client/build/untrusted.gypi 2015-12-09 11:54:45.033571750 -0500
4+
@@ -1564,6 +1564,7 @@
5+
'-Wno-char-subscripts',
6+
'-Wno-unused-function',
7+
'-std=gnu++11',
8+
+ '-fgnu-inline-asm',
9+
],
10+
'native_irt_compile_flags': [
11+
# IRT compile/link flags to make the binary smaller.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
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
2+
--- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free 2016-08-15 13:07:29.279655676 -0400
3+
+++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-15 13:08:38.447317416 -0400
4+
@@ -41,6 +41,11 @@
5+
#include <errno.h>
6+
#include <sys/mman.h>
7+
8+
+#if OS(LINUX) && defined(MADV_FREE)
9+
+// Added in Linux 4.5, but it breaks the sandbox.
10+
+#undef MADV_FREE
11+
+#endif
12+
+
13+
#ifndef MADV_FREE
14+
#define MADV_FREE MADV_DONTNEED
15+
#endif

chromium-55.0.2883.75-addrfix.patch

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff -urN chromium-55.0.2883.75.orig/third_party/boringssl/BUILD.gn chromium-55.0.2883.75/third_party/boringssl/BUILD.gn
2-
--- chromium-55.0.2883.75.orig/third_party/boringssl/BUILD.gn 2016-12-02 17:03:40.597447712 +0300
3-
+++ chromium-55.0.2883.75/third_party/boringssl/BUILD.gn 2016-12-02 17:04:14.634966683 +0300
4-
@@ -24,6 +24,7 @@
1+
diff -up chromium-55.0.2883.75/third_party/boringssl/BUILD.gn.addrfix chromium-55.0.2883.75/third_party/boringssl/BUILD.gn
2+
--- chromium-55.0.2883.75/third_party/boringssl/BUILD.gn.addrfix 2016-12-12 15:30:27.727834891 -0500
3+
+++ chromium-55.0.2883.75/third_party/boringssl/BUILD.gn 2016-12-12 15:30:53.095709352 -0500
4+
@@ -24,6 +24,7 @@ config("internal_config") {
55
"BORINGSSL_IMPLEMENTATION",
66
"BORINGSSL_NO_STATIC_INITIALIZER",
77
"OPENSSL_SMALL",

chromium-55.0.2883.75-cups22.patch

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
diff -up chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 chromium-52.0.2743.82/printing/backend/print_backend_cups.cc
2+
--- chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 2016-07-22 09:20:15.794340886 -0400
3+
+++ chromium-52.0.2743.82/printing/backend/print_backend_cups.cc 2016-07-22 09:20:26.338261197 -0400
4+
@@ -16,6 +16,7 @@
5+
#include "base/synchronization/lock.h"
6+
#include "base/values.h"
7+
#include "printing/backend/cups_helper.h"
8+
+#include <cups/ppd.h>
9+
#include "printing/backend/print_backend_consts.h"
10+
#include "url/gurl.h"
11+
12+
diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22 chromium-52.0.2743.82/printing/BUILD.gn
13+
--- chromium-52.0.2743.82/printing/BUILD.gn.cups22 2016-07-21 11:27:05.597507544 -0400
14+
+++ chromium-52.0.2743.82/printing/BUILD.gn 2016-07-21 14:36:45.574137758 -0400
15+
@@ -147,12 +147,13 @@ component("printing") {
16+
],
17+
"trim string")
18+
19+
- if (cups_version == "1.6" || cups_version == "1.7") {
20+
+ if (cups_version == "1.6" || cups_version == "1.7" || cups_version == "2.2") {
21+
cflags += [
22+
# CUPS 1.6 deprecated the PPD APIs, but we will stay with this
23+
# API for now as supported Linux and Mac OS'es are still using
24+
# older versions of CUPS. More info: crbug.com/226176
25+
"-Wno-deprecated-declarations",
26+
+ "-D_PPD_DEPRECATED=",
27+
# CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
28+
# below.
29+
]
+12-13
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,30 @@
1-
--- sandbox/linux/BUILD.gn 2016-08-03 06:31:07.000000000 +0200
2-
+++ sandbox/linux/BUILD.gn 2016-08-03 06:31:07.000000000 +0200
3-
@@ -297,12 +297,17 @@
4-
5-
cflags = [
1+
diff -up chromium-55.0.2883.75/sandbox/linux/BUILD.gn.sandboxpie chromium-55.0.2883.75/sandbox/linux/BUILD.gn
2+
--- chromium-55.0.2883.75/sandbox/linux/BUILD.gn.sandboxpie 2016-12-01 18:02:17.000000000 -0500
3+
+++ chromium-55.0.2883.75/sandbox/linux/BUILD.gn 2016-12-12 16:26:06.863426221 -0500
4+
@@ -279,11 +279,17 @@ if (is_linux) {
65
# For ULLONG_MAX
7-
- "-std=gnu99",
8-
+ "-std=gnu99",
6+
"-std=gnu99",
7+
98
+ "-fPIE",
10-
9+
+
1110
# These files have a suspicious comparison.
1211
# TODO fix this and re-enable this warning.
1312
"-Wno-sign-compare",
1413
]
15-
+
14+
1615
+ ldflags = [
1716
+ "-pie",
1817
+ ]
19-
18+
+
2019
import("//build/config/compiler/compiler.gni")
2120
import("//build/config/sanitizers/sanitizers.gni")
22-
@@ -313,7 +317,7 @@
21+
if (is_component_build || using_sanitizer) {
22+
@@ -293,7 +299,7 @@ if (is_linux) {
2323
# other flags that executable_config might have.
2424
configs -= [ "//build/config:executable_config" ]
2525
if (!use_gold) {
2626
- ldflags = [ "-Wl,--disable-new-dtags" ]
2727
+ ldflags += [ "-Wl,--disable-new-dtags" ]
2828
}
2929
}
30-
31-
30+

chromium-56.0.2924.59-arm-icu-fix.patch

-12
This file was deleted.

chromium-59.0.3071.29-i686-ld-memory-tricks.patch

-12
This file was deleted.

chromium-59.0.3071.29-nullfix.patch

-19
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff -up chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.ldmemory chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn
2+
--- chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn.ldmemory 2017-06-07 15:37:09.436616113 -0400
3+
+++ chromium-59.0.3071.86/build/toolchain/linux/BUILD.gn 2017-06-07 15:38:04.508519102 -0400
4+
@@ -93,7 +93,7 @@ gcc_toolchain("x86") {
5+
nm = "nm"
6+
ar = "ar"
7+
ld = cxx
8+
- extra_cppflags = "-fno-delete-null-pointer-checks"
9+
+ extra_cppflags = "-fno-delete-null-pointer-checks -g1"
10+
11+
# Output linker map files for binary size analysis.
12+
enable_linker_map = true
+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
diff -up chromium-59.0.3071.86/build/config/clang/clang.gni.system-clang chromium-59.0.3071.86/build/config/clang/clang.gni
2+
--- chromium-59.0.3071.86/build/config/clang/clang.gni.system-clang 2017-06-11 20:57:07.327949687 -0400
3+
+++ chromium-59.0.3071.86/build/config/clang/clang.gni 2017-06-11 20:57:24.085620826 -0400
4+
@@ -9,5 +9,5 @@ declare_args() {
5+
# coding guidelines, etc. Only used when compiling with Clang.
6+
clang_use_chrome_plugins = is_clang && !is_nacl && !use_xcode_clang
7+
8+
- clang_base_path = "//third_party/llvm-build/Release+Asserts"
9+
+ clang_base_path = "/usr"
10+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
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
2+
--- chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h.pathfix 2017-08-25 15:29:12.143242471 -0400
3+
+++ chromium-60.0.3112.113/third_party/ffmpeg/libavutil/timer.h 2017-08-25 15:29:36.941835865 -0400
4+
@@ -39,13 +39,13 @@
5+
#include "log.h"
6+
7+
#if ARCH_AARCH64
8+
-# include "aarch64/timer.h"
9+
+# include "libavutil/aarch64/timer.h"
10+
#elif ARCH_ARM
11+
-# include "arm/timer.h"
12+
+# include "libavutil/arm/timer.h"
13+
#elif ARCH_PPC
14+
-# include "ppc/timer.h"
15+
+# include "libavutil/ppc/timer.h"
16+
#elif ARCH_X86
17+
-# include "x86/timer.h"
18+
+# include "libavutil/x86/timer.h"
19+
#endif
20+
21+
#if !defined(AV_READ_TIME)

chromium-60.0.3112.7-last-commit-position.patch

-28
This file was deleted.

0 commit comments

Comments
 (0)