chromium: 61.0.3163.100 -> 62.0.3202.75
This commit is contained in:
Danny Rawlins
parent
dcf852b5d9
commit
b7ef4ebb46
|
|
@ -87,8 +87,12 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/Images/
|
|||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/Tests.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/accessibility/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/accessibility/accessibility_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/accessibility_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/accessibility_test_runner/accessibility_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/animation/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/animation/animation_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/application_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/application_test_runner/application_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits/audits_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2/
|
||||
|
|
@ -96,6 +100,10 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2/
|
|||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_worker.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits2_worker/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits2_worker/audits2_worker_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/audits_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/audits_test_runner/audits_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/bindings_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/bindings_test_runner/bindings_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/changes/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/changes/changes_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cm/
|
||||
|
|
@ -112,8 +120,14 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/cookie_table/
|
|||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/cookie_table/cookie_table_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/coverage/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/coverage/coverage_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/coverage_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/coverage_test_runner/coverage_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/data_grid/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/data_grid/data_grid_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/data_grid_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/data_grid_test_runner/data_grid_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/device_mode_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/device_mode_test_runner/device_mode_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/devices/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devices/devices_module.js
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/devtools_compatibility.js
|
||||
|
|
@ -164,6 +178,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/emulated_devices/
|
|||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/iPhone6Plus-portrait.svg
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/event_listeners/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/event_listeners/event_listeners_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/extensions_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/extensions_test_runner/extensions_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/formatter/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter/formatter_module.js
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/formatter_worker.js
|
||||
|
|
@ -174,6 +190,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/har_importer/
|
|||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_model/heap_snapshot_model_module.js
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/heap_snapshot_worker/heap_snapshot_worker_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/inline_editor/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inline_editor/inline_editor_module.js
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.html
|
||||
|
|
@ -184,34 +202,40 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layer_viewer/
|
|||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/layer_viewer/layer_viewer_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers/layers_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/layers_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/layers_test_runner/layers_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/network/network_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network_priorities/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/network_priorities/network_priorities_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/network_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/network_test_runner/network_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/object_ui/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/object_ui/object_ui_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/perf_ui/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/perf_ui/perf_ui_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry/product_registry_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/performance_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/performance_test_runner/performance_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/product_registry_impl/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/product_registry_impl/product_registry_impl_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler/profiler_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/protocol/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/protocol/protocol_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/profiler_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/profiler_test_runner/profiler_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/quick_open/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/quick_open/quick_open_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/resources/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/resources/resources_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass/sass_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sass_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sass_test_runner/sass_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/screencast/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/screencast/screencast_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sdk/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sdk/sdk_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/security/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/security/security_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/security_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/security_test_runner/security_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/settings/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/settings/settings_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/snippets/
|
||||
|
|
@ -220,6 +244,8 @@ drwxr-xr-x root/root usr/lib/chromium/resources/inspector/source_frame/
|
|||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/source_frame/source_frame_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sources/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sources/sources_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/sources_test_runner/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/sources_test_runner/sources_test_runner_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/terminal/
|
||||
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/terminal/terminal_module.js
|
||||
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/text_editor/
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
4dbc4cd98731f133a3f6e0f47625ad08 breakpad-use-ucontext_t.patch
|
||||
bf0629c03b3e3b957a9ee99c10b28210 chromium-61.0.3163.100.tar.xz
|
||||
5b5a3ad8970846d3cead13249a101283 chromium-atk-r1.patch
|
||||
034bc28a6988f3d6d1e7f291ec95365c chromium-blink-gcc7.patch
|
||||
ab7416d1494bb6a0a96fb72c9388580d chromium-gcc-r1.patch
|
||||
22440a6f0c5660e90866d131a40fb0af chromium-gn-bootstrap-r14.patch
|
||||
c754e1f63065d487fb134881de4932cd chromium-62.0.3202.75.tar.xz
|
||||
1e9f37377b470e26dc0fa609c1cdad9e chromium-gn-bootstrap-r17.patch
|
||||
b527005e021b14869a669e42c46b661d chromium.desktop
|
||||
64968626706b07721983ac59fb3babbf chromium.sh
|
||||
d1359f1c4cc42c9f74a862361d736ef1 crc32c-string-view-check.patch
|
||||
3354997dd0bfde3443499133a6e16a85 last-commit-position.patch
|
||||
|
|
|
|||
|
|
@ -1,13 +1,11 @@
|
|||
untrusted comment: verify with /etc/ports/opt.pub
|
||||
RWSE3ohX2g5d/RQRkJbyYop1l0pcRSBGUEJrsmX731/zrvoFci4Ho5GE/b1aMeTSZRj44wiPdgJrWYjN1njrxBJ5RU+FXoik8Ao=
|
||||
SHA256 (Pkgfile) = 37895397e0d9835bd6ce869e234b267ccc624dbd553f7892b57aaac8e9d16bc8
|
||||
SHA256 (.footprint) = 2c9b42f63b18b1aa993b3ff732bea8f1451848f7702ec1219fb2dd2550bab7a5
|
||||
SHA256 (chromium-61.0.3163.100.tar.xz) = 4135968cac6623c1d2b224494600cd274098cce41c298f8c3908b354a34c281b
|
||||
RWSE3ohX2g5d/WBzzRvF+yy/gQuxC+HU0XwO61a9CuyKiuSN+Co1nYXON+kLKPDdbVbg/P1J+W99Sv1SX51bFmUz2jVAKrhgNQk=
|
||||
SHA256 (Pkgfile) = 61f827e6bf70970b9c8da29ad34a47df6c87e246fb8aa4fe7203eca8d29760bd
|
||||
SHA256 (.footprint) = b706fe319357b624c6652ab38bdaaa96a6e0070e2be5802f4c38a5bceafa8374
|
||||
SHA256 (chromium-62.0.3202.75.tar.xz) = 49cdfe457bcb941b56c13a75bbe2ff394fcb5baa8a49c9b470835fad60dd904c
|
||||
SHA256 (last-commit-position.patch) = d3dc397956a26ec045e76c25c57a1fac5fc0acff94306b2a670daee7ba15709e
|
||||
SHA256 (chromium.sh) = 7b182d0ae1e9ef841f8cd0b403a304babd548bf60b5e3808b2144bebdbb7c154
|
||||
SHA256 (chromium.desktop) = caf015652ac7ce9403a5cb6c7bec3dc597222b20c5842059ee15674e2c9209cc
|
||||
SHA256 (breakpad-use-ucontext_t.patch) = 6e9a345f810d36068ee74ebba4708c70ab30421dad3571b6be5e9db635078ea8
|
||||
SHA256 (chromium-gcc-r1.patch) = 11cffe305dd49027c91638261463871e9ecb0ecc6ecc02bfa37b203c5960ab58
|
||||
SHA256 (chromium-gn-bootstrap-r14.patch) = 98784c4a0a793ecf34987bc8f91ae360d78596a4a59dd47651411381f752a080
|
||||
SHA256 (chromium-atk-r1.patch) = fc0e9abb77b6f8e21a7601ff53f267a854736d711b530be5bbd80d976678e98d
|
||||
SHA256 (chromium-blink-gcc7.patch) = f94310a7ba9b8b777adfb4442bcc0a8f0a3d549b2cf4a156066f8e2e28e2f323
|
||||
SHA256 (chromium-gn-bootstrap-r17.patch) = d81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b
|
||||
SHA256 (crc32c-string-view-check.patch) = 35435e8dae76737baafecdc76d74a1c97281c4179e416556e033a06a31468e6d
|
||||
|
|
|
|||
|
|
@ -1,19 +1,16 @@
|
|||
# Description: Open source version of Google Chrome web browser.
|
||||
# URL: http://chromium.org/
|
||||
# Maintainer: Jose V Beneyto, sepen at crux dot nu
|
||||
# Packager: Tadeusz Sosnierz, tadzikes gmail com
|
||||
# Maintainer: CRUX System Team, core-ports at crux dot nu
|
||||
# Depends on: dbus-glib gperf gtk gtk3 libevent libexif libgcrypt ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt yasm
|
||||
|
||||
name=chromium
|
||||
version=61.0.3163.100
|
||||
version=62.0.3202.75
|
||||
release=1
|
||||
source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz
|
||||
last-commit-position.patch $name.sh $name.desktop
|
||||
breakpad-use-ucontext_t.patch
|
||||
chromium-gcc-r1.patch
|
||||
chromium-gn-bootstrap-r14.patch
|
||||
chromium-atk-r1.patch
|
||||
chromium-blink-gcc7.patch)
|
||||
chromium-gn-bootstrap-r17.patch
|
||||
crc32c-string-view-check.patch)
|
||||
|
||||
build() {
|
||||
cd $name-$version
|
||||
|
|
@ -24,16 +21,14 @@ build() {
|
|||
# we don't use git sources
|
||||
patch -p1 -i $SRC/last-commit-position.patch
|
||||
|
||||
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347
|
||||
patch -p1 -i $SRC/chromium-blink-gcc7.patch
|
||||
# Fix incorrect inclusion of <string_view> in modes other than >= C++17
|
||||
patch -p1 -d third_party/crc32c/src -i $SRC/crc32c-string-view-check.patch
|
||||
|
||||
# Fix build with glibc 2.26
|
||||
patch -p1 -i $SRC/breakpad-use-ucontext_t.patch
|
||||
|
||||
# Fixes from Gentoo
|
||||
patch -p1 -i $SRC/chromium-gcc-r1.patch
|
||||
patch -p1 -i $SRC/chromium-gn-bootstrap-r14.patch
|
||||
patch -p1 -i $SRC/chromium-atk-r1.patch
|
||||
patch -p1 -i $SRC/chromium-gn-bootstrap-r17.patch
|
||||
|
||||
mkdir -p third_party/node/linux/node-linux-x64/bin
|
||||
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
|
||||
|
|
@ -68,11 +63,7 @@ build() {
|
|||
python2 tools/gn/bootstrap/bootstrap.py --gn-gen-args="${_gn_args[*]}"
|
||||
out/Release/gn gen out/Release --args="${_gn_args[*]}" --script-executable=/usr/bin/python2
|
||||
|
||||
# Ninja, by default, sets the number of jobs to the number of availalble threads
|
||||
local JOBS=$(awk 'BEGIN{RS="-j|--jobs="} NR==2 {print $1}' <<< $MAKEFLAGS)
|
||||
test -n "$JOBS" && export JOBS="-j $JOBS"
|
||||
|
||||
ninja $JOBS -C out/Release chrome chrome_sandbox
|
||||
ninja -j ${JOBS-1} -C out/Release chrome chrome_sandbox
|
||||
|
||||
install -m 0755 -D out/Release/chrome $PKG/usr/lib/$name/$name
|
||||
install -m 4755 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/$name/chrome-sandbox
|
||||
|
|
|
|||
|
|
@ -1,11 +0,0 @@
|
|||
--- 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;
|
||||
|
|
@ -1,76 +0,0 @@
|
|||
--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h.orig 2017-06-06 15:05:38.145247996 +0300
|
||||
+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/wtf/LinkedHashSet.h 2017-06-06 15:06:13.866246667 +0300
|
||||
@@ -685,6 +685,31 @@ inline LinkedHashSet<T, U, V, W>& Linked
|
||||
return *this;
|
||||
}
|
||||
|
||||
+inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
|
||||
+ DCHECK(a.prev_);
|
||||
+ DCHECK(a.next_);
|
||||
+ DCHECK(b.prev_);
|
||||
+ DCHECK(b.next_);
|
||||
+ swap(a.prev_, b.prev_);
|
||||
+ swap(a.next_, b.next_);
|
||||
+ if (b.next_ == &a) {
|
||||
+ DCHECK_EQ(b.prev_, &a);
|
||||
+ b.next_ = &b;
|
||||
+ b.prev_ = &b;
|
||||
+ } else {
|
||||
+ b.next_->prev_ = &b;
|
||||
+ b.prev_->next_ = &b;
|
||||
+ }
|
||||
+ if (a.next_ == &b) {
|
||||
+ DCHECK_EQ(a.prev_, &b);
|
||||
+ a.next_ = &a;
|
||||
+ a.prev_ = &a;
|
||||
+ } else {
|
||||
+ a.next_->prev_ = &a;
|
||||
+ a.prev_->next_ = &a;
|
||||
+ }
|
||||
+}
|
||||
+
|
||||
template <typename T, typename U, typename V, typename W>
|
||||
inline void LinkedHashSet<T, U, V, W>::Swap(LinkedHashSet& other) {
|
||||
impl_.Swap(other.impl_);
|
||||
@@ -877,31 +902,6 @@ inline void LinkedHashSet<T, U, V, W>::e
|
||||
erase(Find(value));
|
||||
}
|
||||
|
||||
-inline void SwapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
|
||||
- DCHECK(a.prev_);
|
||||
- DCHECK(a.next_);
|
||||
- DCHECK(b.prev_);
|
||||
- DCHECK(b.next_);
|
||||
- swap(a.prev_, b.prev_);
|
||||
- swap(a.next_, b.next_);
|
||||
- if (b.next_ == &a) {
|
||||
- DCHECK_EQ(b.prev_, &a);
|
||||
- b.next_ = &b;
|
||||
- b.prev_ = &b;
|
||||
- } else {
|
||||
- b.next_->prev_ = &b;
|
||||
- b.prev_->next_ = &b;
|
||||
- }
|
||||
- if (a.next_ == &b) {
|
||||
- DCHECK_EQ(a.prev_, &b);
|
||||
- a.next_ = &a;
|
||||
- a.prev_ = &a;
|
||||
- } else {
|
||||
- a.next_->prev_ = &a;
|
||||
- a.prev_->next_ = &a;
|
||||
- }
|
||||
-}
|
||||
-
|
||||
inline void swap(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b) {
|
||||
DCHECK_NE(a.next_, &a);
|
||||
DCHECK_NE(b.next_, &b);
|
||||
--- chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h.orig 2017-06-06 16:16:43.657661313 +0300
|
||||
+++ chromium-59.0.3071.86/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h 2017-06-06 16:16:50.911198032 +0300
|
||||
@@ -5,6 +5,7 @@
|
||||
#include "platform/PlatformExport.h"
|
||||
#include "platform/wtf/ThreadSpecific.h"
|
||||
|
||||
+#include <functional>
|
||||
#include <memory>
|
||||
|
||||
namespace gpu {
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h
|
||||
index 99f230ce7e9a..de2415d402f5 100644
|
||||
--- a/base/numerics/safe_math_shared_impl.h
|
||||
+++ b/base/numerics/safe_math_shared_impl.h
|
||||
@@ -21,8 +21,7 @@
|
||||
#if !defined(__native_client__) && \
|
||||
((defined(__clang__) && \
|
||||
((__clang_major__ > 3) || \
|
||||
- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \
|
||||
- (defined(__GNUC__) && __GNUC__ >= 5))
|
||||
+ (__clang_major__ == 3 && __clang_minor__ >= 4))))
|
||||
#include "base/numerics/safe_math_clang_gcc_impl.h"
|
||||
#define BASE_HAS_OPTIMIZED_SAFE_MATH (1)
|
||||
#else
|
||||
|
|
@ -1,27 +0,0 @@
|
|||
commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685
|
||||
Author: Pawel Hajdan, Jr <phajdan.jr@chromium.org>
|
||||
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',
|
||||
68
chromium/chromium-gn-bootstrap-r17.patch
Normal file
68
chromium/chromium-gn-bootstrap-r17.patch
Normal file
|
|
@ -0,0 +1,68 @@
|
|||
--- a/tools/gn/bootstrap/bootstrap.py
|
||||
+++ b/tools/gn/bootstrap/bootstrap.py
|
||||
@@ -179,6 +179,7 @@ def build_gn_with_ninja_manually(tempdir, options):
|
||||
|
||||
write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h',
|
||||
{
|
||||
+ 'ENABLE_LOCATION_SOURCE': 'false',
|
||||
'ENABLE_PROFILING': 'false',
|
||||
'CAN_UNWIND_WITH_FRAME_POINTERS': 'false'
|
||||
})
|
||||
@@ -204,7 +205,7 @@ def build_gn_with_ninja_manually(tempdir, options):
|
||||
|
||||
write_gn_ninja(os.path.join(tempdir, 'build.ninja'),
|
||||
root_gen_dir, options)
|
||||
- cmd = ['ninja', '-C', tempdir]
|
||||
+ cmd = ['ninja', '-C', tempdir, '-w', 'dupbuild=err']
|
||||
if options.verbose:
|
||||
cmd.append('-v')
|
||||
|
||||
@@ -458,6 +459,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||
'base/metrics/bucket_ranges.cc',
|
||||
'base/metrics/field_trial.cc',
|
||||
'base/metrics/field_trial_param_associator.cc',
|
||||
+ 'base/metrics/field_trial_params.cc',
|
||||
'base/metrics/histogram.cc',
|
||||
'base/metrics/histogram_base.cc',
|
||||
'base/metrics/histogram_functions.cc',
|
||||
@@ -507,6 +509,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||
'base/task_scheduler/scheduler_lock_impl.cc',
|
||||
'base/task_scheduler/scheduler_single_thread_task_runner_manager.cc',
|
||||
'base/task_scheduler/scheduler_worker.cc',
|
||||
+ 'base/task_scheduler/scheduler_worker_pool.cc',
|
||||
'base/task_scheduler/scheduler_worker_pool_impl.cc',
|
||||
'base/task_scheduler/scheduler_worker_pool_params.cc',
|
||||
'base/task_scheduler/scheduler_worker_stack.cc',
|
||||
@@ -523,6 +526,7 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||
'base/third_party/icu/icu_utf.cc',
|
||||
'base/third_party/nspr/prtime.cc',
|
||||
'base/threading/post_task_and_reply_impl.cc',
|
||||
+ 'base/threading/scoped_blocking_call.cc',
|
||||
'base/threading/sequence_local_storage_map.cc',
|
||||
'base/threading/sequenced_task_runner_handle.cc',
|
||||
'base/threading/sequenced_worker_pool.cc',
|
||||
@@ -579,7 +583,6 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||
'base/unguessable_token.cc',
|
||||
'base/value_iterators.cc',
|
||||
'base/values.cc',
|
||||
- 'base/value_iterators.cc',
|
||||
'base/vlog.cc',
|
||||
])
|
||||
|
||||
@@ -652,7 +655,6 @@ def write_gn_ninja(path, root_gen_dir, options):
|
||||
static_libraries['base']['sources'].extend([
|
||||
'base/memory/shared_memory_handle_posix.cc',
|
||||
'base/memory/shared_memory_posix.cc',
|
||||
- 'base/memory/shared_memory_tracker.cc',
|
||||
'base/nix/xdg_util.cc',
|
||||
'base/process/internal_linux.cc',
|
||||
'base/process/memory_linux.cc',
|
||||
@@ -827,7 +829,7 @@ def build_gn_with_gn(temp_gn, build_dir, options):
|
||||
cmd = [temp_gn, 'gen', build_dir, '--args=%s' % gn_gen_args]
|
||||
check_call(cmd)
|
||||
|
||||
- cmd = ['ninja', '-C', build_dir]
|
||||
+ cmd = ['ninja', '-C', build_dir, '-w', 'dupbuild=err']
|
||||
if options.verbose:
|
||||
cmd.append('-v')
|
||||
cmd.append('gn')
|
||||
74
chromium/crc32c-string-view-check.patch
Normal file
74
chromium/crc32c-string-view-check.patch
Normal file
|
|
@ -0,0 +1,74 @@
|
|||
From d0f929a5db87cb34d03afb0d8e8bfc95b8f786e3 Mon Sep 17 00:00:00 2001
|
||||
From: Victor Costan <costan@gmail.com>
|
||||
Date: Mon, 11 Sep 2017 13:18:27 -0700
|
||||
Subject: [PATCH] More conservative check for <string_view> availability. (#4)
|
||||
|
||||
has_include(<string_view>) does not imply that the header can be
|
||||
included and will work. The assumption fails on MSVC and libc++ [1, 2].
|
||||
Conversely, checking that __cplusplus > 201402L is not sufficient on its
|
||||
own either, as the toolchain on Mac OS 10.12 passes that check but does
|
||||
not contain a <string_view> header.
|
||||
|
||||
[1] https://crbug.com/759349
|
||||
[2] https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79433
|
||||
---
|
||||
include/crc32c/crc32c.h | 10 +++-------
|
||||
src/crc32c_unittest.cc | 6 ++----
|
||||
2 files changed, 5 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/include/crc32c/crc32c.h b/include/crc32c/crc32c.h
|
||||
index 9f1973a..8ecab0d 100644
|
||||
--- a/include/crc32c/crc32c.h
|
||||
+++ b/include/crc32c/crc32c.h
|
||||
@@ -33,22 +33,18 @@ inline uint32_t Crc32c(const std::string& string) {
|
||||
string.size());
|
||||
}
|
||||
|
||||
-#if defined(__has_include)
|
||||
+#if __cplusplus > 201402L
|
||||
#if __has_include(<string_view>)
|
||||
-// Visual Studio provides a <string_view> header even in C++11 mode. When
|
||||
-// included, the header issues an #error. (C1189)
|
||||
-#if !defined(_MSC_VER) || __cplusplus >= 201703L
|
||||
#include <string_view>
|
||||
|
||||
-// Comptues the CRC32C of the bytes in the string_view.
|
||||
+// Computes the CRC32C of the bytes in the string_view.
|
||||
inline uint32_t Crc32c(const std::string_view& string_view) {
|
||||
return Crc32c(reinterpret_cast<const uint8_t*>(string_view.data()),
|
||||
string_view.size());
|
||||
}
|
||||
|
||||
-#endif // !defined(_MSC_VER) || __cplusplus >= 201703L
|
||||
#endif // __has_include(<string_view>)
|
||||
-#endif // defined(__has_include)
|
||||
+#endif // __cplusplus > 201402L
|
||||
|
||||
} // namespace crc32c
|
||||
|
||||
diff --git a/src/crc32c_unittest.cc b/src/crc32c_unittest.cc
|
||||
index 7a9c765..69babb3 100644
|
||||
--- a/src/crc32c_unittest.cc
|
||||
+++ b/src/crc32c_unittest.cc
|
||||
@@ -95,9 +95,8 @@ TEST(CRC32CTest, Crc32cStdString) {
|
||||
EXPECT_EQ(static_cast<uint32_t>(0x113fdb5c), crc32c::Crc32c(buf));
|
||||
}
|
||||
|
||||
-#if defined(__has_include)
|
||||
+#if __cplusplus > 201402L
|
||||
#if __has_include(<string_view>)
|
||||
-#if !defined(_MSC_VER) || __cplusplus >= 201703L
|
||||
|
||||
TEST(CRC32CTest, Crc32cStdStringView) {
|
||||
uint8_t buf[32];
|
||||
@@ -118,9 +117,8 @@ TEST(CRC32CTest, Crc32cStdStringView) {
|
||||
EXPECT_EQ(static_cast<uint32_t>(0x113fdb5c), crc32c::Crc32c(view));
|
||||
}
|
||||
|
||||
-#endif // !defined(_MSC_VER) || __cplusplus >= 201703L
|
||||
#endif // __has_include(<string_view>)
|
||||
-#endif // defined(__has_include)
|
||||
+#endif // __cplusplus > 201402L
|
||||
|
||||
#define TESTED_EXTEND Extend
|
||||
#include "./crc32c_extend_unittests.h"
|
||||
Loading…
Reference in New Issue
Block a user