[arch-commits] Commit in chromium/trunk (4 files)
Evangelos Foutras
foutrelis at gemini.archlinux.org
Tue Jul 20 22:09:29 UTC 2021
Date: Tuesday, July 20, 2021 @ 22:09:29
Author: foutrelis
Revision: 420229
upgpkg: chromium 92.0.4515.107-1: new upstream release
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/fix-crash-in-ThemeService.patch
chromium/trunk/make-dom-distiller-protoc-plugin-call-py2.7.patch
chromium/trunk/unbundle-use-char16_t-as-UCHAR_TYPE.patch
---------------------------------------------------+
PKGBUILD | 18 ++------
fix-crash-in-ThemeService.patch | 45 --------------------
make-dom-distiller-protoc-plugin-call-py2.7.patch | 37 ----------------
unbundle-use-char16_t-as-UCHAR_TYPE.patch | 30 -------------
4 files changed, 5 insertions(+), 125 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-07-20 21:33:09 UTC (rev 420228)
+++ PKGBUILD 2021-07-20 22:09:29 UTC (rev 420229)
@@ -4,10 +4,10 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=91.0.4472.164
+pkgver=92.0.4515.107
pkgrel=1
_launcher_ver=7
-_gcc_patchset=5
+_gcc_patchset=7
pkgdesc="A web browser built for speed, simplicity, and security"
arch=('x86_64')
url="https://www.chromium.org/Home"
@@ -24,19 +24,13 @@
source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz
https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
- fix-crash-in-ThemeService.patch
- unbundle-use-char16_t-as-UCHAR_TYPE.patch
- make-dom-distiller-protoc-plugin-call-py2.7.patch
extend-enable-accelerated-video-decode-flag.patch
sql-make-VirtualCursor-standard-layout-type.patch
chromium-glibc-2.33.patch
use-oauth2-client-switches-as-default.patch)
-sha256sums=('84e56fa2ad96d910cab429c513eeaca7bfa94096fef057bd024be826ce8426bd'
+sha256sums=('6e51ac6512a4e95018eefc9fef1d2e7597f28a1c45c763b3a8eb7dde5f557012'
'86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f'
- '171525009003a9ed1182cfcb6f407d7169d9a731a474304e263029376719f55a'
- '3cfe46e181cb9d337c454b5b5adbf5297052f29cd617cdee4380eeb1943825d8'
- '59a59a60a08b335fe8647fdf0f9d2288d236ebf2cc9626396d0c4d032fd2b25d'
- '76ceebd14c9a6f1ea6a05b1613e64d1e2aca595e0f0b3e9497e3eeee33ed756c'
+ '53a2cbb1b58d652d5424ff9040b6a51b9dc6348ce3edc68344cd0d25f1f4beb2'
'66db9132d6f5e06aa26e5de0924f814224a76a9bdf4b61afce161fb1d7643b22'
'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150'
'2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b'
@@ -98,9 +92,6 @@
patch -Np1 -i ../chromium-glibc-2.33.patch
# Upstream fixes
- patch -Np1 -i ../fix-crash-in-ThemeService.patch
- patch -Np1 -i ../unbundle-use-char16_t-as-UCHAR_TYPE.patch
- patch -Np1 -i ../make-dom-distiller-protoc-plugin-call-py2.7.patch
patch -Np1 -i ../extend-enable-accelerated-video-decode-flag.patch
# https://chromium-review.googlesource.com/c/chromium/src/+/2862724
@@ -225,6 +216,7 @@
libGLESv2.so
chromedriver
+ crashpad_handler
)
if [[ -z ${_system_libs[icu]+set} ]]; then
Deleted: fix-crash-in-ThemeService.patch
===================================================================
--- fix-crash-in-ThemeService.patch 2021-07-20 21:33:09 UTC (rev 420228)
+++ fix-crash-in-ThemeService.patch 2021-07-20 22:09:29 UTC (rev 420229)
@@ -1,45 +0,0 @@
-From c2d0133f47afb59b4ce64e42215d1d053f15250a Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09 at 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 at chromium.org>
-Reviewed-by: Peter Kasting <pkasting at 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 a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h
-index 592d40ae9de0f..337dfac9a040f 100644
---- a/chrome/browser/themes/theme_service.h
-+++ b/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);
Deleted: make-dom-distiller-protoc-plugin-call-py2.7.patch
===================================================================
--- make-dom-distiller-protoc-plugin-call-py2.7.patch 2021-07-20 21:33:09 UTC (rev 420228)
+++ make-dom-distiller-protoc-plugin-call-py2.7.patch 2021-07-20 22:09:29 UTC (rev 420229)
@@ -1,37 +0,0 @@
-From 359b22d3f775afa33cca9e4f8fb57eadd0ec4118 Mon Sep 17 00:00:00 2001
-From: Nico Weber <thakis at chromium.org>
-Date: Fri, 23 Apr 2021 16:22:19 +0000
-Subject: [PATCH] Make dom distiller protoc plugin explicitly call py2.7
-
-With this, chrome builds with when `/usr/bin/env python` is py3.
-
-Bug: 1202134
-Change-Id: Ibbd97a1311ccb34d46f266912c871fd0522f9535
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2848445
-Commit-Queue: Nico Weber <thakis at chromium.org>
-Commit-Queue: Yaron Friedman <yfriedman at chromium.org>
-Commit-Queue: Dirk Pranke <dpranke at google.com>
-Auto-Submit: Nico Weber <thakis at chromium.org>
-Reviewed-by: Yaron Friedman <yfriedman at chromium.org>
-Reviewed-by: Dirk Pranke <dpranke at google.com>
-Cr-Commit-Position: refs/heads/master@{#875702}
----
- .../dom_distiller_js/protoc_plugins/json_values_converter.py | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py b/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py
-index e86a88c759fcb..cae1a998c4650 100755
---- a/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py
-+++ b/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py
-@@ -1,7 +1,10 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2.7
- # Copyright 2016 The Chromium Authors. All rights reserved.
- # Use of this source code is governed by a BSD-style license that can be
- # found in the LICENSE file.
-+#
-+# TODO(crbug.com/1202134): Switch run line back to just "python"
-+# once things are py3-compatible.
-
- """protoc plugin to create C++ reader/writer for JSON-encoded protobufs
-
Deleted: unbundle-use-char16_t-as-UCHAR_TYPE.patch
===================================================================
--- unbundle-use-char16_t-as-UCHAR_TYPE.patch 2021-07-20 21:33:09 UTC (rev 420228)
+++ unbundle-use-char16_t-as-UCHAR_TYPE.patch 2021-07-20 22:09:29 UTC (rev 420229)
@@ -1,30 +0,0 @@
-From 79819c94f27524005889def53740c97a32cd7747 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09 at googlemail.com>
-Date: Fri, 16 Apr 2021 20:57:15 +0000
-Subject: [PATCH] [unbundle] Use char16_t as UCHAR_TYPE
-
-Overriding UCHAR_TYPE was dropped with:
-https://chromium-review.googlesource.com/c/chromium/deps/icu/+/2732628
-
-Bug: 911896
-Change-Id: I4c1172aab445c82ba247b1162b8484ed0db9c381
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2830820
-Commit-Queue: Stephan Hartmann <stha09 at googlemail.com>
-Reviewed-by: Lei Zhang <thestig at chromium.org>
-Cr-Commit-Position: refs/heads/master@{#873470}
----
- build/linux/unbundle/icu.gn | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn
-index 0f52fc11e79e6..6f3f8438bd854 100644
---- a/build/linux/unbundle/icu.gn
-+++ b/build/linux/unbundle/icu.gn
-@@ -16,7 +16,6 @@ config("icu_config") {
- defines = [
- "USING_SYSTEM_ICU=1",
- "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC",
-- "UCHAR_TYPE=uint16_t",
-
- # U_EXPORT (defined in unicode/platform.h) is used to set public visibility
- # on classes through the U_COMMON_API and U_I18N_API macros (among others).
More information about the arch-commits
mailing list