commit:     382082c70b9339a463f32024f5d9101f951108f5
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 13 17:45:35 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun Nov 13 18:02:59 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382082c7

www-client/chromium: dev channel bump (56.0.2914.3)

Addresses a couple bugs:

- Null pointer deref in V8 (bug 588596).
- Crash with old harfbuzz (bug 599098).

Bug: https://bugs.gentoo.org/588596
Bug: https://bugs.gentoo.org/599098
Package-Manager: portage-2.3.2_p5

 www-client/chromium/Manifest                            |  2 +-
 ...m-56.0.2897.0.ebuild => chromium-56.0.2914.3.ebuild} | 17 ++++++++++++-----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1b1a90a..03f9ab1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -2,5 +2,5 @@ DIST chromium-54.0.2840.100.tar.xz 479762112 SHA256 
e2e7f54a780c93ec2e933af09e11
 DIST chromium-54.0.2840.59.tar.xz 479763932 SHA256 
df89c284b0109566acc6a5a1a84d94a5ab0509cc3a86a31299a50328991edcde SHA512 
f0b615a2e7dd667c8959f8ce501035a69e7ce852f04ae3023677d933025a56cbc7e1c5f4e85f6e790236ac61cfbd5df7290ed5da74292ee40ebbd89e75fb159f
 WHIRLPOOL 
a719ddf51cce89bb445bed1cfa694bf5c49a67455b1ed495363920303ba4337ae81d660c7fa613653f84e1cefb934d54640ea6727b95e0ab4451517d3db83299
 DIST chromium-55.0.2883.28.tar.xz 511010052 SHA256 
e09f3c69fc3937da9a4ef6f9dfb7eda8364bbcf17a358229ee7245544e548ae2 SHA512 
9fc5bce0d154e6c6e211afee596acd179337354a257b5aab8c089d822132eb97ac307d33a9e91201e76218b3504431c02762c9d5e96efcad11f79d0f6adeaf27
 WHIRLPOOL 
7e774b4a76909e6f6402e5dfdcd71c3d8a1e1b0459a2f5be670761376c7311a502d1d8659c965925b1f288c5f6cfa81cc263dc20e78343684bc4031fd0b6f8dc
 DIST chromium-55.0.2883.35.tar.xz 511169840 SHA256 
fa296cf4135576dcb70384264614e520db101e63f6532dab2c909e6fa7454985 SHA512 
f3a9e9eecfec76517a20db6fbd5d45c6d390fea62cbc19c4b67684c556018ac9e6d247395ca1c067a71dc26faab25bd312bae62a6fafa2bf9c15e5a25857c361
 WHIRLPOOL 
a659cf280bec4c68c1f41fdd59c6931e7798831406078a04623f5a6362da0bfbe05d848e23b462d794d2bfbb49e3e233c2513c1687effceb488480cbbd7f9f19
-DIST chromium-56.0.2897.0.tar.xz 512048692 SHA256 
a91e43b3747d22192b4712bb59db64cc90d3dbb75716fe1d3ca5dd9c16f9f40b SHA512 
101b803ded07767c92e938a7b31444ca984208ea28a6005ebd9895f1255cd98ffa999ba9b0ce2ab159a7708a739b62a4ebbdcd3d4bac22ccb345433c0abad9e7
 WHIRLPOOL 
0fd43cb2a8ef5604c22971f24f1aed9cfa61f0e562f2fb15b2a42e8d03fefda3b14f728bb7eda27d8f44f5595f58f0739091a80067cfe652ad13d4fdf8bde63c
 DIST chromium-56.0.2906.0.tar.xz 512964244 SHA256 
df2e0f02630fcdf394bab60c71fe4727b054822ed146831d8fdd3f6f5b59cfdd SHA512 
f9b52cd5ebaf0f18a660018cbdaeb0ceb49862847ba067b1ab9b970ab77a760a256477fcb7e479bdc6248ce7d2a514745d6139139edd04cb1c9e5fb7df3efd4d
 WHIRLPOOL 
