-rw-r--r-- root/root usr/lib/chromium/resources/inspector/color_picker/color_picker_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/console/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/console/console_module.js
+drwxr-xr-x root/root usr/lib/chromium/resources/inspector/console_test_runner/
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/console_test_runner/console_test_runner_module.js
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/diff/diff_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/elements/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/elements/elements_module.js
+drwxr-xr-x root/root usr/lib/chromium/resources/inspector/elements_test_runner/
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/elements_test_runner/elements_test_runner_module.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/emulated_devices/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/Nexus5X-landscape.svg
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/emulated_devices/Nexus5X-portrait.svg
-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/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
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/gonzales/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/gonzales/gonzales_module.js
+drwxr-xr-x root/root usr/lib/chromium/resources/inspector/har_importer/
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/har_importer/har_importer_module.js
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
-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
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/inspector.js
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/integration_test_runner.html
+-rw-r--r-- root/root usr/lib/chromium/resources/inspector/integration_test_runner.js
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/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/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/toolbox.js
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/unit_test_runner.html
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/unit_test_runner.js
--rw-r--r-- root/root usr/lib/chromium/resources/inspector/utility_shared_worker.js
drwxr-xr-x root/root usr/lib/chromium/resources/inspector/workspace_diff/
-rw-r--r-- root/root usr/lib/chromium/resources/inspector/workspace_diff/workspace_diff_module.js
-rw-r--r-- root/root usr/lib/chromium/snapshot_blob.bin
-75f9199e5e0b31e9fbfbaf1f3071b411 chromium-60.0.3112.90.tar.xz
+4dbc4cd98731f133a3f6e0f47625ad08 breakpad-use-ucontext_t.patch
+4265aebeaeb31b88327e1b48dc580851 chromium-61.0.3163.79.tar.xz
+5b5a3ad8970846d3cead13249a101283 chromium-atk-r1.patch
034bc28a6988f3d6d1e7f291ec95365c chromium-blink-gcc7.patch
bce5db9dba2aec40a1a709797a907e2a chromium-build-toolchain.patch
-776649f56b8f7bcad7f23d496bba8042 chromium-gn-bootstrap-r2.patch
-3d379c46c547a21d6f20fc1c1761bff1 chromium-gn-bootstrap-r8.patch
-c2f283eee77d4123a0952d9ee277ec3c chromium-v8-gcc7.patch
+ab7416d1494bb6a0a96fb72c9388580d chromium-gcc-r1.patch
+22440a6f0c5660e90866d131a40fb0af chromium-gn-bootstrap-r14.patch
b527005e021b14869a669e42c46b661d chromium.desktop
64968626706b07721983ac59fb3babbf chromium.sh
3354997dd0bfde3443499133a6e16a85 last-commit-position.patch
# Depends on: dbus-glib gperf gtk libevent libexif libgcrypt mesa3d ninja nodejs nss pciutils speech-dispatcher xorg-libxscrnsaver xorg-libxt xorg-libxtst yasm
name=chromium
-version=60.0.3112.90
+version=61.0.3163.79
release=1
-source=(http://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz \
- last-commit-position.patch $name-build-toolchain.patch $name-gn-bootstrap-r2.patch $name.sh $name.desktop
- chromium-blink-gcc7.patch
- chromium-v8-gcc7.patch
- chromium-gn-bootstrap-r8.patch)
+source=(https://commondatastorage.googleapis.com/$name-browser-official/$name-$version.tar.xz
+ chromium-build-toolchain.patch
+ 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)
build() {
cd $name-$version
# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=853347
patch -p1 -i $SRC/chromium-blink-gcc7.patch
- # https://bugs.chromium.org/p/chromium/issues/detail?id=614289
- patch -p1 -i $SRC/chromium-v8-gcc7.patch
+ # Fix build with glibc 2.26
+ patch -p1 -i $SRC/breakpad-use-ucontext_t.patch
# Fixes from Gentoo
- patch -p1 -i $SRC/chromium-gn-bootstrap-r8.patch
+ 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
mkdir -p third_party/node/linux/node-linux-x64/bin
ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/
# Let's fix the toolchain
patch -p0 -i $SRC/$name-build-toolchain.patch
- # Gentoo patch
- patch -p1 -i $SRC/$name-gn-bootstrap-r2.patch
-
_gn_args=(
'blink_gc_plugin=false'
'clang_use_chrome_plugins=false'
'is_clang=false'
'is_debug=false'
'linux_use_bundled_binutils=false'
+ 'use_custom_libcxx=false'
'proprietary_codecs=true'
'remove_webcore_debug_symbols=true'
'symbol_level=0'
--- /dev/null
+--- 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;
--- /dev/null
+--- build/toolchain/linux/BUILD.gn.orig 2016-11-21 01:29:32.000000000 +0100
++++ build/toolchain/linux/BUILD.gn 2016-11-21 01:30:19.000000000 +0100
+@@ -6,7 +6,7 @@
+ import("//build/toolchain/gcc_toolchain.gni")
+
+ clang_toolchain("clang_arm") {
+- toolprefix = "arm-linux-gnueabihf-"
++ toolprefix = ""
+ toolchain_args = {
+ current_cpu = "arm"
+ current_os = "linux"
+@@ -22,7 +22,7 @@
+ }
+
+ gcc_toolchain("arm") {
+- toolprefix = "arm-linux-gnueabihf-"
++ toolprefix = ""
+
+ cc = "${toolprefix}gcc"
+ cxx = "${toolprefix}g++"
--- /dev/null
+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
--- /dev/null
+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',
+++ /dev/null
-Index: tools/gn/bootstrap/bootstrap.py
-diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
-index 6f2f5b1264519ea38cc36fb0b7e2cc24c378ca7a..0b03d2626b358fb90ab39d737679ee47bd60303b 100755
---- a/tools/gn/bootstrap/bootstrap.py
-+++ b/tools/gn/bootstrap/bootstrap.py
-@@ -487,6 +487,7 @@ def write_gn_ninja(path, root_gen_dir, options):
- 'base/sys_info.cc',
- 'base/task_runner.cc',
- 'base/task_scheduler/delayed_task_manager.cc',
-+ 'base/task_scheduler/environment_config.cc',
- 'base/task_scheduler/post_task.cc',
- 'base/task_scheduler/priority_queue.cc',
- 'base/task_scheduler/scheduler_lock_impl.cc',
+++ /dev/null
-diff -upr chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h chromium-59.0.3071.86/v8/src/objects/hash-table.h
---- chromium-59.0.3071.86.orig/v8/src/objects/hash-table.h 2017-06-05 22:04:29.000000000 +0300
-+++ chromium-59.0.3071.86/v8/src/objects/hash-table.h 2017-06-06 14:35:41.558245559 +0300
-@@ -135,22 +135,10 @@ class HashTable : public HashTableBase {
- public:
- typedef Shape ShapeT;
-
-- // Wrapper methods
-- inline uint32_t Hash(Key key) {
-- if (Shape::UsesSeed) {
-- return Shape::SeededHash(key, GetHeap()->HashSeed());
-- } else {
-- return Shape::Hash(key);
-- }
-- }
--
-- inline uint32_t HashForObject(Key key, Object* object) {
-- if (Shape::UsesSeed) {
-- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
-- } else {
-- return Shape::HashForObject(key, object);
-- }
-- }
-+ // Wrapper methods. Defined in src/objects-inl.h
-+ // to break a cycle with src/heap/heap.h.
-+ inline uint32_t Hash(Key key);
-+ inline uint32_t HashForObject(Key key, Object* object);
-
- // Returns a new HashTable object.
- MUST_USE_RESULT static Handle<Derived> New(
-diff -upr chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h chromium-59.0.3071.86/v8/src/objects-body-descriptors.h
---- chromium-59.0.3071.86.orig/v8/src/objects-body-descriptors.h 2017-06-05 22:04:29.000000000 +0300
-+++ chromium-59.0.3071.86/v8/src/objects-body-descriptors.h 2017-06-06 14:35:41.554912132 +0300
-@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public
-
- template <typename StaticVisitor>
- static inline void IterateBody(HeapObject* obj, int object_size) {
-- IterateBody(obj);
-+ IterateBody<StaticVisitor>(obj);
- }
- };
-
-diff -upr chromium-59.0.3071.86.orig/v8/src/objects-inl.h chromium-59.0.3071.86/v8/src/objects-inl.h
---- chromium-59.0.3071.86.orig/v8/src/objects-inl.h 2017-06-05 22:04:29.000000000 +0300
-+++ chromium-59.0.3071.86/v8/src/objects-inl.h 2017-06-06 14:35:41.558245559 +0300
-@@ -46,6 +46,27 @@
- namespace v8 {
- namespace internal {
-
-+template <typename Derived, typename Shape, typename Key>
-+uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) {
-+ if (Shape::UsesSeed) {
-+ return Shape::SeededHash(key, GetHeap()->HashSeed());
-+ } else {
-+ return Shape::Hash(key);
-+ }
-+}
-+
-+
-+template <typename Derived, typename Shape, typename Key>
-+uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key,
-+ Object* object) {
-+ if (Shape::UsesSeed) {
-+ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object);
-+ } else {
-+ return Shape::HashForObject(key, object);
-+ }
-+}
-+
-+
- PropertyDetails::PropertyDetails(Smi* smi) {
- value_ = smi->value();
- }