commit: 04322d033ed931f5cfc56902c1b032f42542d3cf Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> AuthorDate: Thu Jul 27 08:21:58 2017 +0000 Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> CommitDate: Thu Jul 27 08:21:58 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04322d03
www-client/chromium: dev channel bump (61.0.3163.13) www-client/chromium/Manifest | 2 +- ....3153.4.ebuild => chromium-61.0.3163.13.ebuild} | 30 ++++++++++++++-------- www-client/chromium/files/chromium-atk-r1.patch | 11 ++++++++ .../chromium/files/chromium-gn-bootstrap-r14.patch | 27 +++++++++++++++++++ 4 files changed, 58 insertions(+), 12 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index b21160d2754..b5f7c5a4a6d 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,5 @@ DIST chromium-59.0.3071.104.tar.xz 531895868 SHA256 a949fa166cdcdbd8419fbdb4583804613d9845130f0c851e4c647d79a4c300d0 SHA512 419cf5bafa80f190cd301c2933502351929c1ef1d5cfedc720ce6762674a0e6af3b4246a8f92e0c29743420338b056061d4e7f9f4a4066a5bdd4d2ee8db3ddbf WHIRLPOOL ab2fbd1beeb485a5c07743a5a84c850b5ad8178a1f97421a0aa0573817b474e633a6ac65ad43f7db67d35d257183ea4eceacd12b4cad63f88cd9777cfa498e68 DIST chromium-60.0.3112.40.tar.xz 537575476 SHA256 4fdc590fc6ef4af16cc72d790b9eaa50829cd8193893a9ec0719481b03f328d3 SHA512 0e121887f7158d47a9fdb7c0be43a0b1cb32d19a893f99cfc13e2ce146e553e6428fdd82815180bacb430eace42f8bf83595073cf449f49e963633e8414b07ef WHIRLPOOL b7b2b62f61c18ed77890383ba1ac2d25094e14c12042fa1b1af50fa1f8d69807673a036fdb54078622e92b32eb7211040fda3513cb079598e3caf1219c594631 DIST chromium-60.0.3112.78.tar.xz 537669428 SHA256 a82db2aa1b9348b619c01894db565eba686780de0e6fa9e83a8f406d06ce03ea SHA512 d6cccf2537233c12d7b0254b45adbf0abdf9ca43688ceed28b3d915290478563be30d30879018fd4d6f2acc9654d9911c0c6bbebba0cdeacd16d748e18296c41 WHIRLPOOL b7acf6a57bced89f1e81e389f72ef80cb4a24f9beed45c737bd511d8e5f64236c5b9888910ee58b746a6cdbbcc58cc1d665e8730e33471ee50782ef4ce883e8c -DIST chromium-61.0.3153.4.tar.xz 545739052 SHA256 ef48c114fed9a9977b731296cf099e62f1b50df07835709b41868c44363c6ec1 SHA512 693f8f31fb97eb57277a23c2b2f88d055d9f06ed89004874449332186e8e2e7ed63af6566e884ee52c963e8cda0a2b95caae9ebba486b279daca3c9355cda711 WHIRLPOOL be65fe3342a761cc0150d3d42708b9055442e2f5f8619a7d956be173b1abef0cb7b4a0bc4f0e55be0990461665fc2ba1e3b899bdffe328b8d3adc1624b15ea03 DIST chromium-61.0.3159.5.tar.xz 546362372 SHA256 34e0e62f5c30df110bd8d5f872021a8a0ee21fc4b6c2d4efcb8a2232612f6e0a SHA512 325312223a1486fef1ca9d19c215147bdb37d7ab83437a6e38a076099bf450b79fbfba4060234307cba6385f9d82bf9d66c7a178f3ca33eeb0be1acee71e03f0 WHIRLPOOL cecab851eb6b247e7e381cfcac94d43d2b30d38631160ba1393920e241803e3b54402f719677b608ac15734c21ad6e762925e18f92b1b3e40f3aea93886aa721 +DIST chromium-61.0.3163.13.tar.xz 552794140 SHA256 b140c1405345a13ef8490efde64cfce413267f42baf107f83e81ba6f6dff0b2d SHA512 3c251239d22e4b8e97d9f96868289fa6e12be2167704bcf88dfa8ccf01806f713557f98b8b48d7752ebda24eb8c290ff94e0f279cf4507f7ea14664f1719763a WHIRLPOOL 51fb1214b29e6d462980b7f3238142f43f54b4fdd5c9d5cd3507c57bb168ef00676d10b6dc09ea1c722d4d17f144a31b873f8570892b4682888b581d04a97983 diff --git a/www-client/chromium/chromium-61.0.3153.4.ebuild b/www-client/chromium/chromium-61.0.3163.13.ebuild similarity index 97% rename from www-client/chromium/chromium-61.0.3153.4.ebuild rename to www-client/chromium/chromium-61.0.3163.13.ebuild index 754b7c87217..472aa46d7cc 100644 --- a/www-client/chromium/chromium-61.0.3153.4.ebuild +++ b/www-client/chromium/chromium-61.0.3163.13.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-libvpx +tcmalloc widevine" +IUSE="component-build cups gnome-keyring +gtk3 +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" # Native Client binaries are compiled with different set of flags, bug #452066. @@ -32,7 +32,7 @@ COMMON_DEPEND=" cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 - dev-libs/icu:= + system-icu? ( <dev-libs/icu-59:= ) dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= @@ -142,6 +142,14 @@ theme that covers the appropriate MIME types, and configure this as your GTK+ icon theme. " +PATCHES=( + "${FILESDIR}/${PN}-widevine-r1.patch" + "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" + "${FILESDIR}/${PN}-gcc-r1.patch" + "${FILESDIR}/${PN}-gn-bootstrap-r14.patch" + "${FILESDIR}/${PN}-atk-r1.patch" +) + pre_build_checks() { if [[ ${MERGE_TYPE} != binary ]]; then local -x CPP="$(tc-getCXX) -E" @@ -183,12 +191,6 @@ pkg_setup() { } src_prepare() { - local PATCHES=( - "${FILESDIR}/${PN}-widevine-r1.patch" - "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" - "${FILESDIR}/${PN}-gn-bootstrap-r12.patch" - ) - default mkdir -p third_party/node/linux/node-linux-x64/bin || die @@ -321,6 +323,9 @@ src_prepare() { if ! use system-ffmpeg; then keeplibs+=( third_party/ffmpeg ) fi + if ! use system-icu; then + keeplibs+=( third_party/icu ) + fi if ! use system-libvpx; then keeplibs+=( third_party/libvpx ) keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) @@ -377,7 +382,6 @@ src_configure() { local gn_system_libraries=( flac harfbuzz-ng - icu libdrm libjpeg libpng @@ -393,6 +397,9 @@ src_configure() { if use system-ffmpeg; then gn_system_libraries+=( ffmpeg ) fi + if use system-icu; then + gn_system_libraries+=( icu ) + fi if use system-libvpx; then gn_system_libraries+=( libvpx ) fi @@ -599,8 +606,9 @@ src_install() { doins out/Release/*.pak doins out/Release/*.so - # Needed by bundled icu - # doins out/Release/icudtl.dat + if ! use system-icu; then + doins out/Release/icudtl.dat + fi doins -r out/Release/locales doins -r out/Release/resources diff --git a/www-client/chromium/files/chromium-atk-r1.patch b/www-client/chromium/files/chromium-atk-r1.patch new file mode 100644 index 00000000000..32fa29975b3 --- /dev/null +++ b/www-client/chromium/files/chromium-atk-r1.patch @@ -0,0 +1,11 @@ +--- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000 ++++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000 +@@ -571,7 +571,7 @@ + // it's best to leave this out rather than break people's builds: + #if defined(ATK_CHECK_VERSION) + #if ATK_CHECK_VERSION(2, 16, 0) +- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY); ++ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); + #endif + #endif + break; diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r14.patch b/www-client/chromium/files/chromium-gn-bootstrap-r14.patch new file mode 100644 index 00000000000..3c44c858f78 --- /dev/null +++ b/www-client/chromium/files/chromium-gn-bootstrap-r14.patch @@ -0,0 +1,27 @@ +commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 +Author: Pawel Hajdan, Jr <[email protected]> +Date: Wed Jul 26 21:51:54 2017 +0000 + + wip + +diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py +index 1390560f8e37..ff2ae57c46b0 100755 +--- a/tools/gn/bootstrap/bootstrap.py ++++ b/tools/gn/bootstrap/bootstrap.py +@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/metrics/histogram_base.cc', + 'base/metrics/histogram_functions.cc', + 'base/metrics/histogram_samples.cc', ++ 'base/metrics/histogram_snapshot_manager.cc', + 'base/metrics/metrics_hashes.cc', + 'base/metrics/persistent_histogram_allocator.cc', + 'base/metrics/persistent_memory_allocator.cc', +@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options): + 'base/trace_event/heap_profiler_allocation_context_tracker.cc', + 'base/trace_event/heap_profiler_allocation_register.cc', + 'base/trace_event/heap_profiler_event_filter.cc', +- 'base/trace_event/heap_profiler_event_writer.cc', ++ 'base/trace_event/heap_profiler_heap_dump_writer.cc', + 'base/trace_event/heap_profiler_serialization_state.cc', + 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', + 'base/trace_event/heap_profiler_type_name_deduplicator.cc',
