From 66f7041349ff5c3d3d0d4371ba2a54f7450fb96d Mon Sep 17 00:00:00 2001 From: Duncaen Date: Mon, 7 May 2018 14:42:59 +0200 Subject: [PATCH] chromium: update to 66.0.3359.139. --- .../chromium/patches/chromium-math.h-r0.patch | 29 --------------- .../chromium/patches/chromium-stdint.patch | 21 ----------- srcpkgs/chromium/patches/gn_bootstrap.patch | 36 +++++++++---------- srcpkgs/chromium/patches/no-execinfo.patch | 20 ----------- .../chromium/patches/no-secure_getenv.patch | 4 +-- srcpkgs/chromium/template | 4 +-- 6 files changed, 22 insertions(+), 92 deletions(-) delete mode 100644 srcpkgs/chromium/patches/chromium-math.h-r0.patch delete mode 100644 srcpkgs/chromium/patches/chromium-stdint.patch diff --git a/srcpkgs/chromium/patches/chromium-math.h-r0.patch b/srcpkgs/chromium/patches/chromium-math.h-r0.patch deleted file mode 100644 index 9d837c2c8f1..00000000000 --- a/srcpkgs/chromium/patches/chromium-math.h-r0.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 9f63f94a11abc34d40ede8b8712fa15b5844a8c0 Mon Sep 17 00:00:00 2001 -From: Tom Anderson -Date: Sat, 27 Jan 2018 20:03:37 +0000 -Subject: [PATCH] Fix build with glibc 2.27 - -BUG=806340 -TBR=hamelphi@chromium.org - -Change-Id: Ib4e5091212d874d9ad88f3e9a1fdfee3ed7e0d5e -Reviewed-on: https://chromium-review.googlesource.com/890059 -Reviewed-by: Thomas Anderson -Reviewed-by: Philippe Hamel -Commit-Queue: Thomas Anderson -Cr-Commit-Position: refs/heads/master@{#532249} ---- - -diff --git a/components/assist_ranker/ranker_example_util.cc b/components/assist_ranker/ranker_example_util.cc -index 54d4dbd..ceedd8f 100644 ---- components/assist_ranker/ranker_example_util.cc -+++ components/assist_ranker/ranker_example_util.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "components/assist_ranker/ranker_example_util.h" - #include "base/bit_cast.h" - #include "base/format_macros.h" diff --git a/srcpkgs/chromium/patches/chromium-stdint.patch b/srcpkgs/chromium/patches/chromium-stdint.patch deleted file mode 100644 index 9b0390d5b77..00000000000 --- a/srcpkgs/chromium/patches/chromium-stdint.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 0235c2b657d936f3cdb09053776e5929fc84704b Mon Sep 17 00:00:00 2001 -From: Tomas Popela -Date: Wed, 31 Jan 2018 18:57:07 +0000 -Subject: [PATCH] Add missing stdint include - -diff --git a/chrome/browser/vr/sample_queue.cc b/chrome/browser/vr/sample_queue.cc -index c2ca777ce90c..53cb3aab1576 100644 ---- chrome/browser/vr/sample_queue.cc -+++ chrome/browser/vr/sample_queue.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include -+ - #include "chrome/browser/vr/sample_queue.h" - - namespace vr { --- -2.16.2 - diff --git a/srcpkgs/chromium/patches/gn_bootstrap.patch b/srcpkgs/chromium/patches/gn_bootstrap.patch index ada0e1d9cd8..bdfacd1945f 100644 --- a/srcpkgs/chromium/patches/gn_bootstrap.patch +++ b/srcpkgs/chromium/patches/gn_bootstrap.patch @@ -1,15 +1,15 @@ ---- tools/gn/bootstrap/bootstrap.py.orig 2017-07-27 13:55:19.732276359 +0000 -+++ tools/gn/bootstrap/bootstrap.py 2017-07-27 13:59:19.903262044 +0000 -@@ -167,7 +167,7 @@ - mkdir_p(root_gen_dir) +--- tools/gn/bootstrap/bootstrap.py.orig ++++ tools/gn/bootstrap/bootstrap.py +@@ -184,7 +184,7 @@ + {'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'}) - write_buildflag_header_manually(root_gen_dir, 'base/allocator/features.h', + write_buildflag_header_manually(root_gen_dir, 'base/allocator/buildflags.h', - {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'}) + {'USE_ALLOCATOR_SHIM': 'false' }) - write_buildflag_header_manually(root_gen_dir, 'base/debug/debugging_flags.h', - { -@@ -396,8 +396,6 @@ + write_buildflag_header_manually(root_gen_dir, + 'base/debug/debugging_buildflags.h', +@@ -438,8 +438,6 @@ 'base/third_party/superfasthash/superfasthash.c', ]) static_libraries['base']['sources'].extend([ @@ -18,8 +18,8 @@ 'base/at_exit.cc', 'base/base_paths.cc', 'base/base_switches.cc', -@@ -607,26 +605,6 @@ - 'base/time/time_now_posix.cc', +@@ -641,26 +639,6 @@ + 'base/time/time_conversion_posix.cc', 'base/trace_event/heap_profiler_allocation_register_posix.cc', ]) - static_libraries['libevent'] = { @@ -44,11 +44,11 @@ - } if is_linux or is_aix: - ldflags.extend(['-pthread']) -@@ -654,17 +632,7 @@ - 'base/threading/platform_thread_linux.cc', - ]) - if is_linux: + static_libraries['xdg_user_dirs'] = { +@@ -767,17 +745,7 @@ + '-D_LIBCXXABI_NO_EXCEPTIONS', + ] + } - static_libraries['base']['sources'].extend([ - 'base/allocator/allocator_shim.cc', - 'base/allocator/allocator_shim_default_dispatch_to_glibc.cc', @@ -62,10 +62,10 @@ - ]) + libs.extend(['-lrt', '-levent']) else: + ldflags.extend(['-pthread']) libs.extend(['-lrt']) - static_libraries['base']['sources'].extend([ ---- base/message_loop/message_pump_libevent.cc.orig 2016-11-17 01:07:57.633819544 +0100 -+++ base/message_loop/message_pump_libevent.cc 2016-11-17 01:08:38.985851678 +0100 +--- base/message_loop/message_pump_libevent.cc.orig ++++ base/message_loop/message_pump_libevent.cc @@ -14,7 +14,7 @@ #include "base/files/file_util.h" #include "base/logging.h" diff --git a/srcpkgs/chromium/patches/no-execinfo.patch b/srcpkgs/chromium/patches/no-execinfo.patch index 975f3d1c2e8..c7d3dfe1963 100644 --- a/srcpkgs/chromium/patches/no-execinfo.patch +++ b/srcpkgs/chromium/patches/no-execinfo.patch @@ -81,23 +81,3 @@ #include #include #include ---- third_party/webrtc/rtc_base/checks.cc.orig -+++ third_party/webrtc/rtc_base/checks.cc -@@ -16,7 +16,7 @@ - #include - #include - --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(__GLIBC__) && defined(__GLIBCXX__) && !defined(__UCLIBC__) - #include - #include - #endif -@@ -60,7 +60,7 @@ - // to get usable symbols on Linux. This is copied from V8. Chromium has a more - // advanced stace trace system; also more difficult to copy. - void DumpBacktrace() { --#if defined(__GLIBCXX__) && !defined(__UCLIBC__) -+#if defined(__GLIBC__) && defined(__GLIBCXX__) && !defined(__UCLIBC__) - void* trace[100]; - int size = backtrace(trace, sizeof(trace) / sizeof(*trace)); - char** symbols = backtrace_symbols(trace, size); diff --git a/srcpkgs/chromium/patches/no-secure_getenv.patch b/srcpkgs/chromium/patches/no-secure_getenv.patch index 6871deb14bf..a3b9aebd60e 100644 --- a/srcpkgs/chromium/patches/no-secure_getenv.patch +++ b/srcpkgs/chromium/patches/no-secure_getenv.patch @@ -1,7 +1,7 @@ misdetected on musl... ---- third_party/vulkan-validation-layers/src/loader/loader.c.orig 2017-07-25 19:06:31.000000000 +0000 -+++ third_party/vulkan-validation-layers/src/loader/loader.c 2017-07-27 16:20:54.721755713 +0000 +--- third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c.orig 2017-07-25 19:06:31.000000000 +0000 ++++ third_party/angle/third_party/vulkan-validation-layers/src/loader/loader.c 2017-07-27 16:20:54.721755713 +0000 @@ -214,9 +214,9 @@ // the inst pointer to get rid of compiler warnings. (void)inst; diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 35edf37e941..038d90923cc 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,14 +1,14 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=65.0.3325.181 +version=66.0.3359.139 revision=1 short_desc="Google's attempt at creating a safer, faster, and more stable browser" maintainer="Juan RP " homepage="http://www.chromium.org/" license="BSD" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=93666448c6b96ec83e6a35a64cff40db4eb92a154fe1db4e7dab4761d0e38687 +checksum=be75a5b5f8c5789d359238f374a43bf52ded49425f13ed68b8021c24e2e264b2 only_for_archs="i686 x86_64 x86_64-musl" lib32disabled=yes