| 1 |
commit: 199c9247637d5fb72d1b14ea58327cfdb4da282d |
| 2 |
Author: Pawel Hajdan, Jr <phajdan.jr <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Sep 4 21:06:14 2017 +0000 |
| 4 |
Commit: Paweł Hajdan <phajdan.jr <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 4 21:07:18 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=199c9247 |
| 7 |
|
| 8 |
www-client/chromium: dev channel bump (62.0.3198.0) |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.1 |
| 11 |
|
| 12 |
www-client/chromium/Manifest | 2 +- |
| 13 |
...0.3188.2.ebuild => chromium-62.0.3198.0.ebuild} | 16 +++-- |
| 14 |
.../chromium/files/chromium-gn-bootstrap-r17.patch | 68 ++++++++++++++++++++++ |
| 15 |
3 files changed, 81 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest |
| 18 |
index e86277c8438..102bb25a07e 100644 |
| 19 |
--- a/www-client/chromium/Manifest |
| 20 |
+++ b/www-client/chromium/Manifest |
| 21 |
@@ -1,5 +1,5 @@ |
| 22 |
DIST chromium-60.0.3112.78.tar.xz 537669428 SHA256 a82db2aa1b9348b619c01894db565eba686780de0e6fa9e83a8f406d06ce03ea SHA512 d6cccf2537233c12d7b0254b45adbf0abdf9ca43688ceed28b3d915290478563be30d30879018fd4d6f2acc9654d9911c0c6bbebba0cdeacd16d748e18296c41 WHIRLPOOL b7acf6a57bced89f1e81e389f72ef80cb4a24f9beed45c737bd511d8e5f64236c5b9888910ee58b746a6cdbbcc58cc1d665e8730e33471ee50782ef4ce883e8c |
| 23 |
DIST chromium-61.0.3163.49.tar.xz 556004264 SHA256 60f859a1a1007968e1ac70eaef3e3990df57e280e03641266f89a68453acd68c SHA512 216670f8f20bd0b2f93f46d0e15895cf372c1ad44713096a1f64e7f8b610cf33d84549f176d7eb7f4af6b74154d8251570927d54310a9fa562191f74c9f778d4 WHIRLPOOL 4dfb07cf5f1e27c017ca04f807f88da27c0cf06cfbc0f74008f8c2963be9a5ba5769c39436045d3d35025a6f518bf9301f44af1ae2f1a9410c0d0ca7385a607b |
| 24 |
DIST chromium-61.0.3163.59.tar.xz 556163044 SHA256 740fe9d15e8e8c09df6fdefa52676261cff2bc6fc5d061a7125f60594d6d4360 SHA512 9ad8b7d2251075387d7ffda4cf5517a2f64d3b8ecd7fd399e35cc91b00daff26ecb2ae5d3a23f52c2207b075f7149f5df7cfa05c8ca20e2cf9048d032a103978 WHIRLPOOL db36a1a76f44e287e58af3d5b90756a8347e07b773c526e4af9ad4f7dbd5681658d36b62b5c7748349131e68b39fa51145318b449ea3b6e661741e72576f3239 |
| 25 |
-DIST chromium-62.0.3188.2.tar.xz 515878612 SHA256 37d3c3aaf77f40ef51e71cc9b1752e6c4149a2e4e05a277cf1dd372d6d361b81 SHA512 318b34d670f65cf50eb24bd54c752e116847b5f53e97e2896f1bb8d33d1209046e4a248fa1703bb1e6dfa990233d64353a0d233c3a7cc1aeee6147aad59fedb3 WHIRLPOOL 27c906a755dc4877cdd081572300d4fd001c38bb870be35cdb667931ee79f8bbe015744168861043c5bfb44f970e9263774b91d5cf77bb4d91ef808066ef5e32 |
| 26 |
DIST chromium-62.0.3192.0.tar.xz 516499652 SHA256 437cc2045ebbb755ec929d403f7f51afe58ea3916aee609937b903772a7c7919 SHA512 bbc040084d83e52558407b9975ebe874d44260ce5c5daf34ae35b79e806ad3b78d15f81e9ec19e69dcabb3d281bdda9948b697f6b97318816b8b9b247822a5a4 WHIRLPOOL f8cbb93cb6a1a0a1527055951f6711049db0e60a60449562d25e2fe82ae30f73653ebe1f7d04615351104f52dc0ed5b278bc32872c5b08ecd450c56114be6c08 |
| 27 |
+DIST chromium-62.0.3198.0.tar.xz 516801712 SHA256 6e7c33bfe357554cd9400d55bfc280338a7a9474bb0a53b6c81ea84688637970 SHA512 61271628a8ea84f5c2838949869e067baaf86a9a5c0dad09e82e05fd86654e9a6584c8b7152de57851a0162068618c198f52748cf74c0cb050e86a5cd6a94a0c WHIRLPOOL bcfde66dbe69e11a06fa280c8739987e7e3e5afabb780ea0aafe3ac96d8843117d980d938f7a5762dc379711ce03cbdce391f77725e65af028b6ef9db88ee679 |
| 28 |
|
| 29 |
diff --git a/www-client/chromium/chromium-62.0.3188.2.ebuild b/www-client/chromium/chromium-62.0.3198.0.ebuild |
| 30 |
similarity index 98% |
| 31 |
rename from www-client/chromium/chromium-62.0.3188.2.ebuild |
| 32 |
rename to www-client/chromium/chromium-62.0.3198.0.ebuild |
| 33 |
index baa5f1920f7..f1b0a038ce7 100644 |
| 34 |
--- a/www-client/chromium/chromium-62.0.3188.2.ebuild |
| 35 |
+++ b/www-client/chromium/chromium-62.0.3198.0.ebuild |
| 36 |
@@ -40,13 +40,21 @@ COMMON_DEPEND=" |
| 37 |
system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) |
| 38 |
>=media-libs/openh264-1.6.0:= |
| 39 |
pulseaudio? ( media-sound/pulseaudio:= ) |
| 40 |
- system-ffmpeg? ( >=media-video/ffmpeg-3:= media-libs/opus:= ) |
| 41 |
+ system-ffmpeg? ( |
| 42 |
+ >=media-video/ffmpeg-3:= |
| 43 |
+ || ( |
| 44 |
+ media-video/ffmpeg[-samba] |
| 45 |
+ >=net-fs/samba-4.5.10-r1[-debug(-)] |
| 46 |
+ ) |
| 47 |
+ !=net-fs/samba-4.5.12 |
| 48 |
+ media-libs/opus:= |
| 49 |
+ ) |
| 50 |
sys-apps/dbus:= |
| 51 |
sys-apps/pciutils:= |
| 52 |
virtual/udev |
| 53 |
x11-libs/cairo:= |
| 54 |
x11-libs/gdk-pixbuf:2 |
| 55 |
- x11-libs/gtk+:3 |
| 56 |
+ x11-libs/gtk+:3[X] |
| 57 |
x11-libs/libX11:= |
| 58 |
x11-libs/libXcomposite:= |
| 59 |
x11-libs/libXcursor:= |
| 60 |
@@ -137,8 +145,7 @@ PATCHES=( |
| 61 |
"${FILESDIR}/${PN}-widevine-r1.patch" |
| 62 |
"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" |
| 63 |
"${FILESDIR}/${PN}-gcc5-r2.patch" |
| 64 |
- "${FILESDIR}/${PN}-gn-bootstrap-r16.patch" |
| 65 |
- "${FILESDIR}/${PN}-system-icu-r2.patch" |
| 66 |
+ "${FILESDIR}/${PN}-gn-bootstrap-r17.patch" |
| 67 |
) |
| 68 |
|
| 69 |
pre_build_checks() { |
| 70 |
@@ -282,6 +289,7 @@ src_prepare() { |
| 71 |
third_party/qcms |
| 72 |
third_party/sfntly |
| 73 |
third_party/skia |
| 74 |
+ third_party/skia/third_party/gif |
| 75 |
third_party/skia/third_party/vulkan |
| 76 |
third_party/smhasher |
| 77 |
third_party/spirv-headers |
| 78 |
|
| 79 |
diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r17.patch b/www-client/chromium/files/chromium-gn-bootstrap-r17.patch |
| 80 |
new file mode 100644 |
| 81 |
index 00000000000..6cfd08d58c2 |
| 82 |
--- /dev/null |
| 83 |
+++ b/www-client/chromium/files/chromium-gn-bootstrap-r17.patch |
| 84 |
@@ -0,0 +1,68 @@ |
| 85 |
+--- a/tools/gn/bootstrap/bootstrap.py |
| 86 |
++++ b/tools/gn/bootstrap/bootstrap.py |
| 87 |
+@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options): |
| 88 |
+ |
| 89 |
+ write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h', |
| 90 |
+ { |
| 91 |
++ 'ENABLE_LOCATION_SOURCE': 'false', |
| 92 |
+ 'ENABLE_PROFILING': 'false', |
| 93 |
+ 'CAN_UNWIND_WITH_FRAME_POINTERS': 'false' |
| 94 |
+ }) |
| 95 |
+@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options): |
| 96 |
+ |
| 97 |
+ write_gn_ninja(os.path.join(tempdir, 'build.ninja'), |
| 98 |
+ root_gen_dir, options) |
| 99 |
+- cmd = ['ninja', '-C', tempdir] |
| 100 |
++ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err'] |
| 101 |
+ if options.verbose: |
| 102 |
+ cmd.append('-v') |
| 103 |
+ |
| 104 |
+@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 105 |
+ 'base/metrics/bucket_ranges.cc', |
| 106 |
+ 'base/metrics/field_trial.cc', |
| 107 |
+ 'base/metrics/field_trial_param_associator.cc', |
| 108 |
++ 'base/metrics/field_trial_params.cc', |
| 109 |
+ 'base/metrics/histogram.cc', |
| 110 |
+ 'base/metrics/histogram_base.cc', |
| 111 |
+ 'base/metrics/histogram_functions.cc', |
| 112 |
+@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 113 |
+ 'base/task_scheduler/scheduler_lock_impl.cc', |
| 114 |
+ 'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc', |
| 115 |
+ 'base/task_scheduler/scheduler_worker.cc', |
| 116 |
++ 'base/task_scheduler/scheduler_worker_pool.cc', |
| 117 |
+ 'base/task_scheduler/scheduler_worker_pool_impl.cc', |
| 118 |
+ 'base/task_scheduler/scheduler_worker_pool_params.cc', |
| 119 |
+ 'base/task_scheduler/scheduler_worker_stack.cc', |
| 120 |
+@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 121 |
+ 'base/third_party/icu/icu_utf.cc', |
| 122 |
+ 'base/third_party/nspr/prtime.cc', |
| 123 |
+ 'base/threading/post_task_and_reply_impl.cc', |
| 124 |
++ 'base/threading/scoped_blocking_call.cc', |
| 125 |
+ 'base/threading/sequence_local_storage_map.cc', |
| 126 |
+ 'base/threading/sequenced_task_runner_handle.cc', |
| 127 |
+ 'base/threading/sequenced_worker_pool.cc', |
| 128 |
+@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 129 |
+ 'base/unguessable_token.cc', |
| 130 |
+ 'base/value_iterators.cc', |
| 131 |
+ 'base/values.cc', |
| 132 |
+- 'base/value_iterators.cc', |
| 133 |
+ 'base/vlog.cc', |
| 134 |
+ ]) |
| 135 |
+ |
| 136 |
+@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options): |
| 137 |
+ static_libraries['base']['sources'].extend([ |
| 138 |
+ 'base/memory/shared_memory_handle_posix.cc', |
| 139 |
+ 'base/memory/shared_memory_posix.cc', |
| 140 |
+- 'base/memory/shared_memory_tracker.cc', |
| 141 |
+ 'base/nix/xdg_util.cc', |
| 142 |
+ 'base/process/internal_linux.cc', |
| 143 |
+ 'base/process/memory_linux.cc', |
| 144 |
+@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options): |
| 145 |
+ cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args] |
| 146 |
+ check_call(cmd) |
| 147 |
+ |
| 148 |
+- cmd = ['ninja', '-C', build_dir] |
| 149 |
++ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err'] |
| 150 |
+ if options.verbose: |
| 151 |
+ cmd.append('-v') |
| 152 |
+ cmd.append('gn') |
Archives