Merge branch 'master' into f24

epel8
Tom Callaway 8 years ago
commit 0bdd4ee3c5

3
.gitignore vendored

@ -11,3 +11,6 @@
/chromium-54.0.2840.59-clean.tar.xz /chromium-54.0.2840.59-clean.tar.xz
/chromium-54.0.2840.71-clean.tar.xz /chromium-54.0.2840.71-clean.tar.xz
/chromium-54.0.2840.90-clean.tar.xz /chromium-54.0.2840.90-clean.tar.xz
/chromium-54.0.2840.100.tar.xz
/chromium-54.0.2840.100-clean.tar.xz
/chromium-55.0.2883.75-clean.tar.xz

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

@ -0,0 +1,29 @@
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
--- chromium-52.0.2743.82/printing/backend/print_backend_cups.cc.cups22 2016-07-22 09:20:15.794340886 -0400
+++ chromium-52.0.2743.82/printing/backend/print_backend_cups.cc 2016-07-22 09:20:26.338261197 -0400
@@ -16,6 +16,7 @@
#include "base/synchronization/lock.h"
#include "base/values.h"
#include "printing/backend/cups_helper.h"
+#include <cups/ppd.h>
#include "printing/backend/print_backend_consts.h"
#include "url/gurl.h"
diff -up chromium-52.0.2743.82/printing/BUILD.gn.cups22 chromium-52.0.2743.82/printing/BUILD.gn
--- chromium-52.0.2743.82/printing/BUILD.gn.cups22 2016-07-21 11:27:05.597507544 -0400
+++ chromium-52.0.2743.82/printing/BUILD.gn 2016-07-21 14:36:45.574137758 -0400
@@ -147,12 +147,13 @@ component("printing") {
],
"trim string")
- if (cups_version == "1.6" || cups_version == "1.7") {
+ if (cups_version == "1.6" || cups_version == "1.7" || cups_version == "2.2") {
cflags += [
# CUPS 1.6 deprecated the PPD APIs, but we will stay with this
# API for now as supported Linux and Mac OS'es are still using
# older versions of CUPS. More info: crbug.com/226176
"-Wno-deprecated-declarations",
+ "-D_PPD_DEPRECATED=",
# CUPS 1.7 deprecates httpConnectEncrypt(), see the mac section
# below.
]

@ -0,0 +1,354 @@
diff -up chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc
--- chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 2016-12-01 18:03:09.000000000 -0500
+++ chromium-55.0.2883.75/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc 2016-12-12 15:24:01.171747843 -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-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl
--- chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 2016-12-01 18:03:16.000000000 -0500
+++ chromium-55.0.2883.75/third_party/webgl/src/specs/latest/2.0/webgl2.idl 2016-12-12 15:24:01.209747655 -0500
@@ -264,7 +264,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-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h
--- chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 2016-12-12 15:24:01.210747650 -0500
+++ chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.h 2016-12-12 15:26:23.176045106 -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-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl
--- chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 2016-12-01 18:02:30.000000000 -0500
+++ chromium-55.0.2883.75/third_party/WebKit/Source/core/dom/NodeFilter.idl 2016-12-12 15:24:01.211747645 -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-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl
--- chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 2016-12-01 18:02:32.000000000 -0500
+++ chromium-55.0.2883.75/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl 2016-12-12 15:24:01.214747631 -0500
@@ -239,7 +239,7 @@ typedef long long GLint64;
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;
@@ -282,7 +282,7 @@ typedef long long GLint64;
const GLenum MAX_ELEMENT_INDEX = 0x8D6B;
const GLenum NUM_SAMPLE_COUNTS = 0x9380;
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;

@ -0,0 +1,15 @@
diff -up chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
--- chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp.morealiases 2016-12-12 15:53:06.545149310 -0500
+++ chromium-55.0.2883.75/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp 2016-12-12 15:55:25.808468122 -0500
@@ -213,7 +213,11 @@ void TextCodecICU::registerEncodingNames
registrar("iso_8859-6", "ISO-8859-6");
registrar("iso_8859-7", "ISO-8859-7");
registrar("iso_8859-8", "ISO-8859-8");
+ registrar("iso_8859-8-I", "ISO-8859-8-I");
registrar("iso_8859-9", "windows-1254");
+ registrar("iso_8859-10", "ISO-8859-10");
+ registrar("iso_8859-13", "ISO-8859-13");
+ registrar("iso_8859-14", "ISO-8859-14");
registrar("iso_8859-15", "ISO-8859-15");
registrar("koi8_r", "KOI8-R");
registrar("x-cp1253", "windows-1253");

@ -0,0 +1,30 @@
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" ]
}
}

