upgpkg: ungoogled-chromium 103.0.5060.53-1

upstream release

5 files changed, 15 insertions, 96 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 975a863..8657b8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
-	pkgver = 102.0.5005.115
+	pkgver = 103.0.5060.53
 	pkgrel = 1
 	url = https://github.com/Eloston/ungoogled-chromium
 	arch = x86_64
@@ -53,33 +53,27 @@ pkgbase = ungoogled-chromium
 	conflicts = chromium
 	options = debug
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-102.0.5005.115.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-103.0.5060.53.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
-	source = https://github.com/stha09/chromium-patches/releases/download/chromium-102-patchset-5/chromium-102-patchset-5.tar.xz
-	source = iwyu-add-utility-for-std-exchange.patch
+	source = https://github.com/stha09/chromium-patches/releases/download/chromium-103-patchset-4/chromium-103-patchset-4.tar.xz
 	source = enable-GlobalMediaControlsCastStartStop.patch
 	source = roll-src-third_party-ffmpeg.patch
-	source = chromium-libxml-unbundle.patch
 	source = sql-make-VirtualCursor-standard-layout-type.patch
 	source = remove-no-opaque-pointers-flag.patch
 	source = use-oauth2-client-switches-as-default.patch
-	source = ungoogled-chromium-102.0.5005.115-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/102.0.5005.115-1.tar.gz
+	source = ungoogled-chromium-103.0.5060.53-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/103.0.5060.53-1.tar.gz
 	source = chromium-drirc-disable-10bpc-color-configs.conf
 	source = ozone-add-va-api-support-to-wayland.patch
-	source = wayland-egl.patch
-	sha256sums = 301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
+	sha256sums = 0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
-	sha256sums = 53de0f936fd571e578ba2fbf348c8741116cdcceac3ea6fae5008d8f054a7698
-	sha256sums = 6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c
+	sha256sums = fed11a8987d9f9baa04457fb114f8f7fdb800300a3780927020865bcc43e4f52
 	sha256sums = 779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6
 	sha256sums = 30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44
-	sha256sums = fd3bf124aacc45f2d0a4f1dd86303fa7f2a3d4f4eeaf33854631d6cb39e12485
 	sha256sums = b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a
 	sha256sums = 00c16ce83ea4ca924a50fa0cfc2b2a4d744c722f363b065323e6ba0fcbac45a5
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
-	sha256sums = 6e75abebf768bc2996782766ef9340e0f53df8e7284188285841ed80a9bec5bc
+	sha256sums = 96c7adbe1d9ec6fe77bb3d299a4bbcc63bcdbec04f736a73f218949a0ea5a83e
 	sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb
 	sha256sums = 07bdc1b3fc8f0d0a4804d111c46ce3343cd7824de562f2848d429b917ce4bcfd
-	sha256sums = 34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574
 
 pkgname = ungoogled-chromium
diff --git a/PKGBUILD b/PKGBUILD
index cfb6718..6b5bc25 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,10 +9,10 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
  
 pkgname=ungoogled-chromium
-pkgver=102.0.5005.115
+pkgver=103.0.5060.53
 pkgrel=1
 _launcher_ver=8
-_gcc_patchset=5
+_gcc_patchset=4
 pkgdesc="A lightweight approach to removing Google web service dependency"
 arch=('x86_64')
 url="https://github.com/Eloston/ungoogled-chromium"
@@ -30,20 +30,16 @@ options=('debug' '!lto') # Chromium adds its own flags for ThinLTO
 source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$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)
-sha256sums=('301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6'
+sha256sums=('0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            '53de0f936fd571e578ba2fbf348c8741116cdcceac3ea6fae5008d8f054a7698'
-            '6f666ef0acb08704ca58cc0d5e97e7ce64d8fea51042e593adae1ce15a61231c'
+            'fed11a8987d9f9baa04457fb114f8f7fdb800300a3780927020865bcc43e4f52'
             '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
             '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44'
-            'fd3bf124aacc45f2d0a4f1dd86303fa7f2a3d4f4eeaf33854631d6cb39e12485'
             'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a'
             '00c16ce83ea4ca924a50fa0cfc2b2a4d744c722f363b065323e6ba0fcbac45a5'
             'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
@@ -54,13 +50,11 @@ _uc_ver=$pkgver-1
 source=(${source[@]}
         $pkgname-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz
         chromium-drirc-disable-10bpc-color-configs.conf
-        ozone-add-va-api-support-to-wayland.patch
-        wayland-egl.patch)
+        ozone-add-va-api-support-to-wayland.patch)
 sha256sums=(${sha256sums[@]}
-            '6e75abebf768bc2996782766ef9340e0f53df8e7284188285841ed80a9bec5bc'
+            '96c7adbe1d9ec6fe77bb3d299a4bbcc63bcdbec04f736a73f218949a0ea5a83e'
             'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb'
-            '07bdc1b3fc8f0d0a4804d111c46ce3343cd7824de562f2848d429b917ce4bcfd'
-            '34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574')
+            '07bdc1b3fc8f0d0a4804d111c46ce3343cd7824de562f2848d429b917ce4bcfd')
  
 # 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
@@ -110,9 +104,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
@@ -121,18 +112,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
-
-  # Wayland/EGL regression (crbug #1071528 #1071550)
-  patch -Np1 -i ../wayland-egl.patch
+  #patch -Np1 -i ../patches/
 
   # Enable vaapi on wayland
   patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch
diff --git a/chromium-libxml-unbundle.patch b/chromium-libxml-unbundle.patch
deleted file mode 100644
index 5699bc8..0000000
--- a/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/iwyu-add-utility-for-std-exchange.patch b/iwyu-add-utility-for-std-exchange.patch
deleted file mode 100644
index 3bc4693..0000000
--- a/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 <stha09@googlemail.com>
-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 <wez@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-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 <algorithm>
-+#include <utility>
- 
- #if defined(__ELF__)  // defined by gcc
- #if defined(__OpenBSD__)
diff --git a/wayland-egl.patch b/wayland-egl.patch
deleted file mode 100644
index 58a0798..0000000
--- a/wayland-egl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/ui/gl/gl_image_native_pixmap.cc	2020-05-18 11:40:06.000000000 -0700
-+++ b/ui/gl/gl_image_native_pixmap.cc	2020-05-22 02:07:16.007770442 -0700
-@@ -288,6 +288,8 @@
-                                std::move(scoped_fd));
-   }
- 
-+  handle.planes[0].size = size_.GetArea();
-+
-   return handle;
- #endif  // !defined(OS_FUCHSIA)
- }
---- a/gpu/command_buffer/service/error_state.cc	2020-05-18 11:39:22.000000000 -0700
-+++ b/gpu/command_buffer/service/error_state.cc	2020-05-22 13:43:09.181180388 -0700
-@@ -115,6 +115,8 @@
-     // buffer.
-     error = GL_NO_ERROR;
-   }
-+  if (error == GL_INVALID_ENUM)
-+    error = GL_NO_ERROR;
-   return error;
- }
-