diff --git a/.gitignore b/.gitignore index ef5a154..3ec75f8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /chromium-53.0.2785.113-clean.tar.xz /chromium-53.0.2785.116-clean.tar.xz /chromium-53.0.2785.143-clean.tar.xz +/chromium-54.0.2840.59-clean.tar.xz diff --git a/chromium-54.0.2840.59-arm-icu-fix.patch b/chromium-54.0.2840.59-arm-icu-fix.patch new file mode 100644 index 0000000..671ff38 --- /dev/null +++ b/chromium-54.0.2840.59-arm-icu-fix.patch @@ -0,0 +1,12 @@ +diff -up chromium-54.0.2840.59/third_party/icu/icu.gyp.armfix chromium-54.0.2840.59/third_party/icu/icu.gyp +--- chromium-54.0.2840.59/third_party/icu/icu.gyp.armfix 2016-10-13 14:57:47.148707100 -0400 ++++ chromium-54.0.2840.59/third_party/icu/icu.gyp 2016-10-13 14:59:24.294837176 -0400 +@@ -44,7 +44,7 @@ + }], + ['(OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris" \ + or OS=="netbsd" or OS=="mac" or OS=="android" or OS=="qnx") and \ +- (target_arch=="arm" or target_arch=="ia32" or \ ++ (target_arch=="ia32" or \ + target_arch=="mipsel" or target_arch=="mips")', { + 'target_conditions': [ + ['_toolset=="host"', { diff --git a/chromium-54.0.2840.59-gcc5.patch b/chromium-54.0.2840.59-gcc5.patch new file mode 100644 index 0000000..33b9ffa --- /dev/null +++ b/chromium-54.0.2840.59-gcc5.patch @@ -0,0 +1,354 @@ +diff -up chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc +--- chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc.gcc5 2016-10-12 15:05:10.000000000 -0400 ++++ chromium-54.0.2840.59/third_party/cld_2/src/internal/cld_generated_cjk_uni_prop_80.cc 2016-10-13 14:45:19.769110162 -0400 +@@ -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-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl +--- chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl.gcc5 2016-10-12 15:05:45.000000000 -0400 ++++ chromium-54.0.2840.59/third_party/webgl/src/specs/latest/2.0/webgl2.idl 2016-10-13 14:45:19.770110142 -0400 +@@ -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-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h +--- chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h.gcc5 2016-10-13 14:45:19.771110122 -0400 ++++ chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.h 2016-10-13 14:54:50.328113956 -0400 +@@ -51,7 +51,7 @@ public: + * 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-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl +--- chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl.gcc5 2016-10-12 15:03:13.000000000 -0400 ++++ chromium-54.0.2840.59/third_party/WebKit/Source/core/dom/NodeFilter.idl 2016-10-13 14:45:19.771110122 -0400 +@@ -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-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl +--- chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl.gcc5 2016-10-12 15:03:13.000000000 -0400 ++++ chromium-54.0.2840.59/third_party/WebKit/Source/modules/webgl/WebGL2RenderingContextBase.idl 2016-10-13 14:45:19.772110102 -0400 +@@ -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; diff --git a/chromium-54.0.2840.59-gn-system.patch b/chromium-54.0.2840.59-gn-system.patch new file mode 100644 index 0000000..fc855ad --- /dev/null +++ b/chromium-54.0.2840.59-gn-system.patch @@ -0,0 +1,223 @@ +diff -up chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn +--- chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn.gnsystem 2016-10-13 16:06:00.464796742 -0400 ++++ chromium-54.0.2840.59/build/linux/unbundle/libjpeg.gn 2016-10-13 16:06:08.976631824 -0400 +@@ -16,6 +16,10 @@ source_set("libjpeg") { + libs = [ "jpeg" ] + } + ++config("system_libjpeg") { ++ defines = [ "USE_SYSTEM_LIBJPEG=1" ] ++} ++ + source_set("simd") { + } + +diff -up chromium-54.0.2840.59/build/linux/unbundle/libusb.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/libusb.gn +--- chromium-54.0.2840.59/build/linux/unbundle/libusb.gn.gnsystem 2016-10-13 15:47:48.147891525 -0400 ++++ chromium-54.0.2840.59/build/linux/unbundle/libusb.gn 2016-10-13 15:47:48.147891525 -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-54.0.2840.59/build/linux/unbundle/opus.gn.gnsystem chromium-54.0.2840.59/build/linux/unbundle/opus.gn +--- chromium-54.0.2840.59/build/linux/unbundle/opus.gn.gnsystem 2016-10-13 15:47:48.147891525 -0400 ++++ chromium-54.0.2840.59/build/linux/unbundle/opus.gn 2016-10-13 15:47:48.147891525 -0400 +@@ -0,0 +1,161 @@ ++# 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", ++ ] ++} ++ +diff -up chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py.gnsystem chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py +--- chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py.gnsystem 2016-10-12 15:02:53.000000000 -0400 ++++ chromium-54.0.2840.59/build/linux/unbundle/replace_gn_files.py 2016-10-13 15:47:48.147891525 -0400 +@@ -23,10 +23,12 @@ 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', + 'libxslt': 'third_party/libxslt/BUILD.gn', ++ 'opus': 'third_party/opus/BUILD.gn', + 're2': 'third_party/re2/BUILD.gn', + 'snappy': 'third_party/snappy/BUILD.gn', + 'yasm': 'third_party/yasm/yasm_assemble.gni', diff --git a/chromium-54.0.2840.59-jpeg-include-dir.patch b/chromium-54.0.2840.59-jpeg-include-dir.patch new file mode 100644 index 0000000..f96a56c --- /dev/null +++ b/chromium-54.0.2840.59-jpeg-include-dir.patch @@ -0,0 +1,11 @@ +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") { diff --git a/chromium-54.0.2840.59-nullfix.patch b/chromium-54.0.2840.59-nullfix.patch new file mode 100644 index 0000000..53e2db1 --- /dev/null +++ b/chromium-54.0.2840.59-nullfix.patch @@ -0,0 +1,35 @@ +diff -up chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn +--- chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn.nullfix 2016-10-13 16:49:26.844221023 -0400 ++++ chromium-54.0.2840.59/build/toolchain/linux/BUILD.gn 2016-10-13 16:50:49.882605484 -0400 +@@ -31,6 +31,7 @@ gcc_toolchain("arm") { + ld = cxx + readelf = "${toolprefix}readelf" + nm = "${toolprefix}nm" ++ extra_cppflags = "-fno-delete-null-pointer-checks" + + toolchain_args = { + current_cpu = "arm" +@@ -70,6 +71,7 @@ gcc_toolchain("x86") { + nm = "nm" + ar = "ar" + ld = cxx ++ extra_cppflags = "-fno-delete-null-pointer-checks" + + toolchain_args = { + current_cpu = "x86" +@@ -109,6 +111,7 @@ gcc_toolchain("x64") { + nm = "nm" + ar = "ar" + ld = cxx ++ extra_cppflags = "-fno-delete-null-pointer-checks" + + toolchain_args = { + current_cpu = "x64" +@@ -131,6 +134,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.spec b/chromium.spec index 7c59f58..2fef2a6 100644 --- a/chromium.spec +++ b/chromium.spec @@ -2,7 +2,7 @@ %global freeworld 0 # gn is the new new new buildtool. *sigh* -%global use_gn 0 +%global use_gn 1 # Leave this alone, please. %global target out/Release @@ -17,8 +17,9 @@ # We don't want any libs in these directories to generate Provides # Requires is trickier. + %global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so -%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libblink_common|libblink_platform|libblink_web|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture|libcc_blink|libcc_ipc|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libcloud_policy_proto_generated_compile|libcloud_policy_proto|libcompositor|libcontent|libcrcrypto|libdbus|libdevice_battery|libdevice_bluetooth|libdevice_core|libdevice_event_log_component|libdevice_gamepad|libdevice_power_save_blocker|libdevice_vibration|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents_platform|libevents|libevents_x|libffmpeg|libgcm_driver_common|libgcm|libgesture_detection|libgfx_geometry|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx_range|libgfx|libgfx_vector_icons|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|libipc_mojo|libipc|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmessage_center|libmidi|libmodules|libmojo_common_lib|libmojo_geometry_lib|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc_component|libplatform_handle|libpolicy_component|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|libsandbox_services|libscheduler|libseccomp_bpf_helpers|libseccomp_bpf|libsessions_content|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstorage_common|libstorage|libsuid_sandbox_client|libsurface|libsync_core|libsync_proto|libtracing|libtranslator|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_touch_selection|liburl_ipc|liburl_lib|liburl_matcher|libuser_prefs|libv8|libviews|libwallpaper|libwebcore_shared|libwebdata_common|libweb_dialogs|libwebview|libwm|libwtf|libx11_events_platform +%global privlibs libaccessibility|libaura_extra|libaura|libbase_i18n|libbase|libblink_common|libblink_core|libblink_modules|libblink_platform|libblink_web|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture|libcc_blink|libcc_ipc|libcc_proto|libcc|libcc_surfaces|libchromium_sqlite3|libcloud_policy_proto_generated_compile|libcloud_policy_proto|libcommon|libcompositor|libcontent|libcrcrypto|libdbus|libdevice_battery|libdevice_core|libdevice_event_log|libdevice_gamepad|libdevice_geolocation|libdevices|libdevice_vibration|libdisplay_compositor|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libEGL|libevents_base|libevents_devices_x11|libevents_ipc|libevents_ozone_layout|libevents|libevents_x|libffmpeg|libfont_service_library|libgcm|libgeometry|libgesture_detection|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_ipc|libgfx|libgfx_x11|libgin|libgles2_c_lib|libgles2_implementation|libgles2_utils|libGLESv2|libgl_init|libgl_wrapper|libgpu|libgtk2ui|libicui18n|libicuuc|libipc|libkeyboard|libkeyboard_with_content|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|libmedia_blink|libmedia_gpu|libmedia|libmemory_coordinator_browswer|libmemory_coordinator_child|libmemory_coordinator_common|libmessage_center|libmidi|libmojo_blink_lib|libmojo_common_lib|libmojo_ime_lib|libmojo_public_system|libmojo_system_impl|libnative_theme|libnet|libnet_with_v8|libonc|libplatform|libpolicy_component|libpolicy_proto|libpower_save_blocker|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libprotobuf_lite|libproxy_config|librange|libsandbox_services|libseccomp_bpf|libsessions|libshared_memory_support|libshell_dialogs|libskia|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstub_window|libsuid_sandbox_client|libsurface|libtracing|libtranslator|libui_base_ime|libui_base|libui_base_x|libui_data_pack|libui_library|libui_touch_selection|libui_views_mus_lib|liburl_ipc|liburl_matcher|liburl|libuser_prefs|libv8|libviews|libwebdata_common|libweb_dialogs|libwebview|libwm|libwtf|libx11_events_platform|libx11_window %global __requires_exclude ^(%{privlibs})\\.so # Try to not use the Xvfb as it is slow.. @@ -78,7 +79,7 @@ BuildRequires: libicu-devel >= 5.4 %global bundleharfbuzz 1 %else %global bundleharfbuzz 0 -%global bundleopus 0 +%global bundleopus 1 %global bundlelibusbx 0 %endif @@ -92,14 +93,14 @@ BuildRequires: libicu-devel >= 5.4 %global chromoting_client_id 449907151817-8vnlfih032ni8c4jjps9int9t86k546t.apps.googleusercontent.com Name: chromium%{chromium_channel} -Version: 53.0.2785.143 +Version: 54.0.2840.59 Release: 1%{?dist} Summary: A WebKit (Blink) powered web browser 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) ### Chromium Fedora Patches ### -Patch0: chromium-46.0.2490.71-gcc5.patch +Patch0: chromium-54.0.2840.59-gcc5.patch Patch1: chromium-45.0.2454.101-linux-path-max.patch Patch2: chromium-50.0.2661.86-addrfix.patch # Google patched their bundled copy of icu 54 to include API functionality that wasn't added until 55. @@ -129,14 +130,14 @@ Patch15: chromium-52.0.2743.82-sandbox-pie.patch # Enable ARM CPU detection for webrtc (from archlinux via Russian Fedora) 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-52.0.2743.82-arm-icu-fix.patch +Patch17: chromium-54.0.2840.59-arm-icu-fix.patch # Use /etc/chromium for master_prefs Patch18: chromium-52.0.2743.82-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-53.0.2785.92-gn-system.patch +Patch20: chromium-54.0.2840.59-gn-system.patch # Fix last commit position issue # https://groups.google.com/a/chromium.org/forum/#!topic/gn-dev/7nlJv486bD4 Patch21: chromium-53.0.2785.92-last-commit-position.patch @@ -145,11 +146,15 @@ 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 +Patch24: chromium-54.0.2840.59-nullfix.patch +# Add explicit includedir for jpeglib.h +Patch25: chromium-54.0.2840.59-jpeg-include-dir.patch + ### Chromium Tests Patches ### Patch100: chromium-46.0.2490.86-use_system_opus.patch Patch101: chromium-52.0.2723.2-use_system_harfbuzz.patch -Patch102: chromium-52.0.2723.2-sync_link_zlib.patch # Use chromium-latest.py to generate clean tarball from released build tarballs, found here: # http://build.chromium.org/buildbot/official/ @@ -235,6 +240,7 @@ BuildRequires: nacl-arm-gcc, nacl-arm-binutils, nacl-arm-newlib # right now, it needs to be updated everytime chromium bumps # a major version. BuildRequires: chromium-native_client >= 52.0.2743.82 +BuildRequires: clang %ifarch x86_64 # Really, this is what we want: # BuildRequires: glibc-devel(x86-32) libgcc(x86-32) @@ -308,9 +314,6 @@ BuildRequires: pkgconfig(gnome-keyring-1) # remote desktop needs this BuildRequires: pam-devel BuildRequires: systemd -%if 0%{?asan} -BuildRequires: clang, compiler-rt -%endif # We pick up an automatic requires on the library, but we need the version check # because the nss shared library is unversioned. @@ -380,7 +383,9 @@ Provides: bundled(icu) = 54.1 Provides: bundled(kitchensink) = 1 Provides: bundled(leveldb) = r80 Provides: bundled(libaddressinput) = 0 +Provides: bundled(libevent) = 1.4.15 Provides: bundled(libjingle) = 9564 +Provides: bundled(libjpeg-turbo) = 1.4.90 Provides: bundled(libphonenumber) = svn584 Provides: bundled(libpng) = 1.6.22 Provides: bundled(libsrtp) = 1.5.2 @@ -398,7 +403,7 @@ Provides: bundled(NSBezierPath) = 1.0 Provides: bundled(mozc) Provides: bundled(mt19937ar) = 2002.1.26 %if %{bundleopus} -Provides: bundled(opus) = 1.1.2 +Provides: bundled(opus) = 1.1.3 %endif Provides: bundled(ots) = 767d6040439e6ebcdb867271fcb686bd3f8ac739 Provides: bundled(protobuf) = r476 @@ -520,11 +525,12 @@ members of the Chromium and WebDriver teams. %patch21 -p1 -b .lastcommit %patch22 -p1 -b .timefix %patch23 -p1 -b .415208 +%patch24 -p1 -b .nullfix +%patch25 -p1 -b .jpegfix ### Chromium Tests Patches ### %patch100 -p1 -b .use_system_opus %patch101 -p1 -b .use_system_harfbuzz -%patch102 -p1 -b .sync_link_zlib %if 0%{?asan} export CC="clang" @@ -604,6 +610,10 @@ for i in lib/libc.a lib/libc++.a lib/libg.a lib/libm.a; do /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/le32-nacl/$i done +for i in lib/libpthread.a lib/libnacl.a; do + /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/le32-nacl/$i +done + for i in lib/clang/3.7.0/lib/x86_64_bc-nacl/libpnaclmm.a lib/clang/3.7.0/lib/i686_bc-nacl/libpnaclmm.a; do /usr/pnacl_newlib/bin/pnacl-ranlib pnacl_newlib/$i done @@ -620,6 +630,11 @@ touch native_client/toolchain/.tars/linux_x86/pnacl_translator.json pushd native_client/toolchain ln -s ../../out/Release/gen/sdk/linux_x86 linux_x86 popd + +mkdir -p third_party/llvm-build/Release+Asserts/bin +pushd third_party/llvm-build/Release+Asserts/bin +ln -s /usr/bin/clang clang +popd %endif CHROMIUM_BROWSER_GN_DEFINES="" @@ -627,7 +642,7 @@ CHROMIUM_BROWSER_GN_DEFINES="" CHROMIUM_BROWSER_GN_DEFINES+=' system_libdir="lib64"' %endif CHROMIUM_BROWSER_GN_DEFINES+=' google_api_key="%{api_key}" google_default_client_id="%{default_client_id}" google_default_client_secret="%{default_client_secret}"' -CHROMIUM_BROWSER_GN_DEFINES+=' is_clang=false use_sysroot=false use_gio=true use_pulseaudio=true icu_use_data_file_flag=true' +CHROMIUM_BROWSER_GN_DEFINES+=' is_clang=false use_sysroot=false use_gio=true use_pulseaudio=true icu_use_data_file=true' %if 0%{?nonacl} CHROMIUM_BROWSER_GN_DEFINES+=' enable_nacl=false' %endif @@ -642,14 +657,16 @@ CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=true is_component_build=true' CHROMIUM_BROWSER_GN_DEFINES+=' is_component_ffmpeg=false is_component_build=false' %endif CHROMIUM_BROWSER_GN_DEFINES+=' remove_webcore_debug_symbols=true enable_hangout_services_extension=true' -CHROMIUM_BROWSER_GN_DEFINES+=' enable_hotwording=false use_aura=true enable_hidpi=true' +CHROMIUM_BROWSER_GN_DEFINES+=' enable_hotwording=false use_aura=true' CHROMIUM_BROWSER_GN_DEFINES+=' enable_webrtc=true enable_widevine=true' +CHROMIUM_BROWSER_GN_DEFINES+=' use_gold=false' %if 0%{gtk3} CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=true' %else CHROMIUM_BROWSER_GN_DEFINES+=' use_gtk3=false' %endif -CHROMIUM_BROWSER_GN_DEFINES+=' extra_cflags="-fno-delete-null-pointer-checks" treat_warnings_as_errors=false' +# CHROMIUM_BROWSER_GN_DEFINES+=' use_system_libjpeg=true' +CHROMIUM_BROWSER_GN_DEFINES+=' treat_warnings_as_errors=false' export CHROMIUM_BROWSER_GN_DEFINES export CHROMIUM_BROWSER_GYP_DEFINES="\ @@ -700,7 +717,7 @@ export CHROMIUM_BROWSER_GYP_DEFINES="\ -Duse_system_icu=1 \ %endif -Dicu_use_data_file_flag=1 \ - -Duse_system_libevent=1 \ + -Duse_system_libevent=0 \ -Duse_system_libjpeg=1 \ -Duse_system_libpng=1 \ %if %{bundlelibusbx} @@ -830,6 +847,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'breakpad/src/third_party/curl' \ 'chrome/third_party/mozilla_security_manager' \ 'courgette/third_party' \ + 'native_client_sdk/src/libraries/third_party/newlib-extras' \ 'native_client/src/third_party/dlmalloc' \ 'native_client/src/third_party/valgrind' \ 'net/third_party/mozilla_security_manager' \ @@ -842,25 +860,28 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/angle/src/third_party/libXNVCtrl' \ 'third_party/angle/src/third_party/murmurhash' \ 'third_party/angle/src/third_party/trace_event' \ + 'third_party/blanketjs' \ 'third_party/boringssl' \ 'third_party/brotli' \ 'third_party/cacheinvalidation' \ 'third_party/catapult' \ - 'third_party/catapult/tracing/third_party/components/polymer' \ 'third_party/catapult/tracing/third_party/d3' \ 'third_party/catapult/tracing/third_party/gl-matrix' \ 'third_party/catapult/tracing/third_party/jszip' \ 'third_party/catapult/tracing/third_party/mannwhitneyu' \ + 'third_party/catapult/third_party/polymer' \ 'third_party/catapult/third_party/py_vulcanize' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ + 'third_party/ced' \ 'third_party/cld_2' \ 'third_party/cros_system_api' \ 'third_party/cython/python_flags.py' \ 'third_party/devscripts' \ 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ + 'third_party/expat' \ 'third_party/fips181' \ + 'third_party/flatbuffers' \ 'third_party/flot' \ 'third_party/google_input_tools' \ 'third_party/google_input_tools/third_party/closure_library' \ @@ -882,6 +903,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/libxml/chromium' \ 'third_party/libwebm' \ 'third_party/libyuv' \ + 'third_party/llvm-build' \ 'third_party/lss' \ 'third_party/lzma_sdk' \ 'third_party/mesa' \ @@ -904,7 +926,9 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/protobuf/third_party/six' \ 'third_party/ply' \ 'third_party/qcms' \ + 'third_party/qunit' \ 'third_party/sfntly' \ + 'third_party/sinonjs' \ 'third_party/skia' \ 'third_party/smhasher' \ 'third_party/sqlite' \ @@ -917,7 +941,6 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/x86inc' \ 'third_party/zlib/google' \ 'url/third_party/mozilla' \ - 'v8/src/third_party/fdlibm' \ 'v8/src/third_party/valgrind' \ --do-remove @@ -944,8 +967,9 @@ build/linux/unbundle/replace_gn_files.py --system-libraries \ %else icu \ %endif +%if 0 libevent \ - libjpeg \ +%endif %if %{bundlelibusbx} %else libusb \ @@ -992,6 +1016,9 @@ sed '14i#define WIDEVINE_CDM_VERSION_STRING "Something fresh"' -i "third_party/w FILE=chrome/common/channel_info_posix.cc sed -i.orig -e 's/getenv("CHROME_VERSION_EXTRA")/"Fedora Project"/' $FILE +# fix arm gcc +sed -i 's|arm-linux-gnueabihf-|arm-linux-gnu-|g' build/toolchain/linux/BUILD.gn + %build %if %{?tests} @@ -1070,7 +1097,9 @@ export CHROMIUM_BROWSER_UNIT_TESTS= # remote client pushd remoting -../../depot_tools/ninja -C ../%{target} -vvv remoting_me2me_host remoting_start_host remoting_it2me_native_messaging_host remoting_me2me_native_messaging_host remoting_native_messaging_manifests remoting_resources + +# ../../depot_tools/ninja -C ../%{target} -vvv remoting_me2me_host remoting_start_host remoting_it2me_native_messaging_host remoting_me2me_native_messaging_host remoting_native_messaging_manifests remoting_resources +../../depot_tools/ninja -C ../%{target} -vvv remoting_all %if 0%{?build_remoting_app} %if 0%{?nacl} GOOGLE_CLIENT_ID_REMOTING_IDENTITY_API=%{chromoting_client_id} ../../depot_tools/ninja -vv -C ../out/Release/ remoting_webapp @@ -1107,7 +1136,7 @@ cp -a *.pak locales resources icudtl.dat %{buildroot}%{chromium_path} cp -a nacl_helper* *.nexe pnacl tls_edit %{buildroot}%{chromium_path} chmod -x %{buildroot}%{chromium_path}/nacl_helper_bootstrap* *.nexe %endif -cp -a protoc pseudo_locales pyproto %{buildroot}%{chromium_path} +cp -a protoc pyproto %{buildroot}%{chromium_path} cp -a chrome %{buildroot}%{chromium_path}/%{chromium_browser_channel} cp -a chrome_sandbox %{buildroot}%{chromium_path}/chrome-sandbox cp -a chrome.1 %{buildroot}%{_mandir}/man1/%{chromium_browser_channel}.1 @@ -1116,14 +1145,8 @@ cp -a chrome.1 %{buildroot}%{_mandir}/man1/%{chromium_browser_channel}.1 cp -a natives_blob.bin %{buildroot}%{chromium_path} cp -a snapshot_blob.bin %{buildroot}%{chromium_path} %if 0%{?shared} -cp -a lib %{buildroot}%{chromium_path} +cp -a lib*.so* %{buildroot}%{chromium_path} %endif -# clearkeycdm and widevine bits -# EXCEPT libwidevinecdm*.so*. At least libwidevinecdm.so is just an empty shim, -# because the chromium sources don't have the prebuilt binary. -# You'll have to get libwidevinecdm*.so* -# from Google Chrome and copy it in /usr/lib64/chromium-browser/ -cp -a libclearkeycdm.so* %{buildroot}%{chromium_path} # chromedriver cp -a chromedriver %{buildroot}%{chromium_path}/chromedriver @@ -1134,7 +1157,10 @@ mkdir -p %{buildroot}%{crd_path} %if 0%{?shared} pushd %{buildroot}%{crd_path} -ln -s %{chromium_path}/lib lib +for i in ../chromium-browser%{?chromium_channel}/lib*.so; do + libname=`basename $i` + ln -s $i $libname +done popd %endif @@ -1565,7 +1591,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %dir %{chromium_path}/PepperFlash/ %{chromium_path}/protoc # %%{chromium_path}/remoting_locales/ -%{chromium_path}/pseudo_locales/ +# %%{chromium_path}/pseudo_locales/ # %%{chromium_path}/plugins/ %{chromium_path}/pyproto/ %attr(4755, root, root) %{chromium_path}/chrome-sandbox @@ -1623,6 +1649,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %lang(vi) %{chromium_path}/locales/vi.pak %lang(zh_CN) %{chromium_path}/locales/zh-CN.pak %lang(zh_TW) %{chromium_path}/locales/zh-TW.pak +%{chromium_path}/locales/fake-bidi.pak %{chromium_path}/resources/ %{_mandir}/man1/%{chromium_browser_channel}.* %{_datadir}/icons/hicolor/256x256/apps/%{chromium_browser_channel}.png @@ -1634,18 +1661,17 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %if 0%{?shared} %files libs -%exclude %{chromium_path}/lib/libffmpeg.so* -%exclude %{chromium_path}/lib/libmedia.so* -%{chromium_path}/lib/ -%{chromium_path}/libclearkeycdm.so* +%exclude %{chromium_path}/libffmpeg.so* +%exclude %{chromium_path}/libmedia.so* +%{chromium_path}/lib*.so* %if %{freeworld} %files libs-media-freeworld %else %files libs-media %endif -%{chromium_path}/lib/libffmpeg.so* -%{chromium_path}/lib/libmedia.so* +%{chromium_path}/libffmpeg.so* +%{chromium_path}/libmedia.so* %endif %files -n chrome-remote-desktop @@ -1653,7 +1679,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{crd_path}/chrome-remote-desktop-host %{crd_path}/is-remoting-session %if 0%{?shared} -%{crd_path}/lib +%{crd_path}/lib*.so %endif %{crd_path}/native-messaging-host %{crd_path}/remote-assistance-host @@ -1677,6 +1703,10 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt %{chromium_path}/chromedriver %changelog +* Thu Oct 13 2016 Tom Callaway 54.0.2840.59-1 +- 54.0.2840.59 +- use bundled opus, libevent + * Fri Sep 30 2016 Tom Callaway 53.0.2785.143-1 - 53.0.2785.143 diff --git a/sources b/sources index b7997d5..5fe994b 100644 --- a/sources +++ b/sources @@ -1,3 +1,4 @@ 49a7f897775cce21d2b69968b8af1cea depot_tools.git-master.tar.gz 8280c0644492bac9f59f4e25ed11d309 policy_templates.zip d63d358591b6c8b43095b50f81196537 chromium-53.0.2785.143-clean.tar.xz +031e7cd6c6d4d24769d3901b99272d11 chromium-54.0.2840.59-clean.tar.xz