commit: b3838ab55a3424aa163316503389b36d7e7a8c37 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Nov 4 14:51:38 2017 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Nov 4 14:52:49 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3838ab5
www-client/chromium: beta channel bump (63.0.3239.30) Closes: https://bugs.gentoo.org/633452 Closes: https://bugs.gentoo.org/633858 Package-Manager: Portage-2.3.13_p1, Repoman-2.3.3_p81 www-client/chromium/Manifest | 2 +- ....3223.8.ebuild => chromium-63.0.3239.30.ebuild} | 27 +++++++++-------- www-client/chromium/files/chromium-webrtc-r0.patch | 34 ++++++++++++++++++++++ 3 files changed, 50 insertions(+), 13 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 4f0f0fd36aa..f8c252bc881 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,3 +1,3 @@ DIST chromium-62.0.3202.75.tar.xz 517136048 SHA256 49cdfe457bcb941b56c13a75bbe2ff394fcb5baa8a49c9b470835fad60dd904c SHA512 1108ac0b383ac654b5b6fb42faee76621d3c476fcf1b6469f498023be7272668f46f7081f74b2a4079ff45dc3c77b225cea7758a11677b0ba5a478e1d8bac87b WHIRLPOOL 0bcb844ec55469ff293672e075dc8bbf4b93809048fc8e5235334dea06e087c91286ba023831ac5254b27241146a06fd33360ef540f6a37cd7092763cc55ab09 -DIST chromium-63.0.3223.8.tar.xz 541587956 SHA256 bced462e16a28ff0a3896539e6c7f72e76cb7ba16640a6cac9a533ec4b8f5ee5 SHA512 6ca0efac47adee14b04cba312397b80aeaed1b0ce9bee427c508c44636ab9a1668f743bd3939d83417129d7e83c38c2f95b72c502c6d834056cf7477ef8b4de8 WHIRLPOOL b9f526eec3626b93f2541461b9b3a79bef283de62d99e30c209859e686db8e09ed327f90d0811703d699e9813cb86e0002be93fa42372e65afef1c96b8c91d35 DIST chromium-63.0.3230.0.tar.xz 558852780 SHA256 97daa90a6f0ba7dc49a168cbf9c40896e621fb0352ab6de1d2fa428bb63ab64a SHA512 b0aa9a42df303bc7ff412dec30b3bfed292ae39cb5e0f705f28eeb7a60d6125b9cecef7e3ab7798b2ca091ec71215fa5639def6b867c9fdb7a9a85c9b42323b3 WHIRLPOOL 1b9e346018c7056fce3f844d37b69e98529c9dc3ae04bdf07378c7de568d295814a42aa133c463a3be8d22a39b5f62ec69f679ea5dca3fe7e37a15215932c794 +DIST chromium-63.0.3239.30.tar.xz 561111084 SHA256 ab210326029213eda0290db71f6ddbdf5c42e2d94c3461dee094637a34571219 SHA512 b6b89e3464b4dbef54cfe5971255bf4cf96b8c984a2a82d7f4f66e3aecaf5a0a3c72ad827127223b3448c2c2ffad3fe1b1546266ec9544838b758ac3d9b454c8 WHIRLPOOL 1a673b4060cc757e190ea376bb0cff2e8222c91f30a3627ba39b3fed0c534bced213fa3bba06614aacf2814996fb949bb55bd06d549e74f70af7002aa5796ee7 diff --git a/www-client/chromium/chromium-63.0.3223.8.ebuild b/www-client/chromium/chromium-63.0.3239.30.ebuild similarity index 96% rename from www-client/chromium/chromium-63.0.3223.8.ebuild rename to www-client/chromium/chromium-63.0.3239.30.ebuild index 809c36dc7ab..6bb4d63531b 100644 --- a/www-client/chromium/chromium-63.0.3223.8.ebuild +++ b/www-client/chromium/chromium-63.0.3239.30.ebuild @@ -26,7 +26,7 @@ COMMON_DEPEND=" dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) - >=dev-libs/libxml2-2.9.5:=[icu] + >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= @@ -35,7 +35,7 @@ COMMON_DEPEND=" >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= - >=media-libs/harfbuzz-1.4.2:=[icu(-)] + >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) @@ -145,7 +145,8 @@ PATCHES=( "${FILESDIR}/${PN}-widevine-r1.patch" "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" "${FILESDIR}/${PN}-gcc5-r4.patch" - "${FILESDIR}/${PN}-gn-bootstrap-r20.patch" + "${FILESDIR}/${PN}-clang-r1.patch" + "${FILESDIR}/${PN}-webrtc-r0.patch" ) pre_build_checks() { @@ -204,7 +205,6 @@ src_prepare() { base/third_party/valgrind base/third_party/xdg_mime base/third_party/xdg_user_dirs - breakpad/src/third_party/curl chrome/third_party/mozilla_security_manager courgette/third_party net/third_party/mozilla_security_manager @@ -213,24 +213,26 @@ src_prepare() { third_party/analytics third_party/angle third_party/angle/src/common/third_party/base - third_party/angle/src/common/third_party/murmurhash + third_party/angle/src/common/third_party/smhasher third_party/angle/src/third_party/compiler third_party/angle/src/third_party/libXNVCtrl third_party/angle/src/third_party/trace_event third_party/blink third_party/boringssl + third_party/breakpad + third_party/breakpad/breakpad/src/third_party/curl third_party/brotli third_party/cacheinvalidation third_party/catapult + third_party/catapult/common/py_vulcanize/third_party/rcssmin + third_party/catapult/common/py_vulcanize/third_party/rjsmin 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/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/tracing/third_party/oboe + third_party/catapult/tracing/third_party/pako third_party/ced third_party/cld_2 third_party/cld_3 @@ -381,7 +383,8 @@ src_configure() { # libevent: https://bugs.gentoo.org/593458 local gn_system_libraries=( flac - harfbuzz-ng + # Need harfbuzz_from_pkgconfig target + #harfbuzz-ng libdrm libjpeg libpng @@ -405,6 +408,9 @@ src_configure() { fi build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die + # See dependency logic in third_party/BUILD.gn + myconf_gn+=" use_system_harfbuzz=true" + # Optional dependencies. myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" myconf_gn+=" enable_widevine=$(usex widevine true false)" @@ -604,9 +610,6 @@ src_install() { insinto "${CHROMIUM_HOME}/swiftshader" doins out/Release/swiftshader/*.so - newman out/Release/chrome.1 chromium.1 - newman out/Release/chrome.1 chromium-browser.1 - # Install icons and desktop entry. local branding size for size in 16 22 24 32 48 64 128 256 ; do diff --git a/www-client/chromium/files/chromium-webrtc-r0.patch b/www-client/chromium/files/chromium-webrtc-r0.patch new file mode 100644 index 00000000000..e14b185acb9 --- /dev/null +++ b/www-client/chromium/files/chromium-webrtc-r0.patch @@ -0,0 +1,34 @@ +From 7f90e2cceda0458cf56026eb6ccffb961a47804b Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <[email protected]> +Date: Fri, 13 Oct 2017 15:49:32 +0200 +Subject: [PATCH] IWYU: Include math.h for round(3). + +math.h was being implicitly included, which can break the build with +alternative libc implementations. + +Bug: None +Change-Id: I969b320b65d0f44abb33d3e1036cfbcb859a4952 +Reviewed-on: https://webrtc-review.googlesource.com/9384 +Reviewed-by: Tommi <[email protected]> +Commit-Queue: Raphael Kubo da Costa (rakuco) <[email protected]> +Cr-Commit-Position: refs/heads/master@{#20292} +--- + p2p/base/port.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/p2p/base/port.cc b/p2p/base/port.cc +index a1b478d11..81aa0aadb 100644 +--- a/third_party/webrtc/p2p/base/port.cc ++++ b/third_party/webrtc/p2p/base/port.cc +@@ -10,6 +10,8 @@ + + #include "p2p/base/port.h" + ++#include <math.h> ++ + #include <algorithm> + #include <vector> + +-- +2.15.0.rc2 +
