1 |
commit: c38ed01caecf5bccbf40c542dc4a4816e1b3119b |
2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jul 19 19:03:00 2017 +0000 |
4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jul 19 19:03:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c38ed01c |
7 |
|
8 |
www-client/chromium: dev channel bump (61.0.3159.5) |
9 |
|
10 |
Add system-icu USE flag (enabled by default). This will |
11 |
help users with icu-59, which chromium does not work with yet. |
12 |
|
13 |
Bug: https://bugs.gentoo.org/619796 |
14 |
|
15 |
www-client/chromium/Manifest | 2 +- |
16 |
....0.3141.7.ebuild => chromium-61.0.3159.5.ebuild} | 21 ++++++++++++++------- |
17 |
www-client/chromium/files/chromium-gcc-r1.patch | 14 ++++++++++++++ |
18 |
.../chromium/files/chromium-gn-bootstrap-r13.patch | 18 ++++++++++++++++++ |
19 |
www-client/chromium/metadata.xml | 1 + |
20 |
5 files changed, 48 insertions(+), 8 deletions(-) |
21 |
|
22 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
23 |
index 41100ffa649..aea984c4045 100644 |
24 |
--- a/www-client/chromium/Manifest |
25 |
+++ b/www-client/chromium/Manifest |
26 |
@@ -1,5 +1,5 @@ |
27 |
DIST chromium-59.0.3071.104.tar.xz 531895868 SHA256 a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 SHA512 419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf WHIRLPOOL ab2fbd1beeb485a5c07743a5a84c850b5ad8178a1f97421a0aa0573817b474e633a6ac65ad43f7db67d35d257183ea4eceacd12b4cad63f88cd9777cfa498e68 |
28 |
DIST chromium-60.0.3112.32.tar.xz 537426032 SHA256 d972469bfc26a3d135a1863c22b88e23a9f00096841f6392dbb83b75ad0d17f1 SHA512 625bac567f0717d1077ac77023c87bdd2ad1244d63c50ce6935bcb41b85aab4c06b05fda7e0f48cc7305c331080a350a16592adb37583c13736c97a55404d6ab WHIRLPOOL 78af7bbf83466c044428f294209512c27ed649e746829df083edf8e8fc4eddb23618606ec8571bc4eb433a7d67e921236c562c2c175f3685017ef2576b3f7802 |
29 |
DIST chromium-60.0.3112.40.tar.xz 537575476 SHA256 4fdc590fc6ef4af16cc72d790b9eaa50829cd8193893a9ec0719481b03f328d3 SHA512 0e121887f7158d47a9fdb7c0be43a0b1cb32d19a893f99cfc13e2ce146e553e6428fdd82815180bacb430eace42f8bf83595073cf449f49e963633e8414b07ef WHIRLPOOL b7b2b62f61c18ed77890383ba1ac2d25094e14c12042fa1b1af50fa1f8d69807673a036fdb54078622e92b32eb7211040fda3513cb079598e3caf1219c594631 |
30 |
-DIST chromium-61.0.3141.7.tar.xz 545315208 SHA256 3cc9039cb3db48bdd6e1ba74e600fa59c9b7b25fa29f66a6304e1674fde3b12d SHA512 976c440f9cf5243deb8308b293d7de9c4edfa55ff2635d782d3dc819a344a4fbffd8faef30d2705a3f037a145860181d746cda52116be2d26d1ff3180ce5498e WHIRLPOOL 7122d4f1978cddcc92e7127e42553e92d18196cb128fd98c06847f935ef7a0925ac56b5008dad16dbd96151a6957c0f58bd1675c21810f29d9c13287f5ad4218 |
31 |
DIST chromium-61.0.3153.4.tar.xz 545739052 SHA256 ef48c114fed9a9977b731296cf099e62f1b50df07835709b41868c44363c6ec1 SHA512 693f8f31fb97eb57277a23c2b2f88d055d9f06ed89004874449332186e8e2e7ed63af6566e884ee52c963e8cda0a2b95caae9ebba486b279daca3c9355cda711 WHIRLPOOL be65fe3342a761cc0150d3d42708b9055442e2f5f8619a7d956be173b1abef0cb7b4a0bc4f0e55be0990461665fc2ba1e3b899bdffe328b8d3adc1624b15ea03 |
32 |
+DIST chromium-61.0.3159.5.tar.xz 546362372 SHA256 34e0e62f5c30df110bd8d5f872021a8a0ee21fc4b6c2d4efcb8a2232612f6e0a SHA512 325312223a1486fef1ca9d19c215147bdb37d7ab83437a6e38a076099bf450b79fbfba4060234307cba6385f9d82bf9d66c7a178f3ca33eeb0be1acee71e03f0 WHIRLPOOL cecab851eb6b247e7e381cfcac94d43d2b30d38631160ba1393920e241803e3b54402f719677b608ac15734c21ad6e762925e18f92b1b3e40f3aea93886aa721 |
33 |
|
34 |
diff --git a/www-client/chromium/chromium-61.0.3141.7.ebuild b/www-client/chromium/chromium-61.0.3159.5.ebuild |
35 |
similarity index 98% |
36 |
rename from www-client/chromium/chromium-61.0.3141.7.ebuild |
37 |
rename to www-client/chromium/chromium-61.0.3159.5.ebuild |
38 |
index 5573566a78f..0543445d68c 100644 |
39 |
--- a/www-client/chromium/chromium-61.0.3141.7.ebuild |
40 |
+++ b/www-client/chromium/chromium-61.0.3159.5.ebuild |
41 |
@@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} |
42 |
LICENSE="BSD" |
43 |
SLOT="0" |
44 |
KEYWORDS="~amd64 ~arm ~arm64 ~x86" |
45 |
-IUSE="component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine" |
46 |
+IUSE="component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" |
47 |
RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" |
48 |
|
49 |
# Native Client binaries are compiled with different set of flags, bug #452066. |
50 |
@@ -32,7 +32,7 @@ COMMON_DEPEND=" |
51 |
cups? ( >=net-print/cups-1.3.11:= ) |
52 |
dev-libs/expat:= |
53 |
dev-libs/glib:2 |
54 |
- dev-libs/icu:= |
55 |
+ system-icu? ( dev-libs/icu:= ) |
56 |
dev-libs/libxslt:= |
57 |
dev-libs/nspr:= |
58 |
>=dev-libs/nss-3.14.3:= |
59 |
@@ -186,7 +186,8 @@ src_prepare() { |
60 |
local PATCHES=( |
61 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
62 |
"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" |
63 |
- "${FILESDIR}/${PN}-gn-bootstrap-r11.patch" |
64 |
+ "${FILESDIR}/${PN}-gn-bootstrap-r13.patch" |
65 |
+ "${FILESDIR}/${PN}-gcc-r1.patch" |
66 |
) |
67 |
|
68 |
default |
69 |
@@ -321,6 +322,9 @@ src_prepare() { |
70 |
if ! use system-ffmpeg; then |
71 |
keeplibs+=( third_party/ffmpeg ) |
72 |
fi |
73 |
+ if ! use system-icu; then |
74 |
+ keeplibs+=( third_party/icu ) |
75 |
+ fi |
76 |
if ! use system-libvpx; then |
77 |
keeplibs+=( third_party/libvpx ) |
78 |
keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) |
79 |
@@ -377,7 +381,6 @@ src_configure() { |
80 |
local gn_system_libraries=( |
81 |
flac |
82 |
harfbuzz-ng |
83 |
- icu |
84 |
libdrm |
85 |
libjpeg |
86 |
libpng |
87 |
@@ -393,6 +396,9 @@ src_configure() { |
88 |
if use system-ffmpeg; then |
89 |
gn_system_libraries+=( ffmpeg ) |
90 |
fi |
91 |
+ if use system-icu; then |
92 |
+ gn_system_libraries+=( icu ) |
93 |
+ fi |
94 |
if use system-libvpx; then |
95 |
gn_system_libraries+=( libvpx ) |
96 |
fi |
97 |
@@ -421,7 +427,7 @@ src_configure() { |
98 |
# Never use bundled gold binary. Disable gold linker flags for now. |
99 |
# Do not use bundled clang. |
100 |
# Trying to use gold results in linker crash. |
101 |
- myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false" |
102 |
+ myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" |
103 |
|
104 |
ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" |
105 |
myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" |
106 |
@@ -599,8 +605,9 @@ src_install() { |
107 |
doins out/Release/*.pak |
108 |
doins out/Release/*.so |
109 |
|
110 |
- # Needed by bundled icu |
111 |
- # doins out/Release/icudtl.dat |
112 |
+ if ! use system-icu; then |
113 |
+ doins out/Release/icudtl.dat |
114 |
+ fi |
115 |
|
116 |
doins -r out/Release/locales |
117 |
doins -r out/Release/resources |
118 |
|
119 |
diff --git a/www-client/chromium/files/chromium-gcc-r1.patch b/www-client/chromium/files/chromium-gcc-r1.patch |
120 |
new file mode 100644 |
121 |
index 00000000000..2acd11ed5b0 |
122 |
--- /dev/null |
123 |
+++ b/www-client/chromium/files/chromium-gcc-r1.patch |
124 |
@@ -0,0 +1,14 @@ |
125 |
+diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h |
126 |
+index 99f230ce7e9a..de2415d402f5 100644 |
127 |
+--- a/base/numerics/safe_math_shared_impl.h |
128 |
++++ b/base/numerics/safe_math_shared_impl.h |
129 |
+@@ -21,8 +21,7 @@ |
130 |
+ #if !defined(__native_client__) && \ |
131 |
+ ((defined(__clang__) && \ |
132 |
+ ((__clang_major__ > 3) || \ |
133 |
+- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ |
134 |
+- (defined(__GNUC__) && __GNUC__ >= 5)) |
135 |
++ (__clang_major__ == 3 && __clang_minor__ >= 4)))) |
136 |
+ #include "base/numerics/safe_math_clang_gcc_impl.h" |
137 |
+ #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) |
138 |
+ #else |
139 |
|
140 |
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r13.patch b/www-client/chromium/files/chromium-gn-bootstrap-r13.patch |
141 |
new file mode 100644 |
142 |
index 00000000000..abb67a80621 |
143 |
--- /dev/null |
144 |
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r13.patch |
145 |
@@ -0,0 +1,18 @@ |
146 |
+--- a/tools/gn/bootstrap/bootstrap.py |
147 |
++++ b/tools/gn/bootstrap/bootstrap.py |
148 |
+@@ -467,7 +467,6 @@ def write_gn_ninja(path, root_gen_dir, options): |
149 |
+ 'base/process/process_metrics.cc', |
150 |
+ 'base/profiler/scoped_profile.cc', |
151 |
+ 'base/profiler/scoped_tracker.cc', |
152 |
+- 'base/profiler/tracked_time.cc', |
153 |
+ 'base/rand_util.cc', |
154 |
+ 'base/run_loop.cc', |
155 |
+ 'base/sequence_token.cc', |
156 |
+@@ -567,6 +566,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
157 |
+ 'base/tracked_objects.cc', |
158 |
+ 'base/tracking_info.cc', |
159 |
+ 'base/unguessable_token.cc', |
160 |
++ 'base/value_iterators.cc', |
161 |
+ 'base/values.cc', |
162 |
+ 'base/vlog.cc', |
163 |
+ ]) |
164 |
|
165 |
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml |
166 |
index e468d5e9c6e..5102e4b0a7b 100644 |
167 |
--- a/www-client/chromium/metadata.xml |
168 |
+++ b/www-client/chromium/metadata.xml |
169 |
@@ -15,6 +15,7 @@ |
170 |
<flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag> |
171 |
<flag name="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag> |
172 |
<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> |
173 |
+ <flag name="system-icu">Use system icu instead of the bundled one</flag> |
174 |
<flag name="system-libvpx">Use system libvpx instead of the bundled one</flag> |
175 |
<flag name="tcmalloc">Use bundled tcmalloc instead of system malloc</flag> |
176 |
<flag name="widevine">Unsupported closed-source DRM capability (required by Netflix VOD)</flag> |