commit: 6f31892ec6a08b6cb47b4cfcf6096ead36ba20be Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> AuthorDate: Sat Aug 20 11:49:30 2016 +0000 Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> CommitDate: Sat Aug 20 11:49:30 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6f31892e
www-client/chromium: dev channel bump (54.0.2832.2) Package-Manager: portage-2.2.28 www-client/chromium/Manifest | 2 +- ...0.2810.2.ebuild => chromium-54.0.2832.2.ebuild} | 35 +++++++------ .../chromium/files/chromium-system-jinja-r13.patch | 59 ++++++++++++++++++++++ 3 files changed, 79 insertions(+), 17 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index a61aced..7d9a41e 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ DIST chromium-52.0.2743.116.tar.xz 458156660 SHA256 a194ae1edb041024b3d4b6ba438f32fefdb6f1ecb24a96c50248a486b237a101 SHA512 c9a8b6d7a22d3b086f1761678f1fa047191a8e44bc6ebe8745e76ea92420b1330fc6e4134ca7bc22c0367e7a25df04900156d0ebb44eae3ef7f98d1deb5362e5 WHIRLPOOL 90cc620e9dab964690a24606ae456e20f1a9dc556301fef33f3599a395ec247cb03712c94522a681f20332b54163896e118463b1b402aff6153b513deb25c5cc DIST chromium-53.0.2785.34.tar.xz 460739532 SHA256 261ba008c96b335a55feff18785b01484af2d678f85b58206008b31c9e9c372f SHA512 99e0b7a30e34f70ec844ef50f02eadadead2b83f2a47ca7d5779cf0a90bf49e7d3efc1bbc98eb4d1294ed283edd04a993a639003a365e06ae8b2adf26cc1c865 WHIRLPOOL dec533670c1664f88ea32fe253644e479b81fb93bd93f1bc5dbfe41c56979a7642afdfcd041ddf05ca3f0da8e1bedc7ddf48779be3b965038026f65ab199f344 DIST chromium-53.0.2785.70.tar.xz 460838212 SHA256 edd660ea30eeb1a3fccb1c18c725c96bf464b6ea34134c8210ef9dfa8cd35179 SHA512 7029915f983f854ceb2e43b1bc896b2954eb2ca4f704a81070a837e2435ffd0f5a4e4128456826fc70e439997febb1eb715ed33b3336734f137952632f61dd7e WHIRLPOOL d6e51313b37c6408e6f41900b984f1cc835fb247dfb0371eaca9554425df5df2ae1d56e4efd31093c2ffcd0359b457338558ee8e66cd1a67f69528f5461cd5b2 -DIST chromium-54.0.2810.2.tar.xz 460923284 SHA256 f038e72cbd8b7383d13c286329623fda8d6d48f45fa2d964e554b5565283ad71 SHA512 069edcc27427dc7e3c6c3af1932b7d88d2070f8280c9e1881bcba3cbf13bd2d74fe13b79d1e89194c51b9edf71b8ff0f5e45a0a9727798cc723cb8237b95df8c WHIRLPOOL 64b32d5b5c06f9a4d3e774d340da935b92c46bb1573923dfd4f5748af310214ff7295f1b1e101dd6cb50de383e36fd2813087af801bed47df889e69441a6a375 DIST chromium-54.0.2824.0.tar.xz 459683224 SHA256 7aae8ea2ae681b6971624c1dbcbf9cb56353456a20b91f369381488c8f2e0e94 SHA512 4867661f78fe72c32e8cea5a476cedd5fee9586fe8df8a7bd79f793542caa15fe52596996f8615f66376e75d9bdd92aeaa8aa6241472503ae015ef761f6435a3 WHIRLPOOL 88baed0d7fb13b815df82ffcd5e511ac9ef6ee92d98dff571f5ba5115300859345490c27fa45dab7c3dc99e5cd44310bcaa502ae37808b8694ce1276293d3549 +DIST chromium-54.0.2832.2.tar.xz 479876132 SHA256 105145178e6995b57821966b77512918b873e180bfaf6a4991f55c769df04b12 SHA512 e4d4f813df9036d9769003cc115d89139365a898e0ad98faa503bcd066133fa27f653861df1e09d36156f05e30b27ade15e9be2e0c205748feb1ab7913ee2989 WHIRLPOOL 0772494f4956b9e75f09f5ba1ed955178102917c5a59f45f9f34f44d23d334647a6090406c8bc8f9f6dada54758118ed8d1dbdd961f9c3ec30e122a81acc1ad4 diff --git a/www-client/chromium/chromium-54.0.2810.2.ebuild b/www-client/chromium/chromium-54.0.2832.2.ebuild similarity index 96% rename from www-client/chromium/chromium-54.0.2810.2.ebuild rename to www-client/chromium/chromium-54.0.2832.2.ebuild index 50e6674..9b68f52 100644 --- a/www-client/chromium/chromium-54.0.2810.2.ebuild +++ b/www-client/chromium/chromium-54.0.2832.2.ebuild @@ -18,7 +18,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="cups gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc widevine" +IUSE="cups +gn gnome gnome-keyring gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" # TODO: bootstrapped gn binary hangs when using tcmalloc with portage's sandbox. @@ -73,17 +73,17 @@ RDEPEND=" x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= + app-arch/snappy:= + >=dev-libs/libevent-1.4.13:= + dev-libs/libxml2:=[icu] + dev-libs/libxslt:= + media-libs/flac:= + >=media-libs/harfbuzz-0.9.41:=[icu(+)] + >=media-libs/libwebp-0.4.0:= + sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= - app-arch/snappy:= - >=dev-libs/libevent-1.4.13:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - media-libs/flac:= - >=media-libs/harfbuzz-0.9.41:=[icu(+)] - >=media-libs/libwebp-0.4.0:= - sys-libs/zlib:=[minizip] )" DEPEND="${RDEPEND} >=app-arch/gzip-1.7 @@ -159,10 +159,8 @@ For other desktop environments, try one of the following: PATCHES=( "${FILESDIR}/${PN}-system-ffmpeg-r3.patch" - "${FILESDIR}/${PN}-system-jinja-r12.patch" + "${FILESDIR}/${PN}-system-jinja-r13.patch" "${FILESDIR}/${PN}-widevine-r1.patch" - "${FILESDIR}/${PN}-last-commit-position-r1.patch" - "${FILESDIR}/${PN}-gn-r3.patch" ) pkg_pretend() { @@ -253,11 +251,11 @@ src_prepare() { 'third_party/catapult/tracing/third_party/mannwhitneyu' \ 'third_party/ced' \ 'third_party/cld_2' \ + 'third_party/cld_3' \ '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/fips181' \ 'third_party/flatbuffers' \ 'third_party/flot' \ @@ -604,7 +602,10 @@ eninja() { } src_compile() { - local ninja_targets="chrome chrome_sandbox chromedriver" + local ninja_targets="chrome chromedriver" + if use suid; then + ninja_targets+=" chrome_sandbox" + fi # Build mksnapshot and pax-mark it. eninja -C out/Release mksnapshot || die @@ -621,8 +622,10 @@ src_install() { exeinto "${CHROMIUM_HOME}" doexe out/Release/chrome || die - newexe out/Release/chrome_sandbox chrome-sandbox || die - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + if use suid; then + newexe out/Release/chrome_sandbox chrome-sandbox || die + fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" + fi doexe out/Release/chromedriver || die use widevine && doexe out/Release/libwidevinecdmadapter.so diff --git a/www-client/chromium/files/chromium-system-jinja-r13.patch b/www-client/chromium/files/chromium-system-jinja-r13.patch new file mode 100644 index 0000000..845ac94 --- /dev/null +++ b/www-client/chromium/files/chromium-system-jinja-r13.patch @@ -0,0 +1,59 @@ +--- a/third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000 ++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000 +@@ -54,7 +54,6 @@ + 'actions': [{ + 'action_name': 'cache_jinja_templates', + 'inputs': [ +- '<@(jinja_module_files)', + 'code_generator_v8.py', + '<@(code_generator_template_files)', + ], +--- a/third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000 ++++ b/third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000 +@@ -2,10 +2,6 @@ + { + 'variables': { + 'scripts_for_in_files': [ +- # jinja2/__init__.py contains version string, so sufficient as +- # dependency for whole jinja2 package +- '<(DEPTH)/third_party/jinja2/__init__.py', +- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep + 'hasher.py', + 'in_file.py', + 'in_generator.py', +--- a/third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000 ++++ b/third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000 +@@ -12,9 +12,6 @@ + '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep + ], + 'idl_lexer_parser_files': [ +- # PLY (Python Lex-Yacc) +- '<(DEPTH)/third_party/ply/lex.py', +- '<(DEPTH)/third_party/ply/yacc.py', + # Web IDL lexer/parser (base parser) + '<(DEPTH)/tools/idl_parser/idl_lexer.py', + '<(DEPTH)/tools/idl_parser/idl_node.py', +--- a/third_party/WebKit/Source/build/scripts/scripts.gni.orig 2016-06-02 09:54:28.510152077 +0000 ++++ b/third_party/WebKit/Source/build/scripts/scripts.gni 2016-06-02 09:54:50.966612510 +0000 +@@ -9,10 +9,6 @@ + _scripts_dir = "//third_party/WebKit/Source/build/scripts" + + scripts_for_in_files = [ +- # jinja2/__init__.py contains version string, so sufficient as +- # dependency for whole jinja2 package +- "//third_party/jinja2/__init__.py", +- "//third_party/markupsafe/__init__.py", # jinja2 dep + "$_scripts_dir/hasher.py", + "$_scripts_dir/in_file.py", + "$_scripts_dir/in_generator.py", +--- a/third_party/WebKit/Source/bindings/scripts/BUILD.gn.orig 2016-06-02 10:03:01.100658943 +0000 ++++ b/third_party/WebKit/Source/bindings/scripts/BUILD.gn 2016-06-02 10:03:13.240907715 +0000 +@@ -36,7 +36,7 @@ + action("cached_jinja_templates") { + script = "code_generator_v8.py" + +- inputs = jinja_module_files + [ "code_generator_v8.py" ] + ++ inputs = [ "code_generator_v8.py" ] + + code_generator_template_files + + # Dummy file to track dependency.
