diff --git a/srcpkgs/chromium/INSTALL.msg b/srcpkgs/chromium/INSTALL.msg deleted file mode 100644 index ea95f5157e2..00000000000 --- a/srcpkgs/chromium/INSTALL.msg +++ /dev/null @@ -1,8 +0,0 @@ -On March 15, 2021, Google will be limiting access to their private Chrome APIs: - - https://blog.chromium.org/2021/01/limiting-private-api-availability-in.html - -This means that after this date, chromium users will no longer be able to take -advantage of features such as Google account sync (including bookmarks), spell -checking, translation, and safe browsing. These features will only be available -with the restricted google-chrome package. diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch index fb84bd98648..728f2b473ce 100644 --- a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch +++ b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch @@ -190,17 +190,6 @@ diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/incl /* * GNU-specific, but avoids the realpath(..., NULL) ---- mojo/public/cpp/platform/named_platform_channel_posix.cc.orig 2020-07-19 13:26:10.696171063 -0400 -+++ mojo/public/cpp/platform/named_platform_channel_posix.cc 2020-07-19 13:26:43.680151714 -0400 -@@ -5,6 +5,7 @@ - #include "mojo/public/cpp/platform/named_platform_channel.h" - - #include -+#include - #include - #include - #include - --- third_party/perfetto/include/perfetto/ext/base/thread_utils.h +++ third_party/perfetto/include/perfetto/ext/base/thread_utils.h @@ -29,7 +29,7 @@ diff --git a/srcpkgs/chromium/files/musl-patches/musl-hacks.patch b/srcpkgs/chromium/files/musl-patches/musl-hacks.patch index edc1b060dfb..1238970d4f8 100644 --- a/srcpkgs/chromium/files/musl-patches/musl-hacks.patch +++ b/srcpkgs/chromium/files/musl-patches/musl-hacks.patch @@ -20,3 +20,15 @@ int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0)); SendResult send_result(0, 0, std::move(buffers)); if (result < 0) { +--- base/debug/stack_trace.cc 2021-05-25 00:05:31.000000000 +0200 ++++ - 2021-05-27 13:46:43.740380140 +0200 +@@ -217,7 +217,9 @@ + } + + void StackTrace::OutputToStream(std::ostream* os) const { ++#if defined(__GLIBC__) + OutputToStreamWithPrefix(os, nullptr); ++#endif + } + + std::string StackTrace::ToString() const { diff --git a/srcpkgs/chromium/files/musl-patches/resolver.patch b/srcpkgs/chromium/files/musl-patches/resolver.patch index 29fe2d2f1f3..fb8b0ddccda 100644 --- a/srcpkgs/chromium/files/musl-patches/resolver.patch +++ b/srcpkgs/chromium/files/musl-patches/resolver.patch @@ -36,3 +36,40 @@ DnsReloaderMaybeReload(); #endif base::Optional ai; +--- net/dns/dns_config_service_linux.cc.orig ++++ net/dns/dns_config_service_linux.cc +@@ -432,12 +432,6 @@ + base::ScopedBlockingCall scoped_blocking_call( + FROM_HERE, base::BlockingType::MAY_BLOCK); + +- std::unique_ptr res = resolv_reader_->GetResState(); +- if (res) { +- dns_config_ = ConvertResStateToDnsConfig(*res.get()); +- resolv_reader_->CloseResState(res.get()); +- } +- + UMA_HISTOGRAM_BOOLEAN("Net.DNS.DnsConfig.Resolv.Read", + dns_config_.has_value()); + if (!dns_config_.has_value()) +@@ -486,20 +480,11 @@ + + std::unique_ptr + DnsConfigServiceLinux::ResolvReader::GetResState() { +- auto res = std::make_unique(); +- memset(res.get(), 0, sizeof(struct __res_state)); +- +- if (res_ninit(res.get()) != 0) { +- CloseResState(res.get()); +- return nullptr; +- } +- +- return res; ++ return nullptr; + } + + void DnsConfigServiceLinux::ResolvReader::CloseResState( + struct __res_state* res) { +- res_nclose(res); + } + + DnsConfigServiceLinux::DnsConfigServiceLinux() diff --git a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch index 1e0bca1439a..bfa99d88a9b 100644 --- a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch @@ -1,18 +1,15 @@ -diff --git base/allocator/partition_allocator/partition_freelist_entry.h base/allocator/partition_allocator/partition_freelist_entry.h -index f7703ee..57b6e6c 100644 ---- base/allocator/partition_allocator/partition_freelist_entry.h -+++ base/allocator/partition_allocator/partition_freelist_entry.h -@@ -19,8 +19,10 @@ - // Disabled on ARM64 Macs, as this crashes very early (crbug.com/1172236). - // TODO(lizeb): Enable in as many configurations as possible. - #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) -+#if !defined(__powerpc64__) +--- base/allocator/partition_allocator/partition_alloc_config.h 2021-05-25 00:05:31.000000000 +0200 ++++ - 2021-05-26 22:23:47.172940826 +0200 +@@ -71,7 +71,8 @@ + // REF_COUNT_AT_END_OF_ALLOCATION does. In this case the refcount overlaps with + // the next pointer shadow for the smallest bucket. + #if !(defined(OS_MAC) && defined(ARCH_CPU_ARM64)) && \ +- !BUILDFLAG(REF_COUNT_AT_END_OF_ALLOCATION) ++ !BUILDFLAG(REF_COUNT_AT_END_OF_ALLOCATION) && \ ++ !defined(__powerpc64__) #define PA_HAS_FREELIST_HARDENING #endif -+#endif - - namespace base { - namespace internal { + diff --git sandbox/linux/bpf_dsl/seccomp_macros.h sandbox/linux/bpf_dsl/seccomp_macros.h index a6aec544e..2a4a7f1bc 100644 --- sandbox/linux/bpf_dsl/seccomp_macros.h diff --git a/srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch b/srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch deleted file mode 100644 index bad98247e73..00000000000 --- a/srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 30dcae908492a3ec811b5f5b9f518d792a01da38 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sun, 28 Feb 2021 12:36:04 +0000 -Subject: [PATCH] IWYU: include missing cstring for strlen - ---- - .../translate/core/language_detection/ngram_hash_ops_utils.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/components/translate/core/language_detection/ngram_hash_ops_utils.cc b/components/translate/core/language_detection/ngram_hash_ops_utils.cc -index cf91033..dd03a3d 100644 ---- components/translate/core/language_detection/ngram_hash_ops_utils.cc -+++ components/translate/core/language_detection/ngram_hash_ops_utils.cc -@@ -4,6 +4,7 @@ - - #include "components/translate/core/language_detection/ngram_hash_ops_utils.h" - -+#include - #include - - #include "third_party/utf/src/include/utf.h" --- -2.26.2 - diff --git a/srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch b/srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch deleted file mode 100644 index 5e0c253cb51..00000000000 --- a/srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b1669139f475ebe39ded6f7905f4c901f17eef83 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Wed, 24 Feb 2021 07:38:37 +0000 -Subject: [PATCH] add missing static constexpr member definition - -C++14 requires to definition of static constexpr members to -emit a linker symbol. ---- - .../angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp b/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp -index 56b46e6..8f8158c 100644 ---- third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp -+++ third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp -@@ -2069,6 +2069,9 @@ class SpirvTransformFeedbackCodeGenerator final : angle::NonCopyable - spirv::IdRef mTransformFeedbackExtensionPositionId; - }; - -+constexpr size_t SpirvTransformFeedbackCodeGenerator::kXfbDecorationCount; -+constexpr spv::Decoration SpirvTransformFeedbackCodeGenerator::kXfbDecorations[kXfbDecorationCount]; -+ - void SpirvTransformFeedbackCodeGenerator::visitVariable(const ShaderInterfaceVariableInfo &info, - gl::ShaderType shaderType, - const spirv::LiteralString &name, --- -2.26.2 - diff --git a/srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch b/srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch deleted file mode 100644 index 2cfb06430b7..00000000000 --- a/srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 980ae0fbe6d985efce517c8f6c9aa139b076322b Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Sun, 28 Feb 2021 12:55:19 +0000 -Subject: [PATCH] IWYU: add missing cstdint for uint32_t - ---- - .../translate/core/language_detection/quantization_utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/components/translate/core/language_detection/quantization_utils.h b/components/translate/core/language_detection/quantization_utils.h -index eb8f6d1..699a488 100644 ---- components/translate/core/language_detection/quantization_utils.h -+++ components/translate/core/language_detection/quantization_utils.h -@@ -7,6 +7,7 @@ - - #include - #include -+#include - - namespace translate { - --- -2.26.2 - diff --git a/srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch b/srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch deleted file mode 100644 index 094a94feb09..00000000000 --- a/srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- base/check.h.orig 2021-04-15 19:44:05.656259734 -0400 -+++ base/check.h 2021-04-15 19:44:13.386279197 -0400 -@@ -85,7 +85,7 @@ - // Stream for adding optional details to the error message. - std::ostream& stream(); - -- NOMERGE ~CheckError(); -+ ~CheckError(); - - CheckError(const CheckError& other) = delete; - CheckError& operator=(const CheckError& other) = delete; ---- base/compiler_specific.h.orig 2021-04-15 19:44:28.781317968 -0400 -+++ base/compiler_specific.h 2021-04-15 19:44:54.136381820 -0400 -@@ -332,11 +332,4 @@ - - #endif // defined(__clang_analyzer__) - --// Use nomerge attribute to disable optimization of merging multiple same calls. --#if defined(__clang__) && __has_attribute(nomerge) && !defined(OS_CHROMEOS) --#define NOMERGE [[clang::nomerge]] --#else --#define NOMERGE --#endif -- - #endif // BASE_COMPILER_SPECIFIC_H_ diff --git a/srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch b/srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch new file mode 100644 index 00000000000..69c16fc0c48 --- /dev/null +++ b/srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch @@ -0,0 +1,15 @@ +This was dropped for some reason in 6951c37cecd05979b232a39e5c10e6346a0f74ef +--- third_party/closure_compiler/compiler.py 2021-05-20 04:17:53.000000000 +0200 ++++ - 2021-05-25 20:31:10.102971765 +0200 +@@ -13,8 +13,9 @@ + + + _CURRENT_DIR = os.path.join(os.path.dirname(__file__)) +-_JAVA_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") +-assert os.path.isfile(_JAVA_PATH), "java only allowed in android builds" ++_JAVA_BIN = "java" ++_JDK_PATH = os.path.join(_CURRENT_DIR, "..", "jdk", "current", "bin", "java") ++_JAVA_PATH = _JDK_PATH if os.path.isfile(_JDK_PATH) else _JAVA_BIN + + class Compiler(object): + """Runs the Closure compiler on given source files to typecheck them diff --git a/srcpkgs/chromium/patches/system-nodejs.patch b/srcpkgs/chromium/patches/chromium-system-nodejs.patch similarity index 61% rename from srcpkgs/chromium/patches/system-nodejs.patch rename to srcpkgs/chromium/patches/chromium-system-nodejs.patch index 99d653955f0..866b516656f 100644 --- a/srcpkgs/chromium/patches/system-nodejs.patch +++ b/srcpkgs/chromium/patches/chromium-system-nodejs.patch @@ -1,11 +1,9 @@ -diff --git third_party/node/node.py third_party/node/node.py -index 8097e2c49..10e6a16ea 100755 ---- third_party/node/node.py -+++ third_party/node/node.py -@@ -10,11 +10,12 @@ import sys - - - def GetBinaryPath(): +--- third_party/node/node.py 2021-05-20 04:17:54.000000000 +0200 ++++ - 2021-05-25 11:57:32.895222559 +0200 +@@ -17,11 +17,12 @@ + if platform.system() == 'Darwin' and platform.machine() == 'arm64': + return os.path.join(os_path.join(os_path.dirname(__file__), 'mac', + 'node-darwin-arm64', 'bin', 'node')) - return os_path.join(os_path.dirname(__file__), *{ - 'Darwin': ('mac', 'node-darwin-x64', 'bin', 'node'), - 'Linux': ('linux', 'node-linux-x64', 'bin', 'node'), diff --git a/srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch b/srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch new file mode 100644 index 00000000000..419e6e9d7c9 --- /dev/null +++ b/srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch @@ -0,0 +1,45 @@ +From c2d0133f47afb59b4ce64e42215d1d053f15250a Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Tue, 13 Apr 2021 23:21:42 +0000 +Subject: [PATCH] fix crash in ThemeService + +ThemeSyncableService and ThemeService are owned by each other. On +destruction of ThemeService, ThemeSyncableService gets destructed as +well, but calls RemoveObserver of partly destructed ThemeService object. +To avoid already destructed |observers_| list, move it before +|theme_syncable_service_| definition. + +Bug: 1190561 +Change-Id: I4dc2c990d589071d97b7fa737afef54463c84751 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821311 +Commit-Queue: Peter Kasting +Reviewed-by: Peter Kasting +Cr-Commit-Position: refs/heads/master@{#872164} +--- + chrome/browser/themes/theme_service.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git chrome/browser/themes/theme_service.h chrome/browser/themes/theme_service.h +index 592d40ae9de0f..337dfac9a040f 100644 +--- chrome/browser/themes/theme_service.h ++++ chrome/browser/themes/theme_service.h +@@ -299,6 +299,10 @@ class ThemeService : public KeyedService, + // The number of infobars currently displayed. + int number_of_reinstallers_ = 0; + ++ // Declared before |theme_syncable_service_|, because ThemeSyncableService ++ // removes itself from the |observers_| list on destruction. ++ base::ObserverList observers_; ++ + std::unique_ptr theme_syncable_service_; + + #if BUILDFLAG(ENABLE_EXTENSIONS) +@@ -320,8 +324,6 @@ class ThemeService : public KeyedService, + ScopedObserver + native_theme_observer_{this}; + +- base::ObserverList observers_; +- + base::WeakPtrFactory weak_ptr_factory_{this}; + + DISALLOW_COPY_AND_ASSIGN(ThemeService); diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch index d313b4a667c..0e8f57236e1 100644 --- a/srcpkgs/chromium/patches/sndio.patch +++ b/srcpkgs/chromium/patches/sndio.patch @@ -491,7 +491,7 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_input.cc chromium- + params.sample_rate()); + + // push into bus -+ audio_bus->FromInterleaved(buffer, nframes, SampleFormatToBytesPerChannel(kSampleFormat)); ++ audio_bus->FromInterleaved(reinterpret_cast(buffer), nframes); + + // invoke callback + callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.); @@ -759,7 +759,7 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.cc chromium + const base::TimeDelta delay = AudioTimestampHelper::FramesToTime(hw_delay, + params.sample_rate()); + count = source->OnMoreData(delay, base::TimeTicks::Now(), 0, audio_bus.get()); -+ audio_bus->ToInterleaved(count, SampleFormatToBytesPerChannel(kSampleFormat), buffer); ++ audio_bus->ToInterleaved(count, reinterpret_cast(buffer)); + if (count == 0) { + // We have to submit something to the device + count = audio_bus->frames(); diff --git a/srcpkgs/chromium/patches/time64.patch b/srcpkgs/chromium/patches/time64.patch deleted file mode 100644 index b1ad9359003..00000000000 --- a/srcpkgs/chromium/patches/time64.patch +++ /dev/null @@ -1,51 +0,0 @@ -Description: allow sandboxed code to call gettime64 - Add __NR_clock_gettime64 and __NR_clock_nanosleep_time64 to syscall whitelist - and clock selection parameter filtering code. - - Add __NR_utimensat_time64 to syscall whitelist - - Conditionalise additions on the new calls existing, because they do not exist - on 64-bit architectures. -Author: Peter Michael Green - -Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -=================================================================== ---- sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -+++ sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -@@ -148,7 +148,11 @@ ResultExpr EvaluateSyscallImpl(int fs_de - return Allow(); - #endif - -+#ifdef __NR_clock_gettime64 -+ if (sysno == __NR_clock_gettime || sysno == __NR_clock_gettime64 || sysno == __NR_clock_nanosleep || sysno == __NR_clock_nanosleep_time64) { -+#else - if (sysno == __NR_clock_gettime || sysno == __NR_clock_nanosleep) { -+#endif - return RestrictClockID(); - } - -Index: chromium-83.0.4103.116/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -=================================================================== ---- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -+++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -@@ -38,6 +38,10 @@ bool SyscallSets::IsAllowedGettime(int s - case __NR_clock_getres: // Allowed only on Android with parameters - // filtered by RestrictClokID(). - case __NR_clock_gettime: // Parameters filtered by RestrictClockID(). -+#ifdef __NR_clock_gettime64 -+ case __NR_clock_gettime64: // Parameters filtered by RestrictClockID(). -+ case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID(). -+#endif - case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID(). - case __NR_clock_settime: // Privileged. - #if defined(__i386__) || \ -@@ -159,6 +163,9 @@ bool SyscallSets::IsFileSystem(int sysno - case __NR_utime: - #endif - case __NR_utimensat: // New. -+#ifdef __NR_utimensat_time64 -+ case __NR_utimensat_time64: -+#endif - return true; - default: - return false; diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch index 24bf586057d..28fec283214 100644 --- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch +++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch @@ -320,9 +320,9 @@ index 642df7207..34f47eb73 100644 case __NR_time: #endif return true; -@@ -45,12 +46,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) { - case __NR_clock_nanosleep: // Parameters filtered by RestrictClockID(). - case __NR_clock_settime: // Privileged. +@@ -52,12 +53,14 @@ bool SyscallSets::IsAllowedGettime(int sysno) { + case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID(). + #endif #if defined(__i386__) || \ - (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) + (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ @@ -337,7 +337,7 @@ index 642df7207..34f47eb73 100644 case __NR_stime: #endif default: -@@ -116,7 +119,7 @@ bool SyscallSets::IsFileSystem(int sysno) { +@@ -135,7 +138,7 @@ bool SyscallSets::IsFileSystem(int sysno) { case __NR_faccessat: // EPERM not a valid errno. case __NR_fchmodat: case __NR_fchownat: // Should be called chownat ? @@ -346,7 +346,7 @@ index 642df7207..34f47eb73 100644 case __NR_newfstatat: // fstatat(). EPERM not a valid errno. #elif defined(__i386__) || defined(__arm__) || \ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) -@@ -135,7 +138,7 @@ bool SyscallSets::IsFileSystem(int sysno) { +@@ -154,7 +157,7 @@ bool SyscallSets::IsFileSystem(int sysno) { case __NR_memfd_create: case __NR_mkdirat: case __NR_mknodat: @@ -355,7 +355,7 @@ index 642df7207..34f47eb73 100644 case __NR_oldlstat: case __NR_oldstat: #endif -@@ -149,7 +152,8 @@ bool SyscallSets::IsFileSystem(int sysno) { +@@ -168,7 +171,8 @@ bool SyscallSets::IsFileSystem(int sysno) { #endif case __NR_statfs: // EPERM not a valid errno. #if defined(__i386__) || defined(__arm__) || \ @@ -365,7 +365,7 @@ index 642df7207..34f47eb73 100644 case __NR_statfs64: #endif case __NR_symlinkat: -@@ -159,7 +163,8 @@ bool SyscallSets::IsFileSystem(int sysno) { +@@ -178,7 +182,8 @@ bool SyscallSets::IsFileSystem(int sysno) { case __NR_truncate64: #endif case __NR_unlinkat: @@ -375,7 +375,7 @@ index 642df7207..34f47eb73 100644 case __NR_utime: #endif case __NR_utimensat: // New. -@@ -181,7 +186,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { +@@ -203,7 +208,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { #endif return true; // TODO(jln): these should be denied gracefully as well (moved below). @@ -385,7 +385,7 @@ index 642df7207..34f47eb73 100644 case __NR_fadvise64: // EPERM not a valid errno. #endif #if defined(__i386__) -@@ -194,11 +200,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { +@@ -216,11 +222,12 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { case __NR_flock: // EPERM not a valid errno. case __NR_fstatfs: // Give information about the whole filesystem. #if defined(__i386__) || defined(__arm__) || \ @@ -400,7 +400,7 @@ index 642df7207..34f47eb73 100644 case __NR_oldfstat: #endif #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ -@@ -206,6 +213,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { +@@ -228,6 +235,8 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { case __NR_sync_file_range: // EPERM not a valid errno. #elif defined(__arm__) case __NR_arm_sync_file_range: // EPERM not a valid errno. @@ -409,7 +409,7 @@ index 642df7207..34f47eb73 100644 #endif default: return false; -@@ -231,7 +240,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) { +@@ -248,7 +257,8 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) { #endif case __NR_getdents64: // EPERM not a valid errno. #if defined(__i386__) || \ @@ -419,7 +419,7 @@ index 642df7207..34f47eb73 100644 case __NR_readdir: #endif return true; -@@ -272,7 +282,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) { +@@ -289,7 +299,7 @@ bool SyscallSets::IsGetSimpleId(int sysno) { bool SyscallSets::IsProcessPrivilegeChange(int sysno) { switch (sysno) { case __NR_capset: @@ -428,17 +428,20 @@ index 642df7207..34f47eb73 100644 case __NR_ioperm: // Intel privilege. case __NR_iopl: // Intel privilege. #endif -@@ -323,7 +333,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) { +@@ -340,8 +350,11 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) { case __NR_rt_sigreturn: case __NR_rt_sigtimedwait: #if defined(__i386__) || defined(__arm__) || \ - (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) + (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \ + defined(__powerpc64__) ++#ifndef __powerpc64__ + case __NR_rt_sigtimedwait_time64: ++#endif case __NR_sigaction: case __NR_sigprocmask: case __NR_sigreturn: -@@ -339,7 +350,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) { +@@ -357,7 +370,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) { #endif case __NR_signalfd4: #if defined(__i386__) || defined(__arm__) || \ @@ -448,7 +451,7 @@ index 642df7207..34f47eb73 100644 case __NR_sigpending: case __NR_sigsuspend: #endif -@@ -363,7 +375,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) { +@@ -381,7 +395,7 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) { #endif case __NR_dup3: #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -457,8 +460,8 @@ index 642df7207..34f47eb73 100644 case __NR_shutdown: #endif return true; -@@ -397,7 +409,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { - case __NR_membarrier: +@@ -414,7 +428,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + case __NR_exit_group: case __NR_wait4: case __NR_waitid: -#if defined(__i386__) @@ -466,7 +469,7 @@ index 642df7207..34f47eb73 100644 case __NR_waitpid: #endif return true; -@@ -414,7 +426,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -431,7 +445,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { #endif case __NR_set_tid_address: case __NR_unshare: @@ -475,7 +478,7 @@ index 642df7207..34f47eb73 100644 case __NR_vfork: #endif default: -@@ -463,7 +475,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { +@@ -484,7 +498,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { return true; default: #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -484,7 +487,7 @@ index 642df7207..34f47eb73 100644 case __NR_socketpair: // We will want to inspect its argument. #endif return false; -@@ -473,7 +485,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { +@@ -494,7 +508,7 @@ bool SyscallSets::IsAllowedGetOrModifySocket(int sysno) { bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { switch (sysno) { #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -493,7 +496,7 @@ index 642df7207..34f47eb73 100644 case __NR_accept: case __NR_accept4: case __NR_bind: -@@ -488,7 +500,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { +@@ -509,7 +523,8 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { } #if defined(__i386__) || \ @@ -503,7 +506,7 @@ index 642df7207..34f47eb73 100644 // Big multiplexing system call for sockets. bool SyscallSets::IsSocketCall(int sysno) { switch (sysno) { -@@ -502,7 +515,8 @@ bool SyscallSets::IsSocketCall(int sysno) { +@@ -523,7 +538,8 @@ bool SyscallSets::IsSocketCall(int sysno) { } #endif @@ -513,7 +516,7 @@ index 642df7207..34f47eb73 100644 bool SyscallSets::IsNetworkSocketInformation(int sysno) { switch (sysno) { case __NR_getpeername: -@@ -527,7 +541,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { +@@ -548,7 +564,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { case __NR_mincore: case __NR_mlockall: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -522,7 +525,7 @@ index 642df7207..34f47eb73 100644 case __NR_mmap: #endif #if defined(__i386__) || defined(__arm__) || \ -@@ -557,7 +571,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { +@@ -578,7 +594,8 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { switch (sysno) { case __NR_lseek: #if defined(__i386__) || defined(__arm__) || \ @@ -532,7 +535,7 @@ index 642df7207..34f47eb73 100644 case __NR__llseek: #endif #if !defined(__aarch64__) -@@ -569,26 +584,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { +@@ -598,26 +615,28 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { case __NR_readv: case __NR_pread64: #if defined(__arm__) || \ @@ -567,7 +570,7 @@ index 642df7207..34f47eb73 100644 case __NR_sendmsg: // Could specify destination. case __NR_sendto: // Could specify destination. #endif -@@ -645,7 +662,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { +@@ -673,7 +692,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { return true; case __NR_getpriority: #if defined(__i386__) || defined(__arm__) || \ @@ -577,7 +580,7 @@ index 642df7207..34f47eb73 100644 case __NR_nice: #endif case __NR_setpriority: -@@ -657,7 +675,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { +@@ -685,7 +705,8 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { bool SyscallSets::IsAdminOperation(int sysno) { switch (sysno) { #if defined(__i386__) || defined(__arm__) || \ @@ -587,7 +590,7 @@ index 642df7207..34f47eb73 100644 case __NR_bdflush: #endif case __NR_kexec_load: -@@ -673,7 +692,8 @@ bool SyscallSets::IsAdminOperation(int sysno) { +@@ -701,7 +722,8 @@ bool SyscallSets::IsAdminOperation(int sysno) { bool SyscallSets::IsKernelModule(int sysno) { switch (sysno) { @@ -597,7 +600,7 @@ index 642df7207..34f47eb73 100644 case __NR_create_module: case __NR_get_kernel_syms: // Should ENOSYS. case __NR_query_module: -@@ -706,7 +726,8 @@ bool SyscallSets::IsFsControl(int sysno) { +@@ -734,7 +756,8 @@ bool SyscallSets::IsFsControl(int sysno) { case __NR_swapoff: case __NR_swapon: #if defined(__i386__) || \ @@ -607,7 +610,7 @@ index 642df7207..34f47eb73 100644 case __NR_umount: #endif case __NR_umount2: -@@ -722,7 +743,7 @@ bool SyscallSets::IsNuma(int sysno) { +@@ -750,7 +773,7 @@ bool SyscallSets::IsNuma(int sysno) { case __NR_getcpu: case __NR_mbind: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -616,7 +619,7 @@ index 642df7207..34f47eb73 100644 case __NR_migrate_pages: #endif case __NR_move_pages: -@@ -751,14 +772,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) { +@@ -785,14 +808,15 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) { switch (sysno) { case __NR_acct: // Privileged. #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -635,7 +638,7 @@ index 642df7207..34f47eb73 100644 case __NR_ulimit: #endif case __NR_getrusage: -@@ -792,7 +814,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) { +@@ -826,7 +850,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) { #endif case __NR_sysinfo: case __NR_uname: @@ -644,7 +647,7 @@ index 642df7207..34f47eb73 100644 case __NR_olduname: case __NR_oldolduname: #endif -@@ -854,8 +876,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) { +@@ -892,8 +916,16 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) { } #endif @@ -662,7 +665,7 @@ index 642df7207..34f47eb73 100644 (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) // These give a lot of ambient authority and bypass the setuid sandbox. bool SyscallSets::IsSystemVSharedMemory(int sysno) { -@@ -887,7 +917,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) { +@@ -925,7 +957,8 @@ bool SyscallSets::IsSystemVMessageQueue(int sysno) { #endif #if defined(__i386__) || \ @@ -672,7 +675,7 @@ index 642df7207..34f47eb73 100644 // Big system V multiplexing system call. bool SyscallSets::IsSystemVIpc(int sysno) { switch (sysno) { -@@ -907,7 +938,8 @@ bool SyscallSets::IsAnySystemV(int sysno) { +@@ -945,7 +978,8 @@ bool SyscallSets::IsAnySystemV(int sysno) { return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) || IsSystemVSharedMemory(sysno); #elif defined(__i386__) || \ @@ -682,7 +685,7 @@ index 642df7207..34f47eb73 100644 return IsSystemVIpc(sysno); #endif } -@@ -960,7 +992,8 @@ bool SyscallSets::IsFaNotify(int sysno) { +@@ -1002,7 +1036,8 @@ bool SyscallSets::IsFaNotify(int sysno) { bool SyscallSets::IsTimer(int sysno) { switch (sysno) { case __NR_getitimer: @@ -692,7 +695,7 @@ index 642df7207..34f47eb73 100644 case __NR_alarm: #endif case __NR_setitimer: -@@ -1019,18 +1052,22 @@ bool SyscallSets::IsMisc(int sysno) { +@@ -1084,18 +1119,22 @@ bool SyscallSets::IsMisc(int sysno) { case __NR_syncfs: case __NR_vhangup: // The system calls below are not implemented. @@ -719,7 +722,7 @@ index 642df7207..34f47eb73 100644 case __NR_gtty: case __NR_idle: case __NR_lock: -@@ -1038,20 +1075,22 @@ bool SyscallSets::IsMisc(int sysno) { +@@ -1103,20 +1142,22 @@ bool SyscallSets::IsMisc(int sysno) { case __NR_prof: case __NR_profil: #endif @@ -2725,6 +2728,21 @@ index 44cc6f6d9..d4136461e 100644 #else #error Port. #endif // ARCH_CPU_X86_FAMILY +--- third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc ++++ third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc +@@ -236,6 +236,12 @@ + #elif defined(ARCH_CPU_BIG_ENDIAN) + static constexpr char arch[] = "aarch64_be"; + #endif ++#elif defined(__powerpc64__) ++#if defined(ARCH_CPU_LITTLE_ENDIAN) ++ static constexpr char arch[] = "ppc64le"; ++#elif defined(ARCH_CPU_BIG_ENDIAN) ++ static constexpr char arch[] = "ppc64"; ++#endif + #else + #error Port + #endif diff --git third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc index d3d5ebdfb..3fd730cb5 100644 --- third_party/crashpad/crashpad/util/linux/auxiliary_vector.cc @@ -3385,7 +3403,7 @@ index 9ab5e00b8..ad3feffee 100755 _WriteArray(fd, "arm64_asm_sources", _Glob("libdav1d/src/arm/64/*.S")) _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c")) -+ _WriteArray(fd, "ppc64_template_sources", glob.glob("libdav1d/src/ppc/*_tmpl.c")) ++ _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c")) + template_sources = _Glob("libdav1d/src/*_tmpl.c") _WriteArray(fd, "template_sources", template_sources) @@ -3669,21 +3687,21 @@ index fb872ad39..45fc585dd 100644 ] } } -@@ -78,7 +78,7 @@ group("v8_bot_default") { +@@ -83,7 +83,7 @@ "message:v8_message", "mjsunit:v8_mjsunit", "mkgrokdump:mkgrokdump", - "unittests:unittests", + #"unittests:unittests", - "wasm-api-tests:wasm_api_tests", - "wasm-js:v8_wasm_js", - "wasm-spec-tests:v8_wasm_spec_tests", -@@ -98,7 +98,7 @@ group("v8_default") { + "webkit:v8_webkit", + ] + +@@ -108,7 +108,7 @@ "message:v8_message", "mjsunit:v8_mjsunit", "mkgrokdump:mkgrokdump", - "unittests:unittests", + #"unittests:unittests", - "wasm-api-tests:wasm_api_tests", - "wasm-js:v8_wasm_js", - "wasm-spec-tests:v8_wasm_spec_tests", + ] + + if (v8_enable_webassembly) { diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template index 1110f36a13f..2c1bb5d7a35 100644 --- a/srcpkgs/chromium/template +++ b/srcpkgs/chromium/template @@ -1,7 +1,7 @@ # Template file for 'chromium' pkgname=chromium # See http://www.chromium.org/developers/calendar for the latest version -version=90.0.4430.212 +version=91.0.4472.77 revision=1 archs="i686* x86_64* aarch64* armv7l* ppc64le*" short_desc="Google's attempt at creating a safer, faster, and more stable browser" @@ -9,7 +9,7 @@ maintainer="Enno Boland " license="BSD-3-Clause" homepage="https://www.chromium.org/" distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz" -checksum=abe11d0cb1ff21278aad2eec1a1e279d59176b15331804d7df1807446786d59e +checksum=45d5a43ef798d20313c78fa8a075be0c22055e39c8481eb53eabda81df901b31 nocross=yes lib32disabled=yes @@ -35,7 +35,7 @@ makedepends="libpng-devel gtk+-devel gtk+3-devel nss-devel pciutils-devel libjpeg-turbo-devel libevent-devel json-c-devel harfbuzz-devel minizip-devel jsoncpp-devel zlib-devel libcap-devel libXdamage-devel re2-devel fontconfig-devel freetype-devel opus-devel - ffmpeg-devel libva-devel python-setuptools xcb-proto + ffmpeg-devel libva-devel python-setuptools xcb-proto libcurl-devel $(vopt_if pipewire pipewire-devel) $(vopt_if sndio sndio-devel)" depends="libexif hwids desktop-file-utils hicolor-icon-theme xdg-utils" @@ -223,6 +223,11 @@ do_configure() { 'ffmpeg_branding="Chrome"' ) + # this does not work on ppc64 yet + case "$XBPS_TARGET_MACHINE" in + ppc64*) conf+=( "enable_jxl_decoder=false" );; + esac + # Make sure that -Werror doesn't get added to CFLAGS by the build system. # Depending on GCC version the warnings are different and we don't want # the build to fail because of that.