summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2016-09-28 21:48:51 -0400
committerMike Gilbert <floppym@gentoo.org>2016-09-28 21:50:03 -0400
commit45e379c06c77991961b561e5506f2295e796dbb4 (patch)
tree82158a14cc95242ecb19c3253a5b2ff3c7506bc5
parentapp-emulation/rkt: version bump to 1.15.0 (diff)
downloadgentoo-45e379c06c77991961b561e5506f2295e796dbb4.tar.gz
gentoo-45e379c06c77991961b561e5506f2295e796dbb4.tar.bz2
gentoo-45e379c06c77991961b561e5506f2295e796dbb4.zip
www-client/chromium: dev channel bump (55.0.2873.0)
Package-Manager: portage-2.3.1_p4_p413991
-rw-r--r--www-client/chromium/Manifest2
-rw-r--r--www-client/chromium/chromium-55.0.2873.0.ebuild (renamed from www-client/chromium/chromium-55.0.2859.0.ebuild)14
-rw-r--r--www-client/chromium/files/chromium-gn-r7.patch29
3 files changed, 35 insertions, 10 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 00f8bc33091f..295f59cb39ee 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
DIST chromium-53.0.2785.116.tar.xz 460903264 SHA256 7a87629504346f64122ca7754574d187a4c1bf5736dea672ff3e247a0af16062 SHA512 3a88b5b61642c4b947ae9cd9faa6d9d75fecfd6058982e705d36f1da2e94b902fb6d0af5289e00bbd0e5e7d096d5f5a788132c6e4374978620d6f7a1e2fb00da WHIRLPOOL fa067c68b217d494e16dfc78d63482a31006234ebae1c686426f011afde41a58d6939e3c5ee3a340ee099d5d88016f425b97e9f68957bb60d9b846d471702ac3
DIST chromium-54.0.2840.27.tar.xz 479647448 SHA256 75e195afbb9f0c3e69b637ef4fa34ba7e5b3e62e871ba1b60638d9e9c5eee088 SHA512 3ba86ec5418aa0d338e8cfd935e8e6664679721ee208dd560d00ff011610094bed03ed0d76e1bc478d6bb92db5074e71f3e4bbeb1a41bb0ae21927b4dd74865c WHIRLPOOL 383de90421b1d23eee7bc7030e9e9bfeeeccf2639681b5219a3b3d865ef1568a65d8fae41a0864ddbe7c7980cd90df11a5d2bb8e93f705f906ec8a742b158fa6
DIST chromium-54.0.2840.34.tar.xz 479636320 SHA256 b46c26a9e773b2c620acd2f96d69408f14a279aefaedfefed002ecf898a1ecf2 SHA512 23732e02ed30eaf36a4a4ee7bbb1af72c4202e061444004b515f0c49a578907719de3588f6d1e8dbb756cffa0220b677c920dc2f5ad6e8ec70a82168c094c99d WHIRLPOOL 822b41231a41aaeb8fc45ddc927c731535640a844ad25256a3f3daa86916c7cd9a5b79b30324c22efff03ef16a033b77d93df24f1ebf64df9373f77a8669fb41
-DIST chromium-55.0.2859.0.tar.xz 501623820 SHA256 43c343096377195500b31ff97979883a2e6d34e30f3f76e7d6af45679696aa38 SHA512 11bee1761c4e27576ada7e6aae65a021001f1873091acc4f8f8c38e97fbd2fc303ce37788a166736008dba761c7dcbd105f0be9df1b0513dc5ff67af24a8188f WHIRLPOOL efcb483c81175a942cfcc5edcbcf335b63e06de233ad731d60a85201b76123d23ab23930a926a4929958ef02ae935a9bd0ef625fce665831acc98047724e9488
DIST chromium-55.0.2868.3.tar.xz 505338268 SHA256 bec801332cdfb784d06a08da3936f5b9719e5b6a3bbaee88c3829651799077d1 SHA512 918c53f7380f889450b0e97e085f8d28af0ef4c25a5dd7b1ae0b2467ccc564747915c64d3bc6f64d31798ea4ef76f7a5cd7f64c06830ed9775756a495d9bb319 WHIRLPOOL df1fc03ebbc0ce4697e5aae6199c970d55b3cfdf78a00e18e47206dfc4f1995b3bae34216ea1d1023f7619febc87e9bfe738d015cee24123be386d6d41bec572
+DIST chromium-55.0.2873.0.tar.xz 505121804 SHA256 7f0a502e18951215693567ab668c2a0b4031bd8a1b3d10f8c9d1711079f56c1a SHA512 352349314b6f7565dbef9425152efee1546c116346b6ec2094b9c7ccf30d7caa2b2b2a4b8aa97deb66e25e692741bd63675d3c1f95ee99e1e7345406509c0ad3 WHIRLPOOL de4c5f31ecbe072c5cf5718a889f383ec49d5100fb4dfbeda456e78c6665d80e3f85044efc6d56c6d575579992d90bfddbe23c16530b1cf5c570c5ce2cd3d0ac
diff --git a/www-client/chromium/chromium-55.0.2859.0.ebuild b/www-client/chromium/chromium-55.0.2873.0.ebuild
index 8997a371b4af..53bd9394457d 100644
--- a/www-client/chromium/chromium-55.0.2859.0.ebuild
+++ b/www-client/chromium/chromium-55.0.2873.0.ebuild
@@ -34,6 +34,7 @@ COMMON_DEPEND="
>=dev-libs/elfutils-0.149
dev-libs/expat:=
dev-libs/glib:=
+ dev-libs/icu:=
>=dev-libs/jsoncpp-0.5.0-r1:=
dev-libs/nspr:=
>=dev-libs/nss-3.14.3:=
@@ -164,8 +165,9 @@ PATCHES=(
"${FILESDIR}/${PN}-system-ffmpeg-r4.patch"
"${FILESDIR}/${PN}-system-jinja-r14.patch"
"${FILESDIR}/${PN}-widevine-r1.patch"
- "${FILESDIR}/chromium-54-ffmpeg2compat.patch"
- "${FILESDIR}/chromium-ffmpeg-generate_gn.patch"
+ "${FILESDIR}/${PN}-54-ffmpeg2compat.patch"
+ "${FILESDIR}/${PN}-gn-r7.patch"
+ "${FILESDIR}/${PN}-system-zlib-r1.patch"
)
pkg_pretend() {
@@ -245,7 +247,6 @@ src_prepare() {
third_party/google_input_tools/third_party/closure_library/third_party/closure
third_party/hunspell
third_party/iccjpeg
- third_party/icu
third_party/jstemplate
third_party/khronos
third_party/leveldatabase
@@ -339,7 +340,6 @@ src_configure() {
# Use system-provided libraries.
# TODO: use_system_hunspell (upstream changes needed).
- # TODO: use_system_icu (bug #576370).
# TODO: use_system_libsrtp (bug #459932).
# TODO: use_system_libusb (http://crbug.com/266149).
# TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077).
@@ -369,6 +369,7 @@ src_configure() {
local gn_system_libraries="
flac
harfbuzz-ng
+ icu
libjpeg
libpng
libvpx
@@ -384,9 +385,6 @@ src_configure() {
fi
build/linux/unbundle/replace_gn_files.py --system-libraries ${gn_system_libraries} || die
- # Needed for system icu - we don't need additional data files.
- # myconf_gyp+=" -Dicu_use_data_file_flag=0"
-
# TODO: patch gyp so that this arm conditional is not needed.
if ! use arm; then
myconf_gyp+="
@@ -670,8 +668,6 @@ src_install() {
doins out/Release/*.bin || die
doins out/Release/*.pak || die
- doins out/Release/icudtl.dat || die
-
doins -r out/Release/locales || die
doins -r out/Release/resources || die
diff --git a/www-client/chromium/files/chromium-gn-r7.patch b/www-client/chromium/files/chromium-gn-r7.patch
new file mode 100644
index 000000000000..dc57ccce7132
--- /dev/null
+++ b/www-client/chromium/files/chromium-gn-r7.patch
@@ -0,0 +1,29 @@
+Index: tools/gn/bootstrap/bootstrap.py
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index e8304549335350915380731713643cd57ec70407..b6a113d390d61db32736333c312f90124a44086c 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -379,6 +379,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/debug/task_annotator.cc',
+ 'base/environment.cc',
+ 'base/files/file.cc',
++ 'base/files/file_descriptor_watcher_posix.cc',
+ 'base/files/file_enumerator.cc',
+ 'base/files/file_path.cc',
+ 'base/files/file_path_constants.cc',
+@@ -397,6 +398,7 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/location.cc',
+ 'base/logging.cc',
+ 'base/md5.cc',
++ 'base/memory/ref_counted.cc',
+ 'base/memory/ref_counted_memory.cc',
+ 'base/memory/singleton.cc',
+ 'base/memory/weak_ptr.cc',
+@@ -685,7 +687,6 @@ def write_gn_ninja(path, root_gen_dir, options):
+ 'base/timer/hi_res_timer_manager_win.cc',
+ 'base/trace_event/heap_profiler_allocation_register_win.cc',
+ 'base/trace_event/trace_event_etw_export_win.cc',
+- 'base/trace_event/winheap_dump_provider_win.cc',
+ 'base/win/enum_variant.cc',
+ 'base/win/event_trace_controller.cc',
+ 'base/win/event_trace_provider.cc',