summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Playfair Cal2020-10-22 20:46:58 +1100
committerDaniel Playfair Cal2020-10-22 20:46:58 +1100
commit3e7673905f2c0edb3df45e3f9e588f2f20686a21 (patch)
treee7509126e2021387805fd533c703174865858db6
parente78d31c525741db832f0bdf0dc456d8b76bffaee (diff)
downloadaur-3e7673905f2c0edb3df45e3f9e588f2f20686a21.tar.gz
88.0.4292.2-1
-rw-r--r--.SRCINFO8
-rw-r--r--0001-Merge-to-M87-Disable-cfi-icall-for-generated-stubs.patch89
-rw-r--r--PKGBUILD12
3 files changed, 7 insertions, 102 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9d97cd58b9d..8685a1cbac1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = chromium-dev-ozone
pkgdesc = Chromium built with patches for wayland support via Ozone (dev channel)
- pkgver = 87.0.4280.11
+ pkgver = 88.0.4292.2
pkgrel = 1
url = https://www.chromium.org/Home
install = chromium.install
@@ -56,14 +56,12 @@ pkgbase = chromium-dev-ozone
optdepends = kwallet: for storing passwords in KWallet on KDE desktops
provides = chromium
conflicts = chromium
- source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4280.11.tar.xz
+ source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-88.0.4292.2.tar.xz
source = chromium-launcher-6.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v6.tar.gz
source = chromium-skia-harmony.patch
- source = 0001-Merge-to-M87-Disable-cfi-icall-for-generated-stubs.patch
- sha256sums = a7c9424f0efadddd62c80e9ec126779a0cb0cf99376241f48e5044af0142a83c
+ sha256sums = ade4b8a94e145ea25fc4da5749125437a5f22d9a4aa79bf863ebe2b6d783112d
sha256sums = 04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1
sha256sums = 771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1
- sha256sums = 052c35ec5f9dacfe2baa8c82225079c95bbb089abd7be6fd89db3690c242718c
pkgname = chromium-dev-ozone
diff --git a/0001-Merge-to-M87-Disable-cfi-icall-for-generated-stubs.patch b/0001-Merge-to-M87-Disable-cfi-icall-for-generated-stubs.patch
deleted file mode 100644
index 4ab0411702f..00000000000
--- a/0001-Merge-to-M87-Disable-cfi-icall-for-generated-stubs.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 09e038ace39ac3e0ee57edaadfa80415cc764e9b Mon Sep 17 00:00:00 2001
-From: Tom Anderson <thomasanderson@chromium.org>
-Date: Sat, 10 Oct 2020 01:19:15 +0000
-Subject: [PATCH] [Merge to M87] Disable cfi-icall for generated stubs
-
-> The generated stubs use dlsym()ed functions, so must not be instrumented
-> with CFI-icall.
->
-> BUG=1136413
-> R=sky
->
-> Change-Id: I698e6b3ed96349a2bb477767d54aeb9b3ad9096f
-> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2462216
-> Commit-Queue: Scott Violet <sky@chromium.org>
-> Reviewed-by: Scott Violet <sky@chromium.org>
-> Auto-Submit: Thomas Anderson <thomasanderson@chromium.org>
-> Cr-Commit-Position: refs/heads/master@{#815379}
-
-BUG=1136413
-TBR=sky
-NOTRY=true
-NOPRESUBMIT=true
-NOTREECHECKS=true
-
-Change-Id: I3f0dde34431ca5058930ae063517163f0450e6c1
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2464347
-Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
-Cr-Commit-Position: refs/branch-heads/4280@{#219}
-Cr-Branched-From: ea420fb963f9658c9969b6513c56b8f47efa1a2a-refs/heads/master@{#812852}
----
- tools/generate_stubs/generate_stubs.py | 5 +++++
- tools/generate_stubs/rules.gni | 4 ++++
- 2 files changed, 9 insertions(+)
-
-diff --git a/tools/generate_stubs/generate_stubs.py b/tools/generate_stubs/generate_stubs.py
-index 9cf65c73a51f..ed3b89c2904f 100755
---- a/tools/generate_stubs/generate_stubs.py
-+++ b/tools/generate_stubs/generate_stubs.py
-@@ -92,6 +92,7 @@ FILE_TYPE_WIN_DEF = 'windows_def'
- # arg_list: The arguments used to call the stub function.
- STUB_FUNCTION_DEFINITION = (
- """extern %(return_type)s %(name)s(%(params)s) __attribute__((weak));
-+DISABLE_CFI_ICALL
- %(return_type)s %(export)s %(name)s(%(params)s) {
- %(return_prefix)s%(name)s_ptr(%(arg_list)s);
- }""")
-@@ -110,6 +111,7 @@ STUB_FUNCTION_DEFINITION = (
- # argument.
- VARIADIC_STUB_FUNCTION_DEFINITION = (
- """extern %(return_type)s %(name)s(%(params)s) __attribute__((weak));
-+DISABLE_CFI_ICALL
- %(return_type)s %(export)s %(name)s(%(params)s) {
- va_list args___;
- va_start(args___, %(last_named_arg)s);
-@@ -131,6 +133,7 @@ VARIADIC_STUB_FUNCTION_DEFINITION = (
- # argument.
- VOID_VARIADIC_STUB_FUNCTION_DEFINITION = (
- """extern void %(name)s(%(params)s) __attribute__((weak));
-+DISABLE_CFI_ICALL
- void %(export)s %(name)s(%(params)s) {
- va_list args___;
- va_start(args___, %(last_named_arg)s);
-@@ -179,6 +182,8 @@ IMPLEMENTATION_PREAMBLE = """// This is generated file. Do not modify directly.
-
- #include <map>
- #include <vector>
-+
-+#include "base/compiler_specific.h"
- """
-
- # The start and end templates for the enum definitions used by the Umbrella
-diff --git a/tools/generate_stubs/rules.gni b/tools/generate_stubs/rules.gni
-index a69f8e563e9f..7b6d34f081be 100644
---- a/tools/generate_stubs/rules.gni
-+++ b/tools/generate_stubs/rules.gni
-@@ -84,6 +84,10 @@ template("generate_stubs") {
- "public_deps",
- "visibility",
- ])
-+ if (!defined(deps)) {
-+ deps = []
-+ }
-+ deps += [ "//base" ]
- if (!defined(public_deps)) {
- public_deps = []
- }
---
-2.28.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 769ac5c95e9..8fd69b51f2f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
pkgname=chromium-dev-ozone
-pkgver=87.0.4280.11
+pkgver=88.0.4292.2
pkgrel=1
_launcher_ver=6
pkgdesc="Chromium built with patches for wayland support via Ozone (dev channel)"
@@ -28,12 +28,10 @@ optdepends=('pepper-flash: support for Flash content'
install=chromium.install
source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz
chromium-launcher-$_launcher_ver.tar.gz::https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver.tar.gz
- chromium-skia-harmony.patch
- 0001-Merge-to-M87-Disable-cfi-icall-for-generated-stubs.patch)
-sha256sums=('a7c9424f0efadddd62c80e9ec126779a0cb0cf99376241f48e5044af0142a83c'
+ chromium-skia-harmony.patch)
+sha256sums=('ade4b8a94e145ea25fc4da5749125437a5f22d9a4aa79bf863ebe2b6d783112d'
'04917e3cd4307d8e31bfb0027a5dce6d086edb10ff8a716024fbb8bb0c7dccf1'
- '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
- '052c35ec5f9dacfe2baa8c82225079c95bbb089abd7be6fd89db3690c242718c')
+ '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1')
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
# Keys are the names in the above script; values are the dependencies in Arch
@@ -84,8 +82,6 @@ prepare() {
# https://crbug.com/skia/6663#c10
patch -Np0 -i ../chromium-skia-harmony.patch
- patch -Np1 -i ../0001-Merge-to-M87-Disable-cfi-icall-for-generated-stubs.patch
-
# Force script incompatible with Python 3 to use /usr/bin/python2
sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py