[PR PATCH] chromium: update to 91.0.4472.77.

Github messages for voidlinux
 help / color / mirror / Atom feed

* [PR PATCH] chromium: update to 91.0.4472.77.
@ 2021-05-26 23:19 Johnnynator
  2021-05-26 23:36 ` [PR PATCH] [Updated] " Johnnynator
                   ` (7 more replies)
  0 siblings, 8 replies; 10+ messages in thread
From: Johnnynator @ 2021-05-26 23:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 866 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages chromium-91.0.4472.77
https://github.com/void-linux/void-packages/pull/31142

chromium: update to 91.0.4472.77.
<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] x86_64
- [ ] x86_64-musl
- [ ] i686

[ci skip] to make ericonr happy

A patch file from https://github.com/void-linux/void-packages/pull/31142.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-91.0.4472.77-31142.patch --]
[-- Type: text/x-diff, Size: 19051 bytes --]

From 14dda01da294f8fe01d344ecc3074fea986d74fb Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 26 May 2021 21:46:59 +0200
Subject: [PATCH] chromium: update to 91.0.4472.77.

---
 .../files/musl-patches/musl-fixes.patch       | 11 ----
 .../files/musl-patches/resolver.patch         | 37 ++++++++++++++
 .../musl-patches/xxx-ppc64le-support.patch    | 22 ++++----
 .../chromium-90-TokenizedOutput-include.patch | 24 ---------
 .../patches/chromium-90-angle-constexpr.patch | 28 ----------
 ...romium-90-quantization_utils-include.patch | 24 ---------
 ...lang-nomerge-attribute-to-CheckError.patch | 25 ---------
 .../chromium-revert-drop-of-system-java.patch | 15 ++++++
 ...ejs.patch => chromium-system-nodejs.patch} | 14 +++--
 srcpkgs/chromium/patches/time64.patch         | 51 -------------------
 .../patches/xxx-ppc64le-support.patch         | 20 ++++----
 srcpkgs/chromium/template                     |  6 +--
 12 files changed, 80 insertions(+), 197 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch
 rename srcpkgs/chromium/patches/{system-nodejs.patch => chromium-system-nodejs.patch} (61%)
 delete mode 100644 srcpkgs/chromium/patches/time64.patch

diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
index fb84bd986489..728f2b473ce3 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 <errno.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
-
 --- 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/resolver.patch b/srcpkgs/chromium/files/musl-patches/resolver.patch
index 29fe2d2f1f3c..fb8b0ddccda6 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<AddressInfo> 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<struct __res_state> 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<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
+-  auto res = std::make_unique<struct __res_state>();
+-  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 1e0bca1439a6..04c4dd9118e3 100644
--- a/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/files/musl-patches/xxx-ppc64le-support.patch
@@ -1,18 +1,14 @@
-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 bad98247e735..000000000000
--- 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 <stha09@googlemail.com>
-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 <cstring>
- #include <vector>
- 
- #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 5e0c253cb51a..000000000000
--- 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 <stha09@googlemail.com>
-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 2cfb06430b7d..000000000000
--- 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 <stha09@googlemail.com>
-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 <algorithm>
- #include <cmath>
-+#include <cstdint>
- 
- 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 094a94feb095..000000000000
--- 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 000000000000..69c16fc0c487
--- /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 99d653955f05..866b516656fd 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/time64.patch b/srcpkgs/chromium/patches/time64.patch
deleted file mode 100644
index b1ad93590033..000000000000
--- 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 <plugwash@raspbian.org>
-
-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 24bf586057df..5c407995aeb7 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -435,9 +435,9 @@ index 642df7207..34f47eb73 100644
 -    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
 +    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
 +    defined(__powerpc64__)
+     case __NR_rt_sigtimedwait_time64:
      case __NR_sigaction:
      case __NR_sigprocmask:
-     case __NR_sigreturn:
 @@ -339,7 +350,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
  #endif
      case __NR_signalfd4:
@@ -3385,7 +3385,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 +3669,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 1110f36a13fd..cd9487c27d50 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 <gottox@voidlinux.org>"
 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"
 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] chromium: update to 91.0.4472.77.
  2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
