diff --git a/packages/addons/browser/chromium/package.mk b/packages/addons/browser/chromium/package.mk index 7c447eac20..cf74b9609d 100644 --- a/packages/addons/browser/chromium/package.mk +++ b/packages/addons/browser/chromium/package.mk @@ -19,8 +19,8 @@ ################################################################################ PKG_NAME="chromium" -PKG_VERSION="55.0.2883.75" -PKG_SHA256="5bcf7180935bebc7648f7e2577f612da681f7846127f79dac22630ded9984e55" +PKG_VERSION="60.0.3112.113" +PKG_SHA256="ebfce706a1ea02a92e35f360c7364d1184dacf040b59eade4cb51aa61a4fec59" PKG_REV="107" PKG_ARCH="x86_64" PKG_LICENSE="Mixed" @@ -117,7 +117,7 @@ make_target() { ./tools/gn/bootstrap/bootstrap.py --gn-gen-args "${_flags[*]}" ./out/Release/gn gen out/Release --args="${_flags[*]}" --script-executable=$TOOLCHAIN/bin/python - ninja -C out/Release chrome chrome_sandbox widevinecdmadapter + ninja -j${CONCURRENCY_MAKE_LEVEL} -C out/Release chrome chrome_sandbox widevinecdmadapter } addon() { diff --git a/packages/addons/browser/chromium/patches/chromium-0002-unset-madv_free.patch b/packages/addons/browser/chromium/patches/chromium-0002-unset-madv_free.patch deleted file mode 100644 index 2867c79677..0000000000 --- a/packages/addons/browser/chromium/patches/chromium-0002-unset-madv_free.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp ---- chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.madv_free 2016-08-15 13:07:29.279655676 -0400 -+++ chromium-52.0.2743.116/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2016-08-15 13:08:38.447317416 -0400 -@@ -41,6 +41,11 @@ - #include - #include - -+#if OS(LINUX) && defined(MADV_FREE) -+// Added in Linux 4.5, but it breaks the sandbox. -+#undef MADV_FREE -+#endif -+ - #ifndef MADV_FREE - #define MADV_FREE MADV_DONTNEED - #endif diff --git a/packages/addons/browser/chromium/patches/chromium-0007-dont-link-atomic-in-gn.patch b/packages/addons/browser/chromium/patches/chromium-0007-dont-link-atomic-in-gn.patch index f547fac5bb..b271dc7379 100644 --- a/packages/addons/browser/chromium/patches/chromium-0007-dont-link-atomic-in-gn.patch +++ b/packages/addons/browser/chromium/patches/chromium-0007-dont-link-atomic-in-gn.patch @@ -1,12 +1,12 @@ diff -Naur a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py ---- a/tools/gn/bootstrap/bootstrap.py 2016-10-20 15:02:19.000000000 -0700 -+++ b/tools/gn/bootstrap/bootstrap.py 2016-11-10 09:26:36.026611661 -0800 -@@ -563,7 +563,7 @@ - } - - if is_linux: -- libs.extend(['-lrt', '-latomic']) -+ libs.extend(['-lrt']) - ldflags.extend(['-pthread']) - - static_libraries['xdg_user_dirs'] = { +--- a/tools/gn/bootstrap/bootstrap.py 2017-08-10 17:18:53.767165155 +0200 ++++ b/tools/gn/bootstrap/bootstrap.py 2017-08-10 17:23:28.668750638 +0200 +@@ -657,7 +657,7 @@ + 'base/allocator/allocator_shim.cc', + 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', + ]) +- libs.extend(['-lrt', '-latomic']) ++ libs.extend(['-lrt']) + static_libraries['libevent']['include_dirs'].extend([ + os.path.join(SRC_ROOT, 'base', 'third_party', 'libevent', 'linux') + ])