@ -0,0 +1,12 @@
diff -up chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h
--- chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h.use_system_harfbuzz 2016-12-12 16:09:03.873466669 -0500
+++ chromium-55.0.2883.75/ui/gfx/render_text_harfbuzz.h 2016-12-12 16:09:57.507204326 -0500
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/memory/scoped_vector.h"
-#include "third_party/harfbuzz-ng/src/hb.h"
+#include <harfbuzz/hb.h>
#include "third_party/icu/source/common/unicode/ubidi.h"
#include "third_party/icu/source/common/unicode/uscript.h"
#include "ui/gfx/render_text.h"

@ -1,9 +1,6 @@
# NEVER EVER EVER turn this on in official builds # NEVER EVER EVER turn this on in official builds
%global freeworld 0 %global freeworld 0
# gn is the new new new buildtool. *sigh*
%global use_gn 1
# Leave this alone, please. # Leave this alone, please.
%global target out/Release %global target out/Release
@ -92,20 +89,19 @@ BuildRequires: libicu-devel >= 5.4
%global default_client_secret miEreAep8nuvTdvLums6qyLK %global default_client_secret miEreAep8nuvTdvLums6qyLK
%global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com
%global majorversion 55
Name: chromium%{chromium_channel} Name: chromium%{chromium_channel}
Version: 54.0.2840.90 Version: %{majorversion}.0.2883.75
Release: 3%{?dist} Release: 1%{?dist}
Summary: A WebKit (Blink) powered web browser Summary: A WebKit (Blink) powered web browser
Url: http://www.chromium.org/Home Url: http://www.chromium.org/Home
License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2)
### Chromium Fedora Patches ### ### Chromium Fedora Patches ###
Patch0: chromium-54.0.2840.59-gcc5.patch Patch0: chromium-55.0.2883.75-gcc5.patch
Patch1: chromium-45.0.2454.101-linux-path-max.patch Patch1: chromium-45.0.2454.101-linux-path-max.patch
Patch2: chromium-50.0.2661.86-addrfix.patch Patch2: chromium-55.0.2883.75-addrfix.patch
# Google patched their bundled copy of icu 54 to include API functionality that wasn't added until 55.
# :P
Patch3: chromium-52.0.2723.2-system-icu-54-does-not-have-detectHostTimeZone.patch
Patch4: chromium-46.0.2490.71-notest.patch Patch4: chromium-46.0.2490.71-notest.patch
# In file included from ../linux/directory.c:21: # In file included from ../linux/directory.c:21:
# In file included from ../../../../native_client/src/nonsfi/linux/abi_conversion.h:20: # In file included from ../../../../native_client/src/nonsfi/linux/abi_conversion.h:20:
@ -118,19 +114,15 @@ Patch6: chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch
Patch7: chromium-47.0.2526.80-nacl-ignore-broken-fd-counter.patch 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) # 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 Patch9: chromium-48.0.2564.116-libusb_interrupt_event_handler.patch
# Fix re2 unbundle gyp
Patch10: chromium-50.0.2661.94-unbundle-re2-fix.patch
# Ignore deprecations in cups 2.2 # Ignore deprecations in cups 2.2
# https://bugs.chromium.org/p/chromium/issues/detail?id=622493 # https://bugs.chromium.org/p/chromium/issues/detail?id=622493
Patch12: chromium-52.0.2743.82-cups22.patch Patch12: chromium-55.0.2883.75-cups22.patch
# Add ICU Text Codec aliases (from openSUSE via Russian Fedora) # Add ICU Text Codec aliases (from openSUSE via Russian Fedora)
Patch14: chromium-52.0.2743.82-more-codec-aliases.patch Patch14: chromium-55.0.2883.75-more-codec-aliases.patch
# Use PIE in the Linux sandbox (from openSUSE via Russian Fedora) # Use PIE in the Linux sandbox (from openSUSE via Russian Fedora)
Patch15: chromium-52.0.2743.82-sandbox-pie.patch Patch15: chromium-55.0.2883.75-sandbox-pie.patch
# Enable ARM CPU detection for webrtc (from archlinux via Russian Fedora) # Enable ARM CPU detection for webrtc (from archlinux via Russian Fedora)
Patch16: chromium-52.0.2743.82-arm-webrtc.patch Patch16: chromium-52.0.2743.82-arm-webrtc.patch
# Do not force -m32 in icu compile on ARM (from archlinux via Russian Fedora)
Patch17: chromium-54.0.2840.59-arm-icu-fix.patch
# Use /etc/chromium for master_prefs # Use /etc/chromium for master_prefs
Patch18: chromium-52.0.2743.82-master-prefs-path.patch Patch18: chromium-52.0.2743.82-master-prefs-path.patch
# Disable MADV_FREE (if set by glibc) # Disable MADV_FREE (if set by glibc)
@ -143,9 +135,6 @@ Patch20: chromium-54.0.2840.59-gn-system.patch
Patch21: chromium-53.0.2785.92-last-commit-position.patch Patch21: chromium-53.0.2785.92-last-commit-position.patch
# Fix issue where timespec is not defined when sys/stat.h is included. # Fix issue where timespec is not defined when sys/stat.h is included.
Patch22: chromium-53.0.2785.92-boringssl-time-fix.patch Patch22: chromium-53.0.2785.92-boringssl-time-fix.patch
# Fix gn build on Linux
# https://crrev.com/415208
Patch23: chromium-53.0.2785.101-crrev-415028.patch
# I wouldn't have to do this if there was a standard way to append extra compiler flags # I wouldn't have to do this if there was a standard way to append extra compiler flags
Patch24: chromium-54.0.2840.59-nullfix.patch Patch24: chromium-54.0.2840.59-nullfix.patch
# Add explicit includedir for jpeglib.h # Add explicit includedir for jpeglib.h
@ -162,7 +151,7 @@ Patch28: chromium-54.0.2840.90-aura-browser-link-to-snapshot.patch
### Chromium Tests Patches ### ### Chromium Tests Patches ###
Patch100: chromium-46.0.2490.86-use_system_opus.patch Patch100: chromium-46.0.2490.86-use_system_opus.patch
Patch101: chromium-52.0.2723.2-use_system_harfbuzz.patch Patch101: chromium-55.0.2883.75-use_system_harfbuzz.patch
# Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # Use chromium-latest.py to generate clean tarball from released build tarballs, found here:
# http://build.chromium.org/buildbot/official/ # http://build.chromium.org/buildbot/official/
@ -446,7 +435,7 @@ Chromium is an open-source web browser, powered by WebKit (Blink).
%if 0%{?shared} %if 0%{?shared}
%package libs %package libs
Summary: Shared libraries used by chromium (and chrome-remote-desktop) Summary: Shared libraries used by chromium (and chrome-remote-desktop)
Requires: chromium-libs-media%{_isa} = %{version} Requires: chromium-libs-media%{_isa} >= %{majorversion}
%description libs %description libs
Shared libraries used by chromium (and chrome-remote-desktop). Shared libraries used by chromium (and chrome-remote-desktop).
@ -516,23 +505,19 @@ members of the Chromium and WebDriver teams.
%patch0 -p1 -b .gcc5 %patch0 -p1 -b .gcc5
%patch1 -p1 -b .pathmax %patch1 -p1 -b .pathmax
%patch2 -p1 -b .addrfix %patch2 -p1 -b .addrfix
%patch3 -p1 -b .system-icu
%patch4 -p1 -b .notest %patch4 -p1 -b .notest
%patch6 -p1 -b .gnu-inline # %%patch6 -p1 -b .gnu-inline
%patch7 -p1 -b .ignore-fd-count %patch7 -p1 -b .ignore-fd-count
%patch9 -p1 -b .modern-libusbx %patch9 -p1 -b .modern-libusbx
%patch10 -p1 -b .unbundle-fix
%patch12 -p1 -b .cups22 %patch12 -p1 -b .cups22
%patch14 -p1 -b .morealiases %patch14 -p1 -b .morealiases
%patch15 -p1 -b .sandboxpie %patch15 -p1 -b .sandboxpie
%patch16 -p1 -b .armwebrtc %patch16 -p1 -b .armwebrtc
%patch17 -p1 -b .armfix
%patch18 -p1 -b .etc %patch18 -p1 -b .etc
%patch19 -p1 -b .madv_free %patch19 -p1 -b .madv_free
%patch20 -p1 -b .gnsystem %patch20 -p1 -b .gnsystem
%patch21 -p1 -b .lastcommit %patch21 -p1 -b .lastcommit
%patch22 -p1 -b .timefix %patch22 -p1 -b .timefix
%patch23 -p1 -b .415208
%patch24 -p1 -b .nullfix %patch24 -p1 -b .nullfix
%patch25 -p1 -b .jpegfix %patch25 -p1 -b .jpegfix
%patch26 -p1 -b .ldmemory %patch26 -p1 -b .ldmemory
@ -681,140 +666,6 @@ CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=false'
CHROMIUM_BROWSER_GN_DEFINES+=' treat_warnings_as_errors=false' CHROMIUM_BROWSER_GN_DEFINES+=' treat_warnings_as_errors=false'
export CHROMIUM_BROWSER_GN_DEFINES export CHROMIUM_BROWSER_GN_DEFINES
export CHROMIUM_BROWSER_GYP_DEFINES="\
%ifarch x86_64
-Dtarget_arch=x64 \
-Dsystem_libdir=lib64 \
%endif
-Dgoogle_api_key="%{api_key}" \
-Dgoogle_default_client_id="%{default_client_id}" \
-Dgoogle_default_client_secret="%{default_client_secret}" \
%if 0%{?asan}
-Dasan=1 \
-Dclang=1 \
-Dhost_clang=1 \
-Dclang_dynlib_flags="" \
-Dclang_plugin_args="" \
-Dclang_chrome_plugins_flags="" \
%else
-Dclang=0 \
-Dhost_clang=0 \
%endif
-Ddisable_glibc=1 \
-Dlinux_fpic=1 \
-Ddisable_sse2=1 \
%if 0%{?nonacl}
-Ddisable_nacl=1 \
%else
-Ddisable_newlib_untar=1 \
-Ddisable_pnacl_untar=1 \
-Dpnacl_newlib_toolchain=out/Release/gen/sdk/linux_x86/pnacl_newlib/ \
-Dpnacl_translator_dir=/usr/pnacl_translator \
%endif
\
-Duse_gconf=0 \
-Duse_gio=1 \
-Duse_gnome_keyring=1 \
-Duse_pulseaudio=1 \
-Duse_system_bzip2=1 \
-Duse_system_flac=1 \
%if 0%{?bundleharfbuzz}
-Duse_system_harfbuzz=0 \
%else
-Duse_system_harfbuzz=1 \
%endif
%if 0%{?bundleicu}
-Duse_system_icu=0 \
%else
-Duse_system_icu=1 \
%endif
-Dicu_use_data_file_flag=1 \
-Duse_system_libevent=0 \
-Duse_system_libjpeg=1 \
-Duse_system_libpng=1 \
%if %{bundlelibusbx}
-Duse_system_libusb=0 \
%else
-Duse_system_libusb=1 \
%endif
-Duse_system_libxml=1 \
-Duse_system_libxslt=1 \
%if %{bundleopus}
-Duse_system_opus=0 \
%else
-Duse_system_opus=1 \
%endif
-Duse_system_protobuf=0 \
%if 0%{?bundlere2}
%else
-Duse_system_re2=1 \
%endif
-Duse_system_libsrtp=0 \
-Duse_system_xdg_utils=1 \
-Duse_system_yasm=1 \
-Duse_system_zlib=0 \
\
-Dlinux_link_libspeechd=1 \
-Dlinux_link_gnome_keyring=1 \
-Dlinux_link_gsettings=1 \
-Dlinux_link_libpci=1 \
-Dlinux_link_libgps=0 \
-Dlinux_sandbox_path=%{chromium_path}/chrome-sandbox \
-Dlinux_sandbox_chrome_path=%{chromium_path}/chromium-browser \
-Dlinux_strip_binary=1 \
-Dlinux_use_bundled_binutils=0 \
-Dlinux_use_bundled_gold=0 \
-Dlinux_use_gold_binary=0 \
-Dlinux_use_gold_flags=0 \
-Dlinux_use_libgps=0 \
\
-Dusb_ids_path=/usr/share/hwdata/usb.ids \
%if 0%{?fedora}
-Dlibspeechd_h_prefix=speech-dispatcher/ \
%endif
\
%if %{freeworld}
-Dffmpeg_branding=ChromeOS \
-Dproprietary_codecs=1 \
%else
-Dffmpeg_branding=Chromium \
-Dproprietary_codecs=0 \
%endif
%if 0%{?shared}
-Dbuild_ffmpegsumo=1 \
-Dffmpeg_component=shared_library \
%else
-Dffmpeg_component=static_library \
%endif
\
-Dno_strict_aliasing=1 \
-Dv8_no_strict_aliasing=1 \
\
-Dremove_webcore_debug_symbols=1 \
-Dlogging_like_official_build=1 \
-Denable_hotwording=0 \
-Duse_aura=1 \
-Denable_hidpi=1 \
-Denable_touch_ui=1 \
-Denable_pepper_cdms=1 \
-Denable_webrtc=1 \
-Denable_widevine=1 \
%if 0%{gtk3}
-Duse_gtk3=1 \
%else
-Dtoolkit_uses_gtk=0 \
%endif
%if 0
-Dbuildtype=Official \
%endif
\
%if 0%{?shared}
-Dcomponent=shared_library \
%endif
-Duse_sysroot=0 \
-Drelease_extra_cflags="-fno-delete-null-pointer-checks" \
-Dwerror= -Dsysroot="
# Remove most of the bundled libraries. Libraries specified below (taken from # Remove most of the bundled libraries. Libraries specified below (taken from
# Gentoo's Chromium ebuild) are the libraries that needs to be preserved. # Gentoo's Chromium ebuild) are the libraries that needs to be preserved.
build/linux/unbundle/remove_bundled_libraries.py \ build/linux/unbundle/remove_bundled_libraries.py \
@ -843,7 +694,6 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/snappy' \ 'third_party/snappy' \
'third_party/speech-dispatcher' \ 'third_party/speech-dispatcher' \
'third_party/usb_ids' \ 'third_party/usb_ids' \
'third_party/woff2' \
'third_party/xdg-utils' \ 'third_party/xdg-utils' \
'third_party/yasm' \ 'third_party/yasm' \
'third_party/zlib' \ 'third_party/zlib' \
@ -887,8 +737,8 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \
'third_party/ced' \ 'third_party/ced' \
'third_party/cld_2' \ 'third_party/cld_2' \
'third_party/cld_3' \
'third_party/cros_system_api' \ 'third_party/cros_system_api' \
'third_party/cython/python_flags.py' \
'third_party/devscripts' \ 'third_party/devscripts' \
'third_party/dom_distiller_js' \ 'third_party/dom_distiller_js' \
'third_party/expat' \ 'third_party/expat' \
@ -908,6 +758,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/libjingle' \ 'third_party/libjingle' \
'third_party/libphonenumber' \ 'third_party/libphonenumber' \
'third_party/libsecret' \ 'third_party/libsecret' \
'third_party/libsrtp' \
'third_party/libudev' \ 'third_party/libudev' \
'third_party/libusb' \ 'third_party/libusb' \
'third_party/libvpx' \ 'third_party/libvpx' \
@ -934,6 +785,8 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/pdfium/third_party/lcms2-2.6' \ 'third_party/pdfium/third_party/lcms2-2.6' \
'third_party/pdfium/third_party/libjpeg' \ 'third_party/pdfium/third_party/libjpeg' \
'third_party/pdfium/third_party/libopenjpeg20' \ 'third_party/pdfium/third_party/libopenjpeg20' \
'third_party/pdfium/third_party/libpng16' \
'third_party/pdfium/third_party/libtiff' \
'third_party/pdfium/third_party/zlib_v128' \ 'third_party/pdfium/third_party/zlib_v128' \
'third_party/polymer' \ 'third_party/polymer' \
'third_party/protobuf' \ 'third_party/protobuf' \
@ -952,6 +805,7 @@ build/linux/unbundle/remove_bundled_libraries.py \
'third_party/webdriver' \ 'third_party/webdriver' \
'third_party/webrtc' \ 'third_party/webrtc' \
'third_party/widevine' \ 'third_party/widevine' \
'third_party/woff2' \
'third_party/x86inc' \ 'third_party/x86inc' \
'third_party/zlib/google' \ 'third_party/zlib/google' \
'url/third_party/mozilla' \ 'url/third_party/mozilla' \
@ -970,7 +824,6 @@ sed -i 's|/opt/google/chrome-remote-desktop|%{crd_path}|g' remoting/host/setup/d
export PATH=$PATH:%{_builddir}/depot_tools export PATH=$PATH:%{_builddir}/depot_tools
%if %{use_gn}
build/linux/unbundle/replace_gn_files.py --system-libraries \ build/linux/unbundle/replace_gn_files.py --system-libraries \
flac \ flac \
%if 0%{?bundleharfbuzz} %if 0%{?bundleharfbuzz}
@ -1002,19 +855,6 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \
tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_BROWSER_GN_DEFINES" tools/gn/bootstrap/bootstrap.py -v --gn-gen-args "$CHROMIUM_BROWSER_GN_DEFINES"
%{target}/gn gen --args="$CHROMIUM_BROWSER_GN_DEFINES" %{target} %{target}/gn gen --args="$CHROMIUM_BROWSER_GN_DEFINES" %{target}
%else
# Update gyp files according to our configuration
# If you will change something in the configuration please update it
# for build/gyp_chromium as well (and vice versa).
build/linux/unbundle/replace_gyp_files.py $CHROMIUM_BROWSER_GYP_DEFINES
build/gyp_chromium \
--depth . \
%if 0%{?asan}
-Drelease_extra_cflags="-O1 -fno-inline-functions -fno-inline" \
%endif
$CHROMIUM_BROWSER_GYP_DEFINES
%endif
%if %{bundlelibusbx} %if %{bundlelibusbx}
# no hackity hack hack # no hackity hack hack
@ -1717,6 +1557,12 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt
%{chromium_path}/chromedriver %{chromium_path}/chromedriver
%changelog %changelog
* Mon Dec 12 2016 Tom Callaway <spot@fedoraproject.org> 55.0.2883.75-1
- update to 55.0.2883.75
* Fri Dec 2 2016 Tom Callaway <spot@fedoraproject.org> 54.0.2840.100-1
- update to 54.0.2840.100
* Fri Nov 4 2016 Tom Callaway <spot@fedoraproject.org> 54.0.2840.90-3 * Fri Nov 4 2016 Tom Callaway <spot@fedoraproject.org> 54.0.2840.90-3
- when use_aura is on, chrome/browser needs to link to ui/snapshot - when use_aura is on, chrome/browser needs to link to ui/snapshot

