diff options
author | Mike Gilbert <floppym@gentoo.org> | 2016-09-25 21:10:43 -0400 |
---|---|---|
committer | Mike Gilbert <floppym@gentoo.org> | 2016-09-25 21:10:43 -0400 |
commit | 866c9234b87d1cf0e5e8794fa3aa9fc31d332711 (patch) | |
tree | 5e55cedcc5a96ffd39e62d75795c1ce3dc5927bb /www-client/chromium | |
parent | app-emulation/qemu: drop vulnerable versions 2.7.0, 2.7.0-r2 (diff) | |
download | gentoo-866c9234b87d1cf0e5e8794fa3aa9fc31d332711.tar.gz gentoo-866c9234b87d1cf0e5e8794fa3aa9fc31d332711.tar.bz2 gentoo-866c9234b87d1cf0e5e8794fa3aa9fc31d332711.zip |
www-client/chromium: dev channel bump (55.0.2868.3)
Package-Manager: portage-2.3.1_p4_p152503
Diffstat (limited to 'www-client/chromium')
-rw-r--r-- | www-client/chromium/Manifest | 2 | ||||
-rw-r--r-- | www-client/chromium/chromium-55.0.2868.3.ebuild (renamed from www-client/chromium/chromium-55.0.2853.0.ebuild) | 26 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-gn-r6.patch | 13 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-system-zlib-r1.patch | 9 |
4 files changed, 36 insertions, 14 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 6638750b4ac4..00f8bc33091f 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.2853.0.tar.xz 501960780 SHA256 f6cff02888c5a781f29ece91df38c874a2245f3e12495cbdb49c141db211835a SHA512 4963f9aa3b965845c518b6565f8b1494ef59ec090c3d9b559cb01ddbb883dbc421d72dac6f6a652fea484821096a0ce2ccc4370818a74803d29aebdfbf956efd WHIRLPOOL 0b8469540a0a952483629ee87f90368d4597fbb82ba532edc1b6d7f5670e3155bb822b5f30a1764d9c547ac71260ee0cb44328c9d6320b2ab331f1661dd948c6 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 diff --git a/www-client/chromium/chromium-55.0.2853.0.ebuild b/www-client/chromium/chromium-55.0.2868.3.ebuild index e025a39b3e36..d8eaa0b8e1d0 100644 --- a/www-client/chromium/chromium-55.0.2853.0.ebuild +++ b/www-client/chromium/chromium-55.0.2868.3.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:= @@ -73,7 +74,6 @@ COMMON_DEPEND=" 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:= @@ -83,6 +83,7 @@ COMMON_DEPEND=" kerberos? ( virtual/krb5 ) !gn? ( >=app-accessibility/speech-dispatcher-0.8:= + >=dev-libs/libevent-1.4.13:= ) " # For nvidia-drivers blocker, see bug #413637 . @@ -164,7 +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}/${PN}-54-ffmpeg2compat.patch" + "${FILESDIR}/${PN}-gn-r6.patch" + "${FILESDIR}/${PN}-system-zlib-r1.patch" ) pkg_pretend() { @@ -234,7 +237,6 @@ src_prepare() { 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/fips181 @@ -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). @@ -365,10 +365,11 @@ src_configure() { -Duse_system_xdg_utils=1 -Duse_system_zlib=1" + # libevent: https://bugs.gentoo.org/593458 local gn_system_libraries=" flac harfbuzz-ng - libevent + 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+=" @@ -451,11 +449,12 @@ src_configure() { -Dlinux_use_gold_flags=0 -Dsysroot=" # Trying to use gold results in linker crash. - myconf_gn+=" use_gold=false use_sysroot=false" + myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false" ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" myconf_gyp+=" -Dproprietary_codecs=1 -Dffmpeg_branding=${ffmpeg_branding}" - myconf_gn+=" proprietary_codecs=true ffmpeg_branding=\"${ffmpeg_branding}\"" + myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" + myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . # Note: these are for Gentoo use ONLY. For your own distribution, @@ -536,6 +535,9 @@ src_configure() { # Make sure the build system will use the right tools, bug #340795. tc-export AR CC CXX NM + # Define a custom toolchain for GN + myconf_gn+=" custom_toolchain=\"${FILESDIR}/toolchain:default\"" + # Tools for building programs to be executed on the build system, bug #410883. if tc-is-cross-compiler; then export AR_host=$(tc-getBUILD_AR) @@ -666,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-r6.patch b/www-client/chromium/files/chromium-gn-r6.patch new file mode 100644 index 000000000000..0273f4eb85ff --- /dev/null +++ b/www-client/chromium/files/chromium-gn-r6.patch @@ -0,0 +1,13 @@ +Index: tools/gn/bootstrap/bootstrap.py +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index b07fd0a8eaf139e4d09e1641ce265353a3cd3ee5..e8304549335350915380731713643cd57ec70407 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -397,7 +397,6 @@ 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', diff --git a/www-client/chromium/files/chromium-system-zlib-r1.patch b/www-client/chromium/files/chromium-system-zlib-r1.patch new file mode 100644 index 000000000000..c6a6c4083276 --- /dev/null +++ b/www-client/chromium/files/chromium-system-zlib-r1.patch @@ -0,0 +1,9 @@ +--- a/extensions/browser/api/cast_channel/BUILD.gn.orig 2016-09-23 21:35:47.685867065 +0000 ++++ b/extensions/browser/api/cast_channel/BUILD.gn 2016-09-23 21:36:29.986723126 +0000 +@@ -27,5 +27,6 @@ + deps = [ + "//extensions/common/api", + "//extensions/common/api/cast_channel:cast_channel_proto", ++ "//third_party/zlib", + ] + } |