@ 2021-05-26 23:36 ` Johnnynator
  2021-05-26 23:56 ` Johnnynator
                   ` (6 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2021-05-26 23:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages chromium-91.0.4472.77
https://github.com/void-linux/void-packages/pull/31142

chromium: update to 91.0.4472.77.
<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] x86_64
- [ ] x86_64-musl
- [ ] i686

[ci skip] to make ericonr happy

A patch file from https://github.com/void-linux/void-packages/pull/31142.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-91.0.4472.77-31142.patch --]
[-- Type: text/x-diff, Size: 19054 bytes --]

From 7e45ae19110bf10a0f96bf58397a332b4299f9b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 26 May 2021 21:46:59 +0200
Subject: [PATCH] chromium: update to 91.0.4472.77.

---
 .../files/musl-patches/musl-fixes.patch       | 11 ----
 .../files/musl-patches/resolver.patch         | 37 ++++++++++++++
 .../musl-patches/xxx-ppc64le-support.patch    | 23 ++++-----
 .../chromium-90-TokenizedOutput-include.patch | 24 ---------
 .../patches/chromium-90-angle-constexpr.patch | 28 ----------
 ...romium-90-quantization_utils-include.patch | 24 ---------
 ...lang-nomerge-attribute-to-CheckError.patch | 25 ---------
 .../chromium-revert-drop-of-system-java.patch | 15 ++++++
 ...ejs.patch => chromium-system-nodejs.patch} | 14 +++--
 srcpkgs/chromium/patches/time64.patch         | 51 -------------------
 .../patches/xxx-ppc64le-support.patch         | 20 ++++----
 srcpkgs/chromium/template                     |  6 +--
 12 files changed, 81 insertions(+), 197 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch
 rename srcpkgs/chromium/patches/{system-nodejs.patch => chromium-system-nodejs.patch} (61%)
 delete mode 100644 srcpkgs/chromium/patches/time64.patch

diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
index fb84bd986489..728f2b473ce3 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 <errno.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
-
 --- 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/resolver.patch b/srcpkgs/chromium/files/musl-patches/resolver.patch
index 29fe2d2f1f3c..fb8b0ddccda6 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<AddressInfo> 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<struct __res_state> 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<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
+-  auto res = std::make_unique<struct __res_state>();
+-  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 1e0bca1439a6..bfa99d88a9b3 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 bad98247e735..000000000000
--- 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 <stha09@googlemail.com>
-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 <cstring>
- #include <vector>
- 
- #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 5e0c253cb51a..000000000000
--- 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 <stha09@googlemail.com>
-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 2cfb06430b7d..000000000000
--- 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 <stha09@googlemail.com>
-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 <algorithm>
- #include <cmath>
-+#include <cstdint>
- 
- 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 094a94feb095..000000000000
--- 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 000000000000..69c16fc0c487
--- /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 99d653955f05..866b516656fd 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/time64.patch b/srcpkgs/chromium/patches/time64.patch
deleted file mode 100644
index b1ad93590033..000000000000
--- 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 <plugwash@raspbian.org>
-
-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 24bf586057df..5c407995aeb7 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -435,9 +435,9 @@ index 642df7207..34f47eb73 100644
 -    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
 +    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
 +    defined(__powerpc64__)
+     case __NR_rt_sigtimedwait_time64:
      case __NR_sigaction:
      case __NR_sigprocmask:
-     case __NR_sigreturn:
 @@ -339,7 +350,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
  #endif
      case __NR_signalfd4:
@@ -3385,7 +3385,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 +3669,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 1110f36a13fd..cd9487c27d50 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 <gottox@voidlinux.org>"
 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"
 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: chromium: update to 91.0.4472.77.
  2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
  2021-05-26 23:36 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-05-26 23:56 ` Johnnynator
  2021-05-27 14:52 ` [PR PATCH] [Updated] " Johnnynator
                   ` (5 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2021-05-26 23:56 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 2765 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/31142#issuecomment-849196113

Comment:
```
malloc_consolidate(): unaligned fastbin chunk detected
Received signal 6
#0 0x561ce69c7d19 (/usr/lib/chromium/chromium+0x4620d18)
#1 0x561ce69387a3 (/usr/lib/chromium/chromium+0x45917a2)
#2 0x561ce69c78c1 (/usr/lib/chromium/chromium+0x46208c0)
#3 0x7fd9898de900 (/usr/lib/libpthread-2.32.so+0x138ff)
#4 0x7fd985dc6f81 __GI_raise
#5 0x7fd985db0536 __GI_abort
#6 0x7fd985e084f8 __libc_message
#7 0x7fd985e0ff3a malloc_printerr
#8 0x7fd985e10fe4 malloc_consolidate
#9 0x7fd985e117d0 _int_free
#10 0x561ce536236e (/usr/lib/chromium/chromium+0x2fbb36d)
#11 0x561ce535eee4 (/usr/lib/chromium/chromium+0x2fb7ee3)
#12 0x561ce535ef0e (/usr/lib/chromium/chromium+0x2fb7f0d)
#13 0x561ce7d14645 (/usr/lib/chromium/chromium+0x596d644)
#14 0x561ce7d13aec (/usr/lib/chromium/chromium+0x596caeb)
#15 0x561ce6db3f1d (/usr/lib/chromium/chromium+0x4a0cf1c)
#16 0x561ce6db413e (/usr/lib/chromium/chromium+0x4a0d13d)
#17 0x561ce6fd8e92 (/usr/lib/chromium/chromium+0x4c31e91)
#18 0x561ce6fd8c55 (/usr/lib/chromium/chromium+0x4c31c54)
#19 0x561ce6dc5895 (/usr/lib/chromium/chromium+0x4a1e894)
#20 0x561ce6dc6d8d (/usr/lib/chromium/chromium+0x4a1fd8c)
#21 0x561ce6dc6c9c (/usr/lib/chromium/chromium+0x4a1fc9b)
#22 0x561ce6dbbf0e (/usr/lib/chromium/chromium+0x4a14f0d)
#23 0x561ce6f297b6 (/usr/lib/chromium/chromium+0x4b827b5)
#24 0x561ce6f3d3c2 (/usr/lib/chromium/chromium+0x4b963c1)
#25 0x561ce464f999 (/usr/lib/chromium/chromium+0x22a8998)
#26 0x561ce465161d (/usr/lib/chromium/chromium+0x22aa61c)
#27 0x561ce464cd37 (/usr/lib/chromium/chromium+0x22a5d36)
#28 0x561ce690d830 (/usr/lib/chromium/chromium+0x456682f)
#29 0x561ce690d33e (/usr/lib/chromium/chromium+0x456633d)
#30 0x561ce690ab03 (/usr/lib/chromium/chromium+0x4563b02)
#31 0x561ce690b44c (/usr/lib/chromium/chromium+0x456444b)
#32 0x561ce34ee4cc ChromeMain
#33 0x7fd985db1e0a __libc_start_main
#34 0x561ce34ee30a _start
  r8: 0000000000000000  r9: 00007ffde4009720 r10: 0000000000000008 r11: 0000000000000246
 r12: 00007ffde4009990 r13: 0000000000001000 r14: 0000000000000010 r15: 00007fd98039f000
  di: 0000000000000002  si: 00007ffde4009720  bp: 00007ffde4009a70  bx: 00007fd9832bb280
  dx: 0000000000000000  ax: 0000000000000000  cx: 00007fd985dc6f81  sp: 00007ffde4009720
  ip: 00007fd985dc6f81 efl: 0000000000000246 cgf: 002b000000000033 erf: 0000000000000000
 trp: 0000000000000000 msk: 0000000000000000 cr2: 0000000000000000
[end of stack trace]
Calling _exit(1). Core file will not be generated.
```
It seems to get aborted when trying to close it, otherwise seems to run on x86_64 glibc.
Will take a look at it tomorrow.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] chromium: update to 91.0.4472.77.
  2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
  2021-05-26 23:36 ` [PR PATCH] [Updated] " Johnnynator
  2021-05-26 23:56 ` Johnnynator