@ -174,8 +174,6 @@ other_files=" BUILD.gn \
COPYING.LGPLv3 \ COPYING.LGPLv3 \
CREDITS \ CREDITS \
CREDITS.chromium \ CREDITS.chromium \
ffmpeg.gyp \
ffmpeg_generated.gypi \
ffmpeg_generated.gni \ ffmpeg_generated.gni \
ffmpeg_options.gni \ ffmpeg_options.gni \
ffmpegsumo.ver \ ffmpegsumo.ver \

@ -1,3 +1,3 @@
49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz SHA512 (chromium-55.0.2883.75-clean.tar.xz) = 51da876c2c964fe2338c43e2b4a99a9ddbf44ffa1e3464f6585fa5ef6eada72489dd4cab89f782b1cf2a407c383a42457c63f6b9c4084bb4fe06caf914efde72
8280c0644492bac9f59f4e25ed11d309 policy_templates.zip SHA512 (policy_templates.zip) = a297c5a6753e5607cb5d440b75cbc1c6153d09118d6401683aa2bca73eef7145c8964569fc12a0106cf1d2b9f93af32c1b91d25c742d878d30385498668fa0db
c4e24c20c266482941ecd75fd786492e chromium-54.0.2840.90-clean.tar.xz SHA512 (depot_tools.git-master.tar.gz) = d3d6a1873b2b0296a8cd99e0d8d2e629a17b1808934b4972556168f8b4ccea60577ebaeab4445baf15afb1b04080808db59a832a5b61d247bd48da14fa6acf03

Loading…
Cancel
Save