cb635f3db2cb965930c6a5f5eb7e9e987238ec058abe381451c9c1476ba390c7bb8f6bc618f0cc55b1ac568ab955bbf539a460e61c36437bdf6c16d39e7a4ee3
+DIST chromium-56.0.2914.3.tar.xz 511525012 SHA256 
f64c788adeb1060a58c737af37f8973abb8fb9cc765c1a841d3700b3cb4a1fdd SHA512 
521e567ef8b89e1f8ebd298ab19d269784ffc31dfbc9dd2588ce886d7b052924304ea4c0c4fb7b2555ab4b4c2adc9fbff07cdb455d898fc3a71744b118cbef04
 WHIRLPOOL 
94000767786746748d7896d28270f5c02ccfabdd413434b117d17799d6e502f4376a2ca5753fde8f9f5f5897627da55fd460bcb7b4c34aab25c3d662ad3fc109

diff --git a/www-client/chromium/chromium-56.0.2897.0.ebuild 
b/www-client/chromium/chromium-56.0.2914.3.ebuild
similarity index 98%
rename from www-client/chromium/chromium-56.0.2897.0.ebuild
rename to www-client/chromium/chromium-56.0.2914.3.ebuild
index b55b907..900a8ff 100644
--- a/www-client/chromium/chromium-56.0.2897.0.ebuild
+++ b/www-client/chromium/chromium-56.0.2914.3.ebuild
@@ -57,8 +57,6 @@ COMMON_DEPEND="
        virtual/udev
        x11-libs/cairo:=
        x11-libs/gdk-pixbuf:=
-       gtk3? ( x11-libs/gtk+:3= )
-       !gtk3? ( x11-libs/gtk+:2= )
        x11-libs/libdrm
        x11-libs/libX11:=
        x11-libs/libXcomposite:=
@@ -77,7 +75,7 @@ COMMON_DEPEND="
        dev-libs/libxml2:=[icu]
        dev-libs/libxslt:=
        media-libs/flac:=
-       >=media-libs/harfbuzz-0.9.41:=[icu(+)]
+       >=media-libs/harfbuzz-1.3.1:=[icu(+)]
        >=media-libs/libwebp-0.4.0:=
        sys-libs/zlib:=[minizip]
        kerberos? ( virtual/krb5 )
@@ -89,6 +87,8 @@ RDEPEND="${COMMON_DEPEND}
        x11-misc/xdg-utils
        virtual/opengl
        virtual/ttf-fonts
+       !gtk3? ( x11-libs/gtk+:2 )
+       gtk3? ( x11-libs/gtk+:3 )
        selinux? ( sec-policy/selinux-chromium )
        tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
        widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
@@ -108,6 +108,8 @@ DEPEND="${COMMON_DEPEND}
        sys-devel/flex
        virtual/pkgconfig
        dev-vcs/git
+       x11-libs/gtk+:2
+       x11-libs/gtk+:3
        $(python_gen_any_dep '
                dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
                >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
@@ -162,8 +164,6 @@ PATCHES=(
        "${FILESDIR}/${PN}-system-jinja-r14.patch"
        "${FILESDIR}/${PN}-widevine-r1.patch"
        "${FILESDIR}/${PN}-54-ffmpeg2compat.patch"
-       "${FILESDIR}/${PN}-gn-r8.patch"
-       "${FILESDIR}/${PN}-icu-58.patch"
 )
 
 pkg_pretend() {
@@ -243,6 +243,7 @@ src_prepare() {
                
third_party/google_input_tools/third_party/closure_library/third_party/closure
                third_party/hunspell
                third_party/iccjpeg
+               third_party/inspector_protocol
                third_party/jstemplate
                third_party/khronos
                third_party/leveldatabase
@@ -296,6 +297,7 @@ src_prepare() {
                third_party/zlib/google
                url/third_party/mozilla
                v8/src/third_party/valgrind
+               v8/third_party/inspector_protocol
 
                # gyp -> gn leftovers
                base/third_party/libevent
@@ -435,6 +437,11 @@ src_configure() {
        # Make sure the build system will use the right tools, bug #340795.
        tc-export AR CC CXX NM
 
+       if tc-is-gcc; then
+               # https://bugs.gentoo.org/588596
+               append-flags -fno-delete-null-pointer-checks
+       fi
+
        # Define a custom toolchain for GN
        myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\""
 

Reply via email to