diff --git a/extra/chromium/PKGBUILD b/extra/chromium/PKGBUILD index 1d11bd47d..c344a710d 100644 --- a/extra/chromium/PKGBUILD +++ b/extra/chromium/PKGBUILD @@ -15,10 +15,10 @@ highmem=1 pkgname=chromium -pkgver=102.0.5005.115 +pkgver=103.0.5060.53 pkgrel=1 _launcher_ver=8 -_gcc_patchset=5 +_gcc_patchset=4 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') url="https://www.chromium.org/Home" @@ -36,23 +36,19 @@ options=('!lto') # Chromium adds its own flags for ThinLTO 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 - iwyu-add-utility-for-std-exchange.patch enable-GlobalMediaControlsCastStartStop.patch roll-src-third_party-ffmpeg.patch - chromium-libxml-unbundle.patch sql-make-VirtualCursor-standard-layout-type.patch remove-no-opaque-pointers-flag.patch use-oauth2-client-switches-as-default.patch 0001-widevine-support-for-arm.patch 0002-Run-blink-bindings-generation-single-threaded.patch 0003-Fix-eu-strip-build-for-newer-GCC.patch) -sha256sums=('301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6' +sha256sums=('0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - '53de0f936fd571e578ba2fbf348c8741116cdcceac3ea6fae5008d8f054a7698' - '6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c' + 'fed11a8987d9f9baa04457fb114f8f7fdb800300a3780927020865bcc43e4f52' '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6' '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44' - 'fd3bf124aacc45f2d0a4f1dd86303fa7f2a3d4f4eeaf33854631d6cb39e12485' 'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a' '00c16ce83ea4ca924a50fa0cfc2b2a4d744c722f363b065323e6ba0fcbac45a5' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711' @@ -130,9 +126,6 @@ prepare() { # Remove '-Xclang -no-opaque-pointers' flag not supported by our clang patch -Np1 -i ../remove-no-opaque-pointers-flag.patch - # Upstream fixes - patch -Np1 -i ../iwyu-add-utility-for-std-exchange.patch - # Revert kGlobalMediaControlsCastStartStop enabled by default # https://crbug.com/1314342 patch -Rp1 -F3 -i ../enable-GlobalMediaControlsCastStartStop.patch @@ -141,15 +134,11 @@ prepare() { # https://crbug.com/1325301 patch -Rp1 -i ../roll-src-third_party-ffmpeg.patch - # https://chromium-review.googlesource.com/c/chromium/src/+/3488058 - patch -Np1 -i ../chromium-libxml-unbundle.patch - # https://chromium-review.googlesource.com/c/chromium/src/+/2862724 patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch # Fixes for building with libstdc++ instead of libc++ - patch -Np1 -i ../patches/chromium-102-fenced_frame_utils-include.patch - patch -Np1 -i ../patches/chromium-102-regex_pattern-array.patch + #patch -Np1 -i ../patches/ # Link to system tools required by the build mkdir -p third_party/node/linux/node-linux-x64/bin diff --git a/extra/chromium/chromium-libxml-unbundle.patch b/extra/chromium/chromium-libxml-unbundle.patch deleted file mode 100644 index 5699bc8f8..000000000 --- a/extra/chromium/chromium-libxml-unbundle.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/build/linux/unbundle/libxml.gn -+++ b/build/linux/unbundle/libxml.gn -@@ -19,6 +19,7 @@ static_library("libxml_utils") { - ":xml_reader", - ":xml_writer", - "//base/test:test_support", -+ "//services/data_decoder:lib", - "//services/data_decoder:xml_parser_fuzzer_deps", - ] - sources = [ diff --git a/extra/chromium/iwyu-add-utility-for-std-exchange.patch b/extra/chromium/iwyu-add-utility-for-std-exchange.patch deleted file mode 100644 index 3bc4693e1..000000000 --- a/extra/chromium/iwyu-add-utility-for-std-exchange.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9dd0503835dc875807ab63efb1f477bffed2a852 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann -Date: Mon, 25 Apr 2022 23:18:30 +0000 -Subject: [PATCH] IWYU: add utility for std::exchange - -Bug: 957519 -Change-Id: I307d520fdc34d2452018ed32a505e7e519739410 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3604643 -Reviewed-by: Wez -Commit-Queue: Stephan Hartmann -Cr-Commit-Position: refs/heads/main@{#995855} ---- - base/third_party/symbolize/symbolize.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/base/third_party/symbolize/symbolize.h b/base/third_party/symbolize/symbolize.h -index 99029a968d5..278078f6071 100644 ---- a/base/third_party/symbolize/symbolize.h -+++ b/base/third_party/symbolize/symbolize.h -@@ -61,6 +61,7 @@ - #ifdef HAVE_SYMBOLIZE - - #include -+#include - - #if defined(__ELF__) // defined by gcc - #if defined(__OpenBSD__)