@ 2021-05-27 14:52 ` Johnnynator
  2021-05-27 14:53 ` Johnnynator
                   ` (4 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2021-05-27 14:52 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages chromium-91.0.4472.77
https://github.com/void-linux/void-packages/pull/31142

chromium: update to 91.0.4472.77.
<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] x86_64
- [ ] x86_64-musl
- [ ] i686

[ci skip] to make ericonr happy

A patch file from https://github.com/void-linux/void-packages/pull/31142.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-91.0.4472.77-31142.patch --]
[-- Type: text/x-diff, Size: 22260 bytes --]

From b672bdb2b9d2dfd6665328e349ce054f509234cc Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 26 May 2021 21:46:59 +0200
Subject: [PATCH] chromium: update to 91.0.4472.77.

---
 .../files/musl-patches/musl-fixes.patch       | 11 ----
 .../files/musl-patches/musl-hacks.patch       | 12 +++++
 .../files/musl-patches/resolver.patch         | 37 ++++++++++++++
 .../musl-patches/xxx-ppc64le-support.patch    | 23 ++++-----
 .../chromium-90-TokenizedOutput-include.patch | 24 ---------
 .../patches/chromium-90-angle-constexpr.patch | 28 ----------
 ...romium-90-quantization_utils-include.patch | 24 ---------
 ...lang-nomerge-attribute-to-CheckError.patch | 25 ---------
 .../chromium-revert-drop-of-system-java.patch | 15 ++++++
 ...ejs.patch => chromium-system-nodejs.patch} | 14 +++--
 .../patches/fix-crash-in-ThemeService.patch   | 45 ++++++++++++++++
 srcpkgs/chromium/patches/time64.patch         | 51 -------------------
 .../patches/xxx-ppc64le-support.patch         | 20 ++++----
 srcpkgs/chromium/template                     |  6 +--
 14 files changed, 138 insertions(+), 197 deletions(-)
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch
 rename srcpkgs/chromium/patches/{system-nodejs.patch => chromium-system-nodejs.patch} (61%)
 create mode 100644 srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch
 delete mode 100644 srcpkgs/chromium/patches/time64.patch

diff --git a/srcpkgs/chromium/files/musl-patches/musl-fixes.patch b/srcpkgs/chromium/files/musl-patches/musl-fixes.patch
index fb84bd986489..728f2b473ce3 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 <errno.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
-
 --- 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 edc1b060dfb0..1238970d4f80 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 29fe2d2f1f3c..fb8b0ddccda6 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<AddressInfo> 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<struct __res_state> 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<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
+-  auto res = std::make_unique<struct __res_state>();
+-  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 1e0bca1439a6..bfa99d88a9b3 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 bad98247e735..000000000000
--- 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 <stha09@googlemail.com>
-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 <cstring>
- #include <vector>
- 
- #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 5e0c253cb51a..000000000000
--- 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 <stha09@googlemail.com>
-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 2cfb06430b7d..000000000000
--- 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 <stha09@googlemail.com>
-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 <algorithm>
- #include <cmath>
-+#include <cstdint>
- 
- 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 094a94feb095..000000000000
--- 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 000000000000..69c16fc0c487
--- /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 99d653955f05..866b516656fd 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 000000000000..419e6e9d7c9e
--- /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 <stha09@googlemail.com>
+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 <pkasting@chromium.org>
+Reviewed-by: Peter Kasting <pkasting@chromium.org>
+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<ThemeServiceObserver> observers_;
++
+   std::unique_ptr<ThemeSyncableService> theme_syncable_service_;
+ 
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+@@ -320,8 +324,6 @@ class ThemeService : public KeyedService,
+   ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver>
+       native_theme_observer_{this};
+ 
+-  base::ObserverList<ThemeServiceObserver> observers_;
+-
+   base::WeakPtrFactory<ThemeService> weak_ptr_factory_{this};
+ 
+   DISALLOW_COPY_AND_ASSIGN(ThemeService);
diff --git a/srcpkgs/chromium/patches/time64.patch b/srcpkgs/chromium/patches/time64.patch
deleted file mode 100644
index b1ad93590033..000000000000
--- 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 <plugwash@raspbian.org>
-
-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 24bf586057df..5c407995aeb7 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -435,9 +435,9 @@ index 642df7207..34f47eb73 100644
 -    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
 +    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
 +    defined(__powerpc64__)
+     case __NR_rt_sigtimedwait_time64:
      case __NR_sigaction:
      case __NR_sigprocmask:
-     case __NR_sigreturn:
 @@ -339,7 +350,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
  #endif
      case __NR_signalfd4:
@@ -3385,7 +3385,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 +3669,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 1110f36a13fd..cd9487c27d50 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 <gottox@voidlinux.org>"
 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"
 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: chromium: update to 91.0.4472.77.
  2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
                   ` (2 preceding siblings ...)
  2021-05-27 14:52 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-05-27 14:53 ` Johnnynator
  2021-05-27 15:22 ` [PR PATCH] [Updated] " Johnnynator
                   ` (3 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2021-05-27 14:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 258 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/31142#issuecomment-849701831

Comment:
Packages (x86_64, x86_64-musl, i686) for testing available at https://void.johnnynator.dev/chromium-91.0.4472.77/

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Updated] chromium: update to 91.0.4472.77.
  2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
                   ` (3 preceding siblings ...)
  2021-05-27 14:53 ` Johnnynator
@ 2021-05-27 15:22 ` Johnnynator
  2021-05-30 20:54 ` q66
                   ` (2 subsequent siblings)
  7 siblings, 0 replies; 10+ messages in thread
From: Johnnynator @ 2021-05-27 15:22 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 871 bytes --]

There is an updated pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages chromium-91.0.4472.77
https://github.com/void-linux/void-packages/pull/31142

chromium: update to 91.0.4472.77.
<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] x86_64
- [ ] x86_64-musl
- [ ] i686

[ci skip] to make ericonr happy

A patch file from https://github.com/void-linux/void-packages/pull/31142.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-91.0.4472.77-31142.patch --]
[-- Type: text/x-diff, Size: 24354 bytes --]

From d68e987c69fe726b118df00de053d42ffdf5d1b3 Mon Sep 17 00:00:00 2001
From: John <me@johnnynator.dev>
Date: Wed, 26 May 2021 21:46:59 +0200
Subject: [PATCH] chromium: update to 91.0.4472.77.

---
 srcpkgs/chromium/INSTALL.msg                  |  8 ---
 .../files/musl-patches/musl-fixes.patch       | 11 ----
 .../files/musl-patches/musl-hacks.patch       | 12 +++++
 .../files/musl-patches/resolver.patch         | 37 ++++++++++++++
 .../musl-patches/xxx-ppc64le-support.patch    | 23 ++++-----
 .../chromium-90-TokenizedOutput-include.patch | 24 ---------
 .../patches/chromium-90-angle-constexpr.patch | 28 ----------
 ...romium-90-quantization_utils-include.patch | 24 ---------
 ...lang-nomerge-attribute-to-CheckError.patch | 25 ---------
 .../chromium-revert-drop-of-system-java.patch | 15 ++++++
 ...ejs.patch => chromium-system-nodejs.patch} | 14 +++--
 .../patches/fix-crash-in-ThemeService.patch   | 45 ++++++++++++++++
 srcpkgs/chromium/patches/sndio.patch          |  4 +-
 srcpkgs/chromium/patches/time64.patch         | 51 -------------------
 .../patches/xxx-ppc64le-support.patch         | 20 ++++----
 srcpkgs/chromium/template                     |  6 +--
 16 files changed, 140 insertions(+), 207 deletions(-)
 delete mode 100644 srcpkgs/chromium/INSTALL.msg
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-TokenizedOutput-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-angle-constexpr.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-quantization_utils-include.patch
 delete mode 100644 srcpkgs/chromium/patches/chromium-90-revert-add-clang-nomerge-attribute-to-CheckError.patch
 create mode 100644 srcpkgs/chromium/patches/chromium-revert-drop-of-system-java.patch
 rename srcpkgs/chromium/patches/{system-nodejs.patch => chromium-system-nodejs.patch} (61%)
 create mode 100644 srcpkgs/chromium/patches/fix-crash-in-ThemeService.patch
 delete mode 100644 srcpkgs/chromium/patches/time64.patch

diff --git a/srcpkgs/chromium/INSTALL.msg b/srcpkgs/chromium/INSTALL.msg
deleted file mode 100644
index ea95f5157e29..000000000000
--- 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 fb84bd986489..728f2b473ce3 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 <errno.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <unistd.h>
-
 --- 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 edc1b060dfb0..1238970d4f80 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 29fe2d2f1f3c..fb8b0ddccda6 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<AddressInfo> 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<struct __res_state> 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<struct __res_state>
+ DnsConfigServiceLinux::ResolvReader::GetResState() {
+-  auto res = std::make_unique<struct __res_state>();
+-  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 1e0bca1439a6..bfa99d88a9b3 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 bad98247e735..000000000000
--- 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 <stha09@googlemail.com>
-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 <cstring>
- #include <vector>
- 
- #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 5e0c253cb51a..000000000000
--- 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 <stha09@googlemail.com>
-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 2cfb06430b7d..000000000000
--- 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 <stha09@googlemail.com>
-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 <algorithm>
- #include <cmath>
-+#include <cstdint>
- 
- 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 094a94feb095..000000000000
--- 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 000000000000..69c16fc0c487
--- /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 99d653955f05..866b516656fd 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 000000000000..419e6e9d7c9e
--- /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 <stha09@googlemail.com>
+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 <pkasting@chromium.org>
+Reviewed-by: Peter Kasting <pkasting@chromium.org>
+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<ThemeServiceObserver> observers_;
++
+   std::unique_ptr<ThemeSyncableService> theme_syncable_service_;
+ 
+ #if BUILDFLAG(ENABLE_EXTENSIONS)
+@@ -320,8 +324,6 @@ class ThemeService : public KeyedService,
+   ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver>
+       native_theme_observer_{this};
+ 
+-  base::ObserverList<ThemeServiceObserver> observers_;
+-
+   base::WeakPtrFactory<ThemeService> weak_ptr_factory_{this};
+ 
+   DISALLOW_COPY_AND_ASSIGN(ThemeService);
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index d313b4a667c7..0e8f57236e19 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<SignedInt16SampleTypeTraits>(reinterpret_cast<int16_t*>(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<SignedInt16SampleTypeTraits>(count, reinterpret_cast<int16_t*>(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 b1ad93590033..000000000000
--- 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 <plugwash@raspbian.org>
-
-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 24bf586057df..5c407995aeb7 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -435,9 +435,9 @@ index 642df7207..34f47eb73 100644
 -    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
 +    (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
 +    defined(__powerpc64__)
+     case __NR_rt_sigtimedwait_time64:
      case __NR_sigaction:
      case __NR_sigprocmask:
-     case __NR_sigreturn:
 @@ -339,7 +350,8 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) {
  #endif
      case __NR_signalfd4:
@@ -3385,7 +3385,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 +3669,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 1110f36a13fd..cd9487c27d50 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 <gottox@voidlinux.org>"
 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"
 

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: chromium: update to 91.0.4472.77.
  2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
                   ` (4 preceding siblings ...)
  2021-05-27 15:22 ` [PR PATCH] [Updated] " Johnnynator
@ 2021-05-30 20:54 ` q66
  2021-05-30 21:23 ` ericonr
  2021-05-31  2:53 ` [PR PATCH] [Closed]: " q66
  7 siblings, 0 replies; 10+ messages in thread
From: q66 @ 2021-05-30 20:54 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 205 bytes --]

New comment by q66 on void-packages repository

https://github.com/void-linux/void-packages/pull/31142#issuecomment-851059801

Comment:
i'm getting reports that the ppc64le patches will need heavy changes

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: chromium: update to 91.0.4472.77.
  2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
                   ` (5 preceding siblings ...)
  2021-05-30 20:54 ` q66
@ 2021-05-30 21:23 ` ericonr
  2021-05-31  2:53 ` [PR PATCH] [Closed]: " q66
  7 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-05-30 21:23 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 169 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31142#issuecomment-851063391

Comment:
Working on x86_64-musl fwiw.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PR PATCH] [Closed]: chromium: update to 91.0.4472.77.
  2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
                   ` (6 preceding siblings ...)
  2021-05-30 21:23 ` ericonr
@ 2021-05-31  2:53 ` q66
  7 siblings, 0 replies; 10+ messages in thread
From: q66 @ 2021-05-31  2:53 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 693 bytes --]

There's a closed pull request on the void-packages repository

chromium: update to 91.0.4472.77.
https://github.com/void-linux/void-packages/pull/31142

Description:
<!-- Mark items with [x] where applicable -->

#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR

#### Does it build and run successfully? 
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [x] x86_64
- [x] x86_64-musl
- [x] i686

[ci skip] to make ericonr happy

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: chromium: update to 91.0.4472.77
  2021-05-26 17:12 [PR PATCH] " mcbloch
@ 2021-05-26 17:20 ` ericonr
  0 siblings, 0 replies; 10+ messages in thread
From: ericonr @ 2021-05-26 17:20 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 241 bytes --]

New comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/31134#issuecomment-848963004

Comment:
We are aware of it, see https://alpha.de.repo.voidlinux.org/void-updates/void-updates_2021-05-26.txt

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2021-05-31  2:53 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-26 23:19 [PR PATCH] chromium: update to 91.0.4472.77 Johnnynator
2021-05-26 23:36 ` [PR PATCH] [Updated] " Johnnynator
2021-05-26 23:56 ` Johnnynator
2021-05-27 14:52 ` [PR PATCH] [Updated] " Johnnynator
2021-05-27 14:53 ` Johnnynator
2021-05-27 15:22 ` [PR PATCH] [Updated] " Johnnynator
2021-05-30 20:54 ` q66
2021-05-30 21:23 ` ericonr
2021-05-31  2:53 ` [PR PATCH] [Closed]: " q66
  -- strict thread matches above, loose matches on Subject: below --
2021-05-26 17:12 [PR PATCH] " mcbloch
2021-05-26 17:20 ` ericonr

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).