diff options
author | graysky | 2021-03-04 03:48:45 -0500 |
---|---|---|
committer | graysky | 2021-03-04 03:48:45 -0500 |
commit | 0084d3324e2867aabe11979be67a8a2527542195 (patch) | |
tree | c8eaad46ac42204a5c66ac8d88e1d619f16e66cc | |
parent | 4c7e89d73546cd7f02ea3f9216e1cfa87de42ec2 (diff) | |
download | aur-0084d3324e2867aabe11979be67a8a2527542195.tar.gz |
Update to 89.0.4389.72-2
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 9 | ||||
-rw-r--r-- | don-t-crash-on-reentrant-RunMoveLoop-call.patch | 33 |
3 files changed, 42 insertions, 4 deletions
@@ -1,7 +1,7 @@ pkgbase = chromium-no-extras pkgdesc = Chromium without hangout services, widevine, pipewire, or chromedriver pkgver = 89.0.4389.72 - pkgrel = 1 + pkgrel = 2 url = https://www.chromium.org/Home arch = x86_64 license = BSD @@ -53,6 +53,7 @@ pkgbase = chromium-no-extras source = https://github.com/foutrelis/chromium-launcher/archive/v7/chromium-launcher-7.tar.gz source = https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-6/chromium-89-patchset-6.tar.xz source = add-dependency-on-opus-in-webcodecs.patch + source = don-t-crash-on-reentrant-RunMoveLoop-call.patch source = add-ctime-for-std-time.patch source = chromium-glibc-2.33.patch source = use-oauth2-client-switches-as-default.patch @@ -60,6 +61,7 @@ pkgbase = chromium-no-extras sha256sums = 86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f sha256sums = 359d2847e775d8cf6f4e0b12c94c8f2718f0fd562427859c596ce1c3711dbd8e sha256sums = b86b11de8db438c47f0a84c7956740f648d21035f4ee46bfbd50c3348d369121 + sha256sums = 615f5fefc94da605957edb34b6c000f32953fb5ff6ffb321f062dab8e0fef9d3 sha256sums = 102e0c976c0d7fd1fbe2f2978ec621499a97b62457b3fde4daf84f026d1a53a7 sha256sums = 2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 @@ -6,7 +6,7 @@ pkgname=chromium-no-extras pkgver=89.0.4389.72 -pkgrel=1 +pkgrel=2 _pkgname=chromium _launcher_ver=7 _gcc_patchset=6 @@ -20,7 +20,7 @@ depends=('gtk3' 'nss' 'alsa-lib' 'xdg-utils' 'libxss' 'libcups' 'libgcrypt' 'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' - 'java-runtime-headless' 'python2' 'python2-setuptools') + 'java-runtime-headless' 'python2' 'python2-setuptools') optdepends=( 'kdialog: needed for file dialogs in KDE' 'org.freedesktop.secrets: password storage backend on GNOME / Xfce' @@ -29,6 +29,7 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$_pkg 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 add-dependency-on-opus-in-webcodecs.patch + don-t-crash-on-reentrant-RunMoveLoop-call.patch add-ctime-for-std-time.patch chromium-glibc-2.33.patch use-oauth2-client-switches-as-default.patch) @@ -36,6 +37,7 @@ sha256sums=('946a0b65aad10e0f77a539103892099b7238310c733f25b41d58b76f6ac0bc4f' '86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f' '359d2847e775d8cf6f4e0b12c94c8f2718f0fd562427859c596ce1c3711dbd8e' 'b86b11de8db438c47f0a84c7956740f648d21035f4ee46bfbd50c3348d369121' + '615f5fefc94da605957edb34b6c000f32953fb5ff6ffb321f062dab8e0fef9d3' '102e0c976c0d7fd1fbe2f2978ec621499a97b62457b3fde4daf84f026d1a53a7' '2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') @@ -97,6 +99,7 @@ prepare() { # Upstream fixes patch -Np1 -i ../add-dependency-on-opus-in-webcodecs.patch + patch -Np1 -i ../don-t-crash-on-reentrant-RunMoveLoop-call.patch patch -Np1 -i ../add-ctime-for-std-time.patch # Fixes for building with libstdc++ instead of libc++ @@ -159,7 +162,7 @@ build() { 'enable_hangout_services_extension=false' 'enable_widevine=false' 'enable_nacl=false' - "google_api_key=\"${_google_api_key}\"" + "google_api_key=\"$_google_api_key\"" # from ArchARM to build with distcc, uncomment if you build with distcc #'is_cfi=false' #'use_gold=false' diff --git a/don-t-crash-on-reentrant-RunMoveLoop-call.patch b/don-t-crash-on-reentrant-RunMoveLoop-call.patch new file mode 100644 index 000000000000..d6a8f833e4d1 --- /dev/null +++ b/don-t-crash-on-reentrant-RunMoveLoop-call.patch @@ -0,0 +1,33 @@ +From 4b05247f43d592ce748933963df923d9a40705f8 Mon Sep 17 00:00:00 2001 +From: Sigurdur Asgeirsson <siggi@chromium.org> +Date: Mon, 8 Feb 2021 18:36:10 +0000 +Subject: [PATCH] Don't crash on reentrant RunMoveLoop call. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Bug: 1173484 +Change-Id: Ia75b200d2826586080c26089751bef1d12c8fbce +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2680089 +Reviewed-by: Scott Violet <sky@chromium.org> +Commit-Queue: Sigurður Ásgeirsson <siggi@chromium.org> +Cr-Commit-Position: refs/heads/master@{#851799} +--- + chrome/browser/ui/views/tabs/tab_drag_controller.cc | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc +index 16c3c1e9df8c2..d2ccc2b965237 100644 +--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc ++++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc +@@ -1397,6 +1397,10 @@ void TabDragController::RunMoveLoop(const gfx::Vector2d& drag_offset) { + + move_loop_widget_ = GetAttachedBrowserWidget(); + DCHECK(move_loop_widget_); ++ ++ // RunMoveLoop can be called reentrantly from within another RunMoveLoop, ++ // in which case the observation is already established. ++ widget_observation_.Reset(); + widget_observation_.Observe(move_loop_widget_); + current_state_ = DragState::kDraggingWindow; + base::WeakPtr<TabDragController> ref(weak_factory_.GetWeakPtr()); |