1 |
commit: 45e379c06c77991961b561e5506f2295e796dbb4 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 29 01:48:51 2016 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 29 01:50:03 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45e379c0 |
7 |
|
8 |
www-client/chromium: dev channel bump (55.0.2873.0) |
9 |
|
10 |
Package-Manager: portage-2.3.1_p4_p413991 |
11 |
|
12 |
www-client/chromium/Manifest | 2 +- |
13 |
...0.2859.0.ebuild => chromium-55.0.2873.0.ebuild} | 14 ++++------- |
14 |
www-client/chromium/files/chromium-gn-r7.patch | 29 ++++++++++++++++++++++ |
15 |
3 files changed, 35 insertions(+), 10 deletions(-) |
16 |
|
17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
18 |
index 00f8bc3..295f59c 100644 |
19 |
--- a/www-client/chromium/Manifest |
20 |
+++ b/www-client/chromium/Manifest |
21 |
@@ -1,5 +1,5 @@ |
22 |
DIST chromium-53.0.2785.116.tar.xz 460903264 SHA256 7a87629504346f64122ca7754574d187a4c1bf5736dea672ff3e247a0af16062 SHA512 3a88b5b61642c4b947ae9cd9faa6d9d75fecfd6058982e705d36f1da2e94b902fb6d0af5289e00bbd0e5e7d096d5f5a788132c6e4374978620d6f7a1e2fb00da WHIRLPOOL fa067c68b217d494e16dfc78d63482a31006234ebae1c686426f011afde41a58d6939e3c5ee3a340ee099d5d88016f425b97e9f68957bb60d9b846d471702ac3 |
23 |
DIST chromium-54.0.2840.27.tar.xz 479647448 SHA256 75e195afbb9f0c3e69b637ef4fa34ba7e5b3e62e871ba1b60638d9e9c5eee088 SHA512 3ba86ec5418aa0d338e8cfd935e8e6664679721ee208dd560d00ff011610094bed03ed0d76e1bc478d6bb92db5074e71f3e4bbeb1a41bb0ae21927b4dd74865c WHIRLPOOL 383de90421b1d23eee7bc7030e9e9bfeeeccf2639681b5219a3b3d865ef1568a65d8fae41a0864ddbe7c7980cd90df11a5d2bb8e93f705f906ec8a742b158fa6 |
24 |
DIST chromium-54.0.2840.34.tar.xz 479636320 SHA256 b46c26a9e773b2c620acd2f96d69408f14a279aefaedfefed002ecf898a1ecf2 SHA512 23732e02ed30eaf36a4a4ee7bbb1af72c4202e061444004b515f0c49a578907719de3588f6d1e8dbb756cffa0220b677c920dc2f5ad6e8ec70a82168c094c99d WHIRLPOOL 822b41231a41aaeb8fc45ddc927c731535640a844ad25256a3f3daa86916c7cd9a5b79b30324c22efff03ef16a033b77d93df24f1ebf64df9373f77a8669fb41 |
25 |
-DIST chromium-55.0.2859.0.tar.xz 501623820 SHA256 43c343096377195500b31ff97979883a2e6d34e30f3f76e7d6af45679696aa38 SHA512 11bee1761c4e27576ada7e6aae65a021001f1873091acc4f8f8c38e97fbd2fc303ce37788a166736008dba761c7dcbd105f0be9df1b0513dc5ff67af24a8188f WHIRLPOOL efcb483c81175a942cfcc5edcbcf335b63e06de233ad731d60a85201b76123d23ab23930a926a4929958ef02ae935a9bd0ef625fce665831acc98047724e9488 |
26 |
DIST chromium-55.0.2868.3.tar.xz 505338268 SHA256 bec801332cdfb784d06a08da3936f5b9719e5b6a3bbaee88c3829651799077d1 SHA512 918c53f7380f889450b0e97e085f8d28af0ef4c25a5dd7b1ae0b2467ccc564747915c64d3bc6f64d31798ea4ef76f7a5cd7f64c06830ed9775756a495d9bb319 WHIRLPOOL df1fc03ebbc0ce4697e5aae6199c970d55b3cfdf78a00e18e47206dfc4f1995b3bae34216ea1d1023f7619febc87e9bfe738d015cee24123be386d6d41bec572 |
27 |
+DIST chromium-55.0.2873.0.tar.xz 505121804 SHA256 7f0a502e18951215693567ab668c2a0b4031bd8a1b3d10f8c9d1711079f56c1a SHA512 352349314b6f7565dbef9425152efee1546c116346b6ec2094b9c7ccf30d7caa2b2b2a4b8aa97deb66e25e692741bd63675d3c1f95ee99e1e7345406509c0ad3 WHIRLPOOL de4c5f31ecbe072c5cf5718a889f383ec49d5100fb4dfbeda456e78c6665d80e3f85044efc6d56c6d575579992d90bfddbe23c16530b1cf5c570c5ce2cd3d0ac |
28 |
|
29 |
diff --git a/www-client/chromium/chromium-55.0.2859.0.ebuild b/www-client/chromium/chromium-55.0.2873.0.ebuild |
30 |
similarity index 98% |
31 |
rename from www-client/chromium/chromium-55.0.2859.0.ebuild |
32 |
rename to www-client/chromium/chromium-55.0.2873.0.ebuild |
33 |
index 8997a37..53bd939 100644 |
34 |
--- a/www-client/chromium/chromium-55.0.2859.0.ebuild |
35 |
+++ b/www-client/chromium/chromium-55.0.2873.0.ebuild |
36 |
@@ -34,6 +34,7 @@ COMMON_DEPEND=" |
37 |
>=dev-libs/elfutils-0.149 |
38 |
dev-libs/expat:= |
39 |
dev-libs/glib:= |
40 |
+ dev-libs/icu:= |
41 |
>=dev-libs/jsoncpp-0.5.0-r1:= |
42 |
dev-libs/nspr:= |
43 |
>=dev-libs/nss-3.14.3:= |
44 |
@@ -164,8 +165,9 @@ PATCHES=( |
45 |
"${FILESDIR}/${PN}-system-ffmpeg-r4.patch" |
46 |
"${FILESDIR}/${PN}-system-jinja-r14.patch" |
47 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
48 |
- "${FILESDIR}/chromium-54-ffmpeg2compat.patch" |
49 |
- "${FILESDIR}/chromium-ffmpeg-generate_gn.patch" |
50 |
+ "${FILESDIR}/${PN}-54-ffmpeg2compat.patch" |
51 |
+ "${FILESDIR}/${PN}-gn-r7.patch" |
52 |
+ "${FILESDIR}/${PN}-system-zlib-r1.patch" |
53 |
) |
54 |
|
55 |
pkg_pretend() { |
56 |
@@ -245,7 +247,6 @@ src_prepare() { |
57 |
third_party/google_input_tools/third_party/closure_library/third_party/closure |
58 |
third_party/hunspell |
59 |
third_party/iccjpeg |
60 |
- third_party/icu |
61 |
third_party/jstemplate |
62 |
third_party/khronos |
63 |
third_party/leveldatabase |
64 |
@@ -339,7 +340,6 @@ src_configure() { |
65 |
|
66 |
# Use system-provided libraries. |
67 |
# TODO: use_system_hunspell (upstream changes needed). |
68 |
- # TODO: use_system_icu (bug #576370). |
69 |
# TODO: use_system_libsrtp (bug #459932). |
70 |
# TODO: use_system_libusb (http://crbug.com/266149). |
71 |
# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). |
72 |
@@ -369,6 +369,7 @@ src_configure() { |
73 |
local gn_system_libraries=" |
74 |
flac |
75 |
harfbuzz-ng |
76 |
+ icu |
77 |
libjpeg |
78 |
libpng |
79 |
libvpx |
80 |
@@ -384,9 +385,6 @@ src_configure() { |
81 |
fi |
82 |
build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die |
83 |
|
84 |
- # Needed for system icu - we don't need additional data files. |
85 |
- # myconf_gyp+=" -Dicu_use_data_file_flag=0" |
86 |
- |
87 |
# TODO: patch gyp so that this arm conditional is not needed. |
88 |
if ! use arm; then |
89 |
myconf_gyp+=" |
90 |
@@ -670,8 +668,6 @@ src_install() { |
91 |
doins out/Release/*.bin || die |
92 |
doins out/Release/*.pak || die |
93 |
|
94 |
- doins out/Release/icudtl.dat || die |
95 |
- |
96 |
doins -r out/Release/locales || die |
97 |
doins -r out/Release/resources || die |
98 |
|
99 |
|
100 |
diff --git a/www-client/chromium/files/chromium-gn-r7.patch b/www-client/chromium/files/chromium-gn-r7.patch |
101 |
new file mode 100644 |
102 |
index 00000000..dc57ccc |
103 |
--- /dev/null |
104 |
+++ b/www-client/chromium/files/chromium-gn-r7.patch |
105 |
@@ -0,0 +1,29 @@ |
106 |
+Index: tools/gn/bootstrap/bootstrap.py |
107 |
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py |
108 |
+index e8304549335350915380731713643cd57ec70407..b6a113d390d61db32736333c312f90124a44086c 100755 |
109 |
+--- a/tools/gn/bootstrap/bootstrap.py |
110 |
++++ b/tools/gn/bootstrap/bootstrap.py |
111 |
+@@ -379,6 +379,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
112 |
+ 'base/debug/task_annotator.cc', |
113 |
+ 'base/environment.cc', |
114 |
+ 'base/files/file.cc', |
115 |
++ 'base/files/file_descriptor_watcher_posix.cc', |
116 |
+ 'base/files/file_enumerator.cc', |
117 |
+ 'base/files/file_path.cc', |
118 |
+ 'base/files/file_path_constants.cc', |
119 |
+@@ -397,6 +398,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
120 |
+ 'base/location.cc', |
121 |
+ 'base/logging.cc', |
122 |
+ 'base/md5.cc', |
123 |
++ 'base/memory/ref_counted.cc', |
124 |
+ 'base/memory/ref_counted_memory.cc', |
125 |
+ 'base/memory/singleton.cc', |
126 |
+ 'base/memory/weak_ptr.cc', |
127 |
+@@ -685,7 +687,6 @@ def write_gn_ninja(path, root_gen_dir, options): |
128 |
+ 'base/timer/hi_res_timer_manager_win.cc', |
129 |
+ 'base/trace_event/heap_profiler_allocation_register_win.cc', |
130 |
+ 'base/trace_event/trace_event_etw_export_win.cc', |
131 |
+- 'base/trace_event/winheap_dump_provider_win.cc', |
132 |
+ 'base/win/enum_variant.cc', |
133 |
+ 'base/win/event_trace_controller.cc', |
134 |
+ 'base/win/event_trace_provider.cc', |