upgpkg: ungoogled-chromium 114.0.5735.90-1

upstream release

22 files changed, 120 insertions, 928 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 42c8d27..06994eb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ungoogled-chromium
 	pkgdesc = A lightweight approach to removing Google web service dependency
-	pkgver = 113.0.5672.126
+	pkgver = 114.0.5735.90
 	pkgrel = 1
 	url = https://github.com/ungoogled-software/ungoogled-chromium
 	arch = x86_64
@@ -57,64 +57,34 @@ pkgbase = ungoogled-chromium
 	optdepends = qt5-base: enable Qt5 with --enable-features=AllowQt
 	optdepends = org.freedesktop.secrets: password storage backend on GNOME / Xfce
 	optdepends = kwallet: support for storing passwords in KWallet on Plasma
-	provides = chromium=113.0.5672.126
-	provides = chromedriver=113.0.5672.126
+	provides = chromium=114.0.5735.90
+	provides = chromedriver=114.0.5735.90
 	conflicts = chromium
 	conflicts = chromedriver
 	options = !lto
-	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-113.0.5672.126.tar.xz
+	source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-114.0.5735.90.tar.xz
 	source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz
-	source = add-cstring-for-std-strlen-in-web_view_impl.cc.patch
-	source = swiftshader-add-cstdint-for-uint64_t.patch
-	source = dawn-iwyu-add-cstdint-for-uint8_t.patch
-	source = iwyu-add-stdint.h-for-various-int-types-in-base.patch
-	source = iwyu-add-cstdint-for-uintptr_t-in-device.patch
-	source = iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch
-	source = iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch
-	source = iwyu-add-stdint.h-for-integer-types-in-ui.patch
-	source = openscreen-iwyu-add-stdint.h.patch
-	source = pdfium-iwyu-add-stdint.h-for-uint32_t.patch
-	source = unbundle-do-not-use-ZipAnalyzer-traits-header.patch
-	source = iwyu-add-stdint.h-for-uint32_t-in-cc.patch
-	source = add-missing-includes-causing-build-errors.patch
-	source = iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch
-	source = iwyu-add-stdint.h-for-various-int-types-in-comp.patch
-	source = iwyu-add-stdint.h-for-various-integer-types-in-net.patch
-	source = iwyu-add-cstdint-for-int-types-in-s2cellid.patch
+	source = add-some-typename-s-that-are-required-in-C-17.patch
+	source = REVERT-disable-autoupgrading-debug-info.patch
 	source = download-bubble-typename.patch
 	source = webauthn-variant.patch
 	source = random-fixes-for-gcc13.patch
 	source = disable-GlobalMediaControlsCastStartStop.patch
 	source = use-oauth2-client-switches-as-default.patch
-	source = ungoogled-chromium-113.0.5672.126-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/113.0.5672.126-1.tar.gz
+	source = ungoogled-chromium-114.0.5735.90-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/114.0.5735.90-1.tar.gz
 	source = ozone-add-va-api-support-to-wayland.patch
 	source = vaapi-add-av1-support.patch
 	source = remove-main-main10-profile-limit.patch
-	sha256sums = 0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93
+	sha256sums = 071a8620b6175923f91f0ce0e3a0b2b20bf350a7d1a0f5513c160df7c17526d8
 	sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a
-	sha256sums = 5f868cba9e4d387499711738adc6fd87ab9f1ef61f464016bc682660ae59206a
-	sha256sums = 208f2ebcef5c690207e6e798ffbf9e92214e9d35f415c2f6b93efebad831b7e2
-	sha256sums = 94baaaa6fbec0af6ec2e967f0b7440b4261a927e853e212d84f0aeaf56ae53f0
-	sha256sums = 0003e737072f4f1b22ff932221595e85dd9bf65720ccac36f840cccb8000e3e1
-	sha256sums = ffe499d63c9c1074cbc3995c188c89b748388dbb9dccf975ce28a434c723acf7
-	sha256sums = 7af466e4b5985cc9f0b33df2f3cd2e458c7cbfd7190505d105aad4401c9d072b
-	sha256sums = 727588a1b42f6cfe54acf4759a0c3ad3778590d5a5cefcdcb54b579ba16b09c8
-	sha256sums = 0914be53b2205b34e4da96f5a94505ac2a01e3639ff433535a23be2d0d581fa7
-	sha256sums = 8c9662bed23bfd66ae76d044541f316624386ca4b3baef57a47289feb3db58a9
-	sha256sums = 890b6836cea4c31513166db720b210da20d20bcd97a713545268cceffd707af5
-	sha256sums = ffa23c6233b47e0b4d688e30a44a2550e1236bbd0dc57b996d33dc42266530af
-	sha256sums = f6a0e149ef5195883c56a875ae366ed92d9960652f2657bfb65b5408badafc65
-	sha256sums = 3255477d02d49ef86d47c727b9369f46dc787319bb648bf267a68f37e2041e50
-	sha256sums = 94995b4e37671dcd27968bd5a2ebcf50e67bd22659a4bb4a5d0a4f81ff54f471
-	sha256sums = 88320e0f08cc7b53807961d0735e7c1bd455a6faf9d8a5d056b7ba7809e37355
-	sha256sums = 5dfbfd073f78c887bbffca2b644116571cc9b1196867e44e8fc0cbb40afcf1bc
-	sha256sums = d97dc00f66fa5868584e4b6d5ef817911eab2dc8022a37c75a00d063f4dac483
+	sha256sums = 621ed210d75d0e846192c1571bb30db988721224a41572c27769c0288d361c11
+	sha256sums = 1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69
 	sha256sums = d464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a
 	sha256sums = 590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7
 	sha256sums = 6359d8f891f860d2ae49e1dc3d2ae972e251c24ffb19ff2f8e64523b2d8234c4
 	sha256sums = 7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302
 	sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
-	sha256sums = 1025329c38041b3b8b200fe3405d4b873345e87cba6333e036b83ad2f0000d3e
+	sha256sums = a96154372365e63444b4a3ee069636b53f59b74513e6d1a4e217713eb059db67
 	sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69
 	sha256sums = e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307
 	sha256sums = be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c
diff --git a/PKGBUILD b/PKGBUILD
index 23b9dff..10bd850 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -9,7 +9,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ungoogled-chromium
-pkgver=113.0.5672.126
+pkgver=114.0.5735.90
 pkgrel=1
 _launcher_ver=8
 _manual_clone=0
@@ -30,47 +30,17 @@ optdepends=('pipewire: WebRTC desktop sharing under Wayland'
 options=('!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
-        add-cstring-for-std-strlen-in-web_view_impl.cc.patch
-        swiftshader-add-cstdint-for-uint64_t.patch
-        dawn-iwyu-add-cstdint-for-uint8_t.patch
-        iwyu-add-stdint.h-for-various-int-types-in-base.patch
-        iwyu-add-cstdint-for-uintptr_t-in-device.patch
-        iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch
-        iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch
-        iwyu-add-stdint.h-for-integer-types-in-ui.patch
-        openscreen-iwyu-add-stdint.h.patch
-        pdfium-iwyu-add-stdint.h-for-uint32_t.patch
-        unbundle-do-not-use-ZipAnalyzer-traits-header.patch
-        iwyu-add-stdint.h-for-uint32_t-in-cc.patch
-        add-missing-includes-causing-build-errors.patch
-        iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch
-        iwyu-add-stdint.h-for-various-int-types-in-comp.patch
-        iwyu-add-stdint.h-for-various-integer-types-in-net.patch
-        iwyu-add-cstdint-for-int-types-in-s2cellid.patch
+        add-some-typename-s-that-are-required-in-C-17.patch
+        REVERT-disable-autoupgrading-debug-info.patch
         download-bubble-typename.patch
         webauthn-variant.patch
         random-fixes-for-gcc13.patch
         disable-GlobalMediaControlsCastStartStop.patch
         use-oauth2-client-switches-as-default.patch)
-sha256sums=('0def7cd594304d7675821d42a4207377af98e321a78a91ee5200aea55adc2d93'
+sha256sums=('071a8620b6175923f91f0ce0e3a0b2b20bf350a7d1a0f5513c160df7c17526d8'
             '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a'
-            '5f868cba9e4d387499711738adc6fd87ab9f1ef61f464016bc682660ae59206a'
-            '208f2ebcef5c690207e6e798ffbf9e92214e9d35f415c2f6b93efebad831b7e2'
-            '94baaaa6fbec0af6ec2e967f0b7440b4261a927e853e212d84f0aeaf56ae53f0'
-            '0003e737072f4f1b22ff932221595e85dd9bf65720ccac36f840cccb8000e3e1'
-            'ffe499d63c9c1074cbc3995c188c89b748388dbb9dccf975ce28a434c723acf7'
-            '7af466e4b5985cc9f0b33df2f3cd2e458c7cbfd7190505d105aad4401c9d072b'
-            '727588a1b42f6cfe54acf4759a0c3ad3778590d5a5cefcdcb54b579ba16b09c8'
-            '0914be53b2205b34e4da96f5a94505ac2a01e3639ff433535a23be2d0d581fa7'
-            '8c9662bed23bfd66ae76d044541f316624386ca4b3baef57a47289feb3db58a9'
-            '890b6836cea4c31513166db720b210da20d20bcd97a713545268cceffd707af5'
-            'ffa23c6233b47e0b4d688e30a44a2550e1236bbd0dc57b996d33dc42266530af'
-            'f6a0e149ef5195883c56a875ae366ed92d9960652f2657bfb65b5408badafc65'
-            '3255477d02d49ef86d47c727b9369f46dc787319bb648bf267a68f37e2041e50'
-            '94995b4e37671dcd27968bd5a2ebcf50e67bd22659a4bb4a5d0a4f81ff54f471'
-            '88320e0f08cc7b53807961d0735e7c1bd455a6faf9d8a5d056b7ba7809e37355'
-            '5dfbfd073f78c887bbffca2b644116571cc9b1196867e44e8fc0cbb40afcf1bc'
-            'd97dc00f66fa5868584e4b6d5ef817911eab2dc8022a37c75a00d063f4dac483'
+            '621ed210d75d0e846192c1571bb30db988721224a41572c27769c0288d361c11'
+            '1b782b0f6d4f645e4e0daa8a4852d63f0c972aa0473319216ff04613a0592a69'
             'd464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a'
             '590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7'
             '6359d8f891f860d2ae49e1dc3d2ae972e251c24ffb19ff2f8e64523b2d8234c4'
@@ -92,7 +62,7 @@ source=(${source[@]}
         vaapi-add-av1-support.patch
         remove-main-main10-profile-limit.patch)
 sha256sums=(${sha256sums[@]}
-            '1025329c38041b3b8b200fe3405d4b873345e87cba6333e036b83ad2f0000d3e'
+            'a96154372365e63444b4a3ee069636b53f59b74513e6d1a4e217713eb059db67'
             'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69'
             'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307'
             'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c')
@@ -160,23 +130,10 @@ prepare() {
   patch -Np1 -i ../use-oauth2-client-switches-as-default.patch
 
   # Upstream fixes
-  patch -Np1 -i ../add-cstring-for-std-strlen-in-web_view_impl.cc.patch
-  patch -Np1 -d third_party/swiftshader <../swiftshader-add-cstdint-for-uint64_t.patch
-  patch -Np1 -d third_party/dawn <../dawn-iwyu-add-cstdint-for-uint8_t.patch
-  patch -Np1 -i ../iwyu-add-stdint.h-for-various-int-types-in-base.patch
-  patch -Np1 -i ../iwyu-add-cstdint-for-uintptr_t-in-device.patch
-  patch -Np1 -i ../iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch
-  patch -Np1 -i ../iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch
-  patch -Np1 -i ../iwyu-add-stdint.h-for-integer-types-in-ui.patch
-  patch -Np1 -d third_party/openscreen/src <../openscreen-iwyu-add-stdint.h.patch
-  patch -Np1 -d third_party/pdfium <../pdfium-iwyu-add-stdint.h-for-uint32_t.patch
-  patch -Np1 -i ../unbundle-do-not-use-ZipAnalyzer-traits-header.patch
-  patch -Np1 -i ../iwyu-add-stdint.h-for-uint32_t-in-cc.patch
-  patch -Np1 -i ../add-missing-includes-causing-build-errors.patch
-  patch -Np1 -i ../iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch
-  patch -Np1 -i ../iwyu-add-stdint.h-for-various-int-types-in-comp.patch
-  patch -Np1 -i ../iwyu-add-stdint.h-for-various-integer-types-in-net.patch
-  patch -Np1 -i ../iwyu-add-cstdint-for-int-types-in-s2cellid.patch
+  patch -Np1 -i ../add-some-typename-s-that-are-required-in-C-17.patch
+
+  # Revert addition of compiler flag that needs newer clang
+  patch -Rp1 -i ../REVERT-disable-autoupgrading-debug-info.patch
 
   # Disable kGlobalMediaControlsCastStartStop by default
   # https://crbug.com/1314342
diff --git a/REVERT-disable-autoupgrading-debug-info.patch b/REVERT-disable-autoupgrading-debug-info.patch
new file mode 100644
index 0000000..a60db7e
--- /dev/null
+++ b/REVERT-disable-autoupgrading-debug-info.patch
@@ -0,0 +1,49 @@
+From 54969766fd2029c506befc46e9ce14d67c7ed02a Mon Sep 17 00:00:00 2001
+From: Arthur Eubanks <aeubanks@google.com>
+Date: Tue, 25 Apr 2023 03:05:19 +0000
+Subject: [PATCH] Reland [clang] Disable autoupgrading debug info in ThinLTO
+ builds
+
+ThinLTO reads bitcode many times and attempts to upgrade the debug info every time. This is expensive since it calls the verifier. We don't need this given all LLVM bitcode producers are from the same version of LLVM.
+
+For just the build step that runs ThinLTO and links official Chrome, measured 34T -> 32T instructions via perf stat.
+
+Reland disables adding flag for ChromeOS since that toolchain is too old to have this flag.
+
+Bug: 972449
+Change-Id: I44552dd6c9dc71683c002d0c885e78b2a4341659
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4470209
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Commit-Queue: Arthur Eubanks <aeubanks@google.com>
+Cr-Commit-Position: refs/heads/main@{#1135007}
+---
+ build/config/compiler/BUILD.gn | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
+index 1c13bc80f0f..53db095c1b1 100644
+--- a/build/config/compiler/BUILD.gn
++++ b/build/config/compiler/BUILD.gn
+@@ -685,6 +685,7 @@ config("compiler") {
+         "/lldltocache:" +
+             rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
+         "/lldltocachepolicy:$cache_policy",
++        "-mllvm:-disable-auto-upgrade-debug-info",
+       ]
+     } else {
+       ldflags += [ "-flto=thin" ]
+@@ -725,6 +726,14 @@ config("compiler") {
+       }
+ 
+       ldflags += [ "-Wl,-mllvm,-import-instr-limit=$import_instr_limit" ]
++
++      if (!is_chromeos) {
++        # TODO(https://crbug.com/972449): turn on for ChromeOS when that
++        # toolchain has this flag.
++        # We only use one version of LLVM within a build so there's no need to
++        # upgrade debug info, which can be expensive since it runs the verifier.
++        ldflags += [ "-Wl,-mllvm,-disable-auto-upgrade-debug-info" ]
++      }
+     }
+ 
+     # TODO(https://crbug.com/1211155): investigate why this isn't effective on
diff --git a/add-cstring-for-std-strlen-in-web_view_impl.cc.patch b/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
deleted file mode 100644
index e90e2fa..0000000
--- a/add-cstring-for-std-strlen-in-web_view_impl.cc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 28 Mar 2023 14:34:55 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in web_view_impl.cc
-
-Bug: 957519
-Change-Id: I15ad1e905eda3d96bbf164f5df8f3cf8e02bc370
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4376772
-Reviewed-by: Alex Ilin <alexilin@chromium.org>
-Commit-Queue: Alex Ilin <alexilin@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1123011}
----
- chrome/test/chromedriver/chrome/web_view_impl.cc | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/chrome/test/chromedriver/chrome/web_view_impl.cc b/chrome/test/chromedriver/chrome/web_view_impl.cc
-index f726627e88d..d96d481d0bc 100644
---- a/chrome/test/chromedriver/chrome/web_view_impl.cc
-+++ b/chrome/test/chromedriver/chrome/web_view_impl.cc
-@@ -6,6 +6,7 @@
- 
- #include <stddef.h>
- #include <algorithm>
-+#include <cstring>
- #include <memory>
- #include <queue>
- #include <utility>
diff --git a/add-missing-includes-causing-build-errors.patch b/add-missing-includes-causing-build-errors.patch
deleted file mode 100644
index 3e308ba..0000000
--- a/add-missing-includes-causing-build-errors.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From 6bbf6b001e085025cf33412b15eb79d46e2e670c Mon Sep 17 00:00:00 2001
-From: Bruno Pitrus <brunopitrus@hotmail.com>
-Date: Tue, 11 Apr 2023 19:32:13 +0000
-Subject: [PATCH] Add missing includes causing build errors with GCC/libstdc++
- 13
-
-Bug: 957519
-Change-Id: If09ae682695714a19e37f3830013a003caba025a
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4330267
-Reviewed-by: Ken Rockot <rockot@google.com>
-Auto-Submit: Bruno Pitrus <brunopitrus@hotmail.com>
-Reviewed-by: Reilly Grant <reillyg@chromium.org>
-Commit-Queue: Ken Rockot <rockot@google.com>
-Reviewed-by: Robert Kaplow <rkaplow@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1128822}
----
- components/metrics/psi_memory_parser.h                         | 1 +
- components/services/app_service/public/cpp/capability_access.h | 1 +
- components/soda/constants.h                                    | 1 +
- device/base/synchronization/one_writer_seqlock.h               | 1 +
- device/bluetooth/public/cpp/bluetooth_uuid.h                   | 1 +
- extensions/common/constants.h                                  | 3 +++
- extensions/renderer/bindings/api_invocation_errors.h           | 1 +
- net/base/parse_number.h                                        | 2 ++
- net/cookies/cookie_inclusion_status.h                          | 1 +
- sandbox/linux/syscall_broker/broker_file_permission.h          | 1 +
- .../blink/public/common/bluetooth/web_bluetooth_device_id.h    | 3 +++
- .../public/common/origin_trials/origin_trial_public_key.h      | 1 +
- ui/gfx/geometry/linear_gradient.h                              | 2 ++
- 13 files changed, 19 insertions(+)
-
-diff --git a/components/metrics/psi_memory_parser.h b/components/metrics/psi_memory_parser.h
-index b8b22f4ab74..bf02be5074e 100644
---- a/components/metrics/psi_memory_parser.h
-+++ b/components/metrics/psi_memory_parser.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
- #define COMPONENTS_METRICS_PSI_MEMORY_PARSER_H_
- 
-+#include <cstdint>
- #include <string>
- 
- #include "base/gtest_prod_util.h"
-diff --git a/components/services/app_service/public/cpp/capability_access.h b/components/services/app_service/public/cpp/capability_access.h
-index 991a993ba99..8050a888d81 100644
---- a/components/services/app_service/public/cpp/capability_access.h
-+++ b/components/services/app_service/public/cpp/capability_access.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_SERVICES_APP_SERVICE_PUBLIC_CPP_CAPABILITY_ACCESS_H_
- #define COMPONENTS_SERVICES_APP_SERVICE_PUBLIC_CPP_CAPABILITY_ACCESS_H_
- 
-+#include <memory>
- #include <string>
- #include <utility>
- 
-diff --git a/components/soda/constants.h b/components/soda/constants.h
-index 82b2b98b2fa..b455e2a97da 100644
---- a/components/soda/constants.h
-+++ b/components/soda/constants.h
-@@ -5,6 +5,7 @@
- #ifndef COMPONENTS_SODA_CONSTANTS_H_
- #define COMPONENTS_SODA_CONSTANTS_H_
- 
-+#include <cstdint>
- #include <string>
- 
- #include "base/files/file_path.h"
-diff --git a/device/base/synchronization/one_writer_seqlock.h b/device/base/synchronization/one_writer_seqlock.h
-index e37a16b81be..b93f14140c6 100644
---- a/device/base/synchronization/one_writer_seqlock.h
-+++ b/device/base/synchronization/one_writer_seqlock.h
-@@ -6,6 +6,7 @@
- #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
- 
- #include <atomic>
-+#include <cstddef>
- #include <cstdint>
- #include <type_traits>
- 
-diff --git a/device/bluetooth/public/cpp/bluetooth_uuid.h b/device/bluetooth/public/cpp/bluetooth_uuid.h
-index b4bedf01570..d636ba62e2f 100644
---- a/device/bluetooth/public/cpp/bluetooth_uuid.h
-+++ b/device/bluetooth/public/cpp/bluetooth_uuid.h
-@@ -5,6 +5,7 @@
- #ifndef DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- #define DEVICE_BLUETOOTH_PUBLIC_CPP_BLUETOOTH_UUID_H_
- 
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/extensions/common/constants.h b/extensions/common/constants.h
-index 0f7db327206..284cc878ff8 100644
---- a/extensions/common/constants.h
-+++ b/extensions/common/constants.h
-@@ -5,6 +5,9 @@
- #ifndef EXTENSIONS_COMMON_CONSTANTS_H_
- #define EXTENSIONS_COMMON_CONSTANTS_H_
- 
-+#include <cstddef>
-+#include <cstdint>
-+
- #include "base/files/file_path.h"
- #include "base/strings/string_piece_forward.h"
- #include "build/chromeos_buildflags.h"
-diff --git a/extensions/renderer/bindings/api_invocation_errors.h b/extensions/renderer/bindings/api_invocation_errors.h
-index e21700ecfc4..3b704e83b06 100644
---- a/extensions/renderer/bindings/api_invocation_errors.h
-+++ b/extensions/renderer/bindings/api_invocation_errors.h
-@@ -5,6 +5,7 @@
- #ifndef EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- #define EXTENSIONS_RENDERER_BINDINGS_API_INVOCATION_ERRORS_H_
- 
-+#include <cstdint>
- #include <set>
- #include <string>
- 
-diff --git a/net/base/parse_number.h b/net/base/parse_number.h
-index f4827f7a7da..f923b18a7f4 100644
---- a/net/base/parse_number.h
-+++ b/net/base/parse_number.h
-@@ -5,6 +5,8 @@
- #ifndef NET_BASE_PARSE_NUMBER_H_
- #define NET_BASE_PARSE_NUMBER_H_
- 
-+#include <cstdint>
-+
- #include "base/strings/string_piece.h"
- #include "net/base/net_export.h"
- 
-diff --git a/net/cookies/cookie_inclusion_status.h b/net/cookies/cookie_inclusion_status.h
-index 51fb970be72..e8dd6d8d9fa 100644
---- a/net/cookies/cookie_inclusion_status.h
-+++ b/net/cookies/cookie_inclusion_status.h
-@@ -6,6 +6,7 @@
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- 
- #include <bitset>
-+#include <cstdint>
- #include <ostream>
- #include <string>
- #include <vector>
-diff --git a/sandbox/linux/syscall_broker/broker_file_permission.h b/sandbox/linux/syscall_broker/broker_file_permission.h
-index 3538da53ca9..e8e32cccd60 100644
---- a/sandbox/linux/syscall_broker/broker_file_permission.h
-+++ b/sandbox/linux/syscall_broker/broker_file_permission.h
-@@ -6,6 +6,7 @@
- #define SANDBOX_LINUX_SYSCALL_BROKER_BROKER_FILE_PERMISSION_H_
- 
- #include <bitset>
-+#include <cstdint>
- #include <string>
- 
- #include "base/strings/string_piece.h"
-diff --git a/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h b/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-index 8ab06791464..329c8333cdd 100644
---- a/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-+++ b/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h
-@@ -8,6 +8,9 @@
- #include <stdint.h>
- 
- #include <array>
-+#include <cstdint>
-+#include <functional>
-+#include <iosfwd>
- #include <string>
- 
- #include "third_party/blink/public/common/common_export.h"
-diff --git a/third_party/blink/public/common/origin_trials/origin_trial_public_key.h b/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-index c1b5f59f57e..246200991a5 100644
---- a/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-+++ b/third_party/blink/public/common/origin_trials/origin_trial_public_key.h
-@@ -6,6 +6,7 @@
- #define THIRD_PARTY_BLINK_PUBLIC_COMMON_ORIGIN_TRIALS_ORIGIN_TRIAL_PUBLIC_KEY_H_
- 
- #include <array>
-+#include <cstdint>
- 
- namespace blink {
- 
-diff --git a/ui/gfx/geometry/linear_gradient.h b/ui/gfx/geometry/linear_gradient.h
-index d337a7de29b..d327662833f 100644
---- a/ui/gfx/geometry/linear_gradient.h
-+++ b/ui/gfx/geometry/linear_gradient.h
-@@ -8,6 +8,8 @@
- #include <stdint.h>
- 
- #include <array>
-+#include <cstddef>
-+#include <cstdint>
- #include <string>
- 
- #include "ui/gfx/geometry/geometry_skia_export.h"
diff --git a/add-some-typename-s-that-are-required-in-C-17.patch b/add-some-typename-s-that-are-required-in-C-17.patch
new file mode 100644
index 0000000..35b7152
--- /dev/null
+++ b/add-some-typename-s-that-are-required-in-C-17.patch
@@ -0,0 +1,45 @@
+From 2914039316d4ed3f53c3393dc2ba48f637807689 Mon Sep 17 00:00:00 2001
+From: Peter Kasting <pkasting@chromium.org>
+Date: Fri, 12 May 2023 16:40:53 +0000
+Subject: [PATCH] Add some "typename"s that are required in C++17.
+
+Bug: 1444563
+Change-Id: I7801f5e82a40305c357eeda219678dda558f5752
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4526465
+Commit-Queue: Alan Screen <awscreen@chromium.org>
+Reviewed-by: Alan Screen <awscreen@chromium.org>
+Auto-Submit: Peter Kasting <pkasting@chromium.org>
+Commit-Queue: Peter Kasting <pkasting@chromium.org>
+Code-Coverage: Findit <findit-for-me@appspot.gserviceaccount.com>
+Cr-Commit-Position: refs/heads/main@{#1143319}
+---
+ chrome/browser/printing/print_backend_service_manager.cc | 2 +-
+ chrome/browser/printing/print_backend_service_manager.h  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/chrome/browser/printing/print_backend_service_manager.cc b/chrome/browser/printing/print_backend_service_manager.cc
+index b5a4b525a2d..224369cd58c 100644
+--- a/chrome/browser/printing/print_backend_service_manager.cc
++++ b/chrome/browser/printing/print_backend_service_manager.cc
+@@ -1477,7 +1477,7 @@ template <class... T>
+ void PrintBackendServiceManager::RunSavedCallbacks(
+     RemoteSavedCallbacks<T...>& saved_callbacks,
+     const RemoteId& remote_id,
+-    std::remove_reference<T>::type... result) {
++    typename std::remove_reference<T>::type... result) {
+   auto found_callbacks_map = saved_callbacks.find(remote_id);
+   if (found_callbacks_map == saved_callbacks.end())
+     return;  // No callbacks to run.
+diff --git a/chrome/browser/printing/print_backend_service_manager.h b/chrome/browser/printing/print_backend_service_manager.h
+index 41788f42a95..6aa7479c1fd 100644
+--- a/chrome/browser/printing/print_backend_service_manager.h
++++ b/chrome/browser/printing/print_backend_service_manager.h
+@@ -588,7 +588,7 @@ class PrintBackendServiceManager {
+   template <class... T>
+   void RunSavedCallbacks(RemoteSavedCallbacks<T...>& saved_callbacks,
+                          const RemoteId& remote_id,
+-                         std::remove_reference<T>::type... result);
++                         typename std::remove_reference<T>::type... result);
+ 
+   // Test support for client ID management.
+   static void SetClientsForTesting(
diff --git a/dawn-iwyu-add-cstdint-for-uint8_t.patch b/dawn-iwyu-add-cstdint-for-uint8_t.patch
deleted file mode 100644
index 9ca7362..0000000
--- a/dawn-iwyu-add-cstdint-for-uint8_t.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a7423b3d8367a706c50ab787df2fe5eedb6c3c9f Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 3 Apr 2023 13:51:27 +0000
-Subject: [PATCH] IWYU: add cstdint for uint8_t
- dawn::native::stream::ByteVectorSink
-
-Bug: chromium:957519
-Change-Id: I48436db0e203d793e47d717bfb75977c67145e94
-Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/126120
-Reviewed-by: Corentin Wallez <cwallez@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Kokoro: Kokoro <noreply+kokoro@google.com>
----
- src/dawn/native/stream/ByteVectorSink.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/dawn/native/stream/ByteVectorSink.h b/src/dawn/native/stream/ByteVectorSink.h
-index 3b6016c082..5537820b1a 100644
---- a/src/dawn/native/stream/ByteVectorSink.h
-+++ b/src/dawn/native/stream/ByteVectorSink.h
-@@ -15,6 +15,7 @@
- #ifndef SRC_DAWN_NATIVE_STREAM_BYTEVECTORSINK_H_
- #define SRC_DAWN_NATIVE_STREAM_BYTEVECTORSINK_H_
- 
-+#include <cstdint>
- #include <ostream>
- #include <vector>
- 
diff --git a/iwyu-add-cstdint-for-int-types-in-s2cellid.patch b/iwyu-add-cstdint-for-int-types-in-s2cellid.patch
deleted file mode 100644
index 4941b56..0000000
--- a/iwyu-add-cstdint-for-int-types-in-s2cellid.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From dbb0a49610aa491c5eaa1461342485721c37354c Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Fri, 14 Apr 2023 05:29:45 +0000
-Subject: [PATCH] IWYU: add cstdint for int types in s2cellid
-
-Bug: 957519
-Change-Id: I65ad411c605baeaeda3addfd07ea9b565179368b
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4418467
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Reviewed-by: Andrew Moylan <amoylan@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1130286}
----
- third_party/s2cellid/README.chromium           | 1 +
- third_party/s2cellid/src/s2/util/math/vector.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/third_party/s2cellid/README.chromium b/third_party/s2cellid/README.chromium
-index 53c42f7342d..25044e85135 100644
---- a/third_party/s2cellid/README.chromium
-+++ b/third_party/s2cellid/README.chromium
-@@ -18,6 +18,7 @@ Local Modifications:
-    - mathutil.h mathutil.cc
-    - vector.h
-      - Change comparison operator implementations to be C++20-compliant
-+     - add missing cstdint include
-  - _fpcontractoff.h
-  - r1interval.h
-  - r2.h
-diff --git a/third_party/s2cellid/src/s2/util/math/vector.h b/third_party/s2cellid/src/s2/util/math/vector.h
-index ded669c1d71..487edc3f93b 100644
---- a/third_party/s2cellid/src/s2/util/math/vector.h
-+++ b/third_party/s2cellid/src/s2/util/math/vector.h
-@@ -22,6 +22,7 @@
- 
- #include <algorithm>
- #include <cmath>
-+#include <cstdint>
- #include <cstdlib>
- #include <iosfwd>
- #include <iostream>  // NOLINT(readability/streams)
diff --git a/iwyu-add-cstdint-for-uintptr_t-in-device.patch b/iwyu-add-cstdint-for-uintptr_t-in-device.patch
deleted file mode 100644
index 79605c8..0000000
--- a/iwyu-add-cstdint-for-uintptr_t-in-device.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 83de2fa6806fc337e61fef0bd156dc2602542db3 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 4 Apr 2023 16:10:03 +0000
-Subject: [PATCH] IWYU: add cstdint for uintptr_t in device::OneWriterSeqLock
-
-Bug: 957519
-Change-Id: I283f5b0cc34a268bea5dcb03c34726cbec905ea7
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4394541
-Reviewed-by: Ken Rockot <rockot@google.com>
-Commit-Queue: Ken Rockot <rockot@google.com>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#1126023}
----
- device/base/synchronization/one_writer_seqlock.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/device/base/synchronization/one_writer_seqlock.h b/device/base/synchronization/one_writer_seqlock.h
-index 528b6683ca2..e37a16b81be 100644
---- a/device/base/synchronization/one_writer_seqlock.h
-+++ b/device/base/synchronization/one_writer_seqlock.h
-@@ -6,6 +6,7 @@
- #define DEVICE_BASE_SYNCHRONIZATION_ONE_WRITER_SEQLOCK_H_
- 
- #include <atomic>
-+#include <cstdint>
- #include <type_traits>
- 
- #include "base/atomicops.h"
diff --git a/iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch b/iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch
deleted file mode 100644
index 16beef6..0000000
--- a/iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 2a7bf74bdb6348781dd4f3fbe9897969c4e7b819 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 11 Apr 2023 16:09:29 +0000
-Subject: [PATCH] IWYU: add stdint.h for int types in gpu_feature_info
-
-Bug: 957519
-Change-Id: Ic3bebb43bcbb3a04876e5fc35767af39b01afdd2
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4401097
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Reviewed-by: vikas soni <vikassoni@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1128679}
----
- gpu/config/gpu_feature_info.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/gpu/config/gpu_feature_info.h b/gpu/config/gpu_feature_info.h
-index d269ce2d825..45edc112dbc 100644
---- a/gpu/config/gpu_feature_info.h
-+++ b/gpu/config/gpu_feature_info.h
-@@ -5,6 +5,8 @@
- #ifndef GPU_CONFIG_GPU_FEATURE_INFO_H_
- #define GPU_CONFIG_GPU_FEATURE_INFO_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- #include <vector>
- 
diff --git a/iwyu-add-stdint.h-for-integer-types-in-ui.patch b/iwyu-add-stdint.h-for-integer-types-in-ui.patch
deleted file mode 100644
index d493ee9..0000000
--- a/iwyu-add-stdint.h-for-integer-types-in-ui.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7815db39abc8ccf64305c5fbac7e0f88bcc8b371 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 5 Apr 2023 21:14:20 +0000
-Subject: [PATCH] IWYU: add stdint.h for integer types in //ui
-
-Bug: 957519
-Change-Id: I33698e997a32c36db19775f0cf4b22fb13cee349
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4400997
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Reviewed-by: Scott Violet <sky@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1126829}
----
- ui/base/prediction/kalman_filter.h | 2 ++
- ui/events/types/scroll_types.h     | 2 ++
- ui/gfx/geometry/linear_gradient.h  | 2 ++
- 3 files changed, 6 insertions(+)
-
-diff --git a/ui/base/prediction/kalman_filter.h b/ui/base/prediction/kalman_filter.h
-index bee3f946e9c..88a3eb5e95c 100644
---- a/ui/base/prediction/kalman_filter.h
-+++ b/ui/base/prediction/kalman_filter.h
-@@ -5,6 +5,8 @@
- #ifndef UI_BASE_PREDICTION_KALMAN_FILTER_H_
- #define UI_BASE_PREDICTION_KALMAN_FILTER_H_
- 
-+#include <stdint.h>
-+
- #include "base/component_export.h"
- #include "ui/gfx/geometry/matrix3_f.h"
- 
-diff --git a/ui/events/types/scroll_types.h b/ui/events/types/scroll_types.h
-index be6b2779f41..aac53c4bea7 100644
---- a/ui/events/types/scroll_types.h
-+++ b/ui/events/types/scroll_types.h
-@@ -5,6 +5,8 @@
- #ifndef UI_EVENTS_TYPES_SCROLL_TYPES_H_
- #define UI_EVENTS_TYPES_SCROLL_TYPES_H_
- 
-+#include <stdint.h>
-+
- namespace ui {
- 
- enum class ScrollGranularity : uint8_t {
-diff --git a/ui/gfx/geometry/linear_gradient.h b/ui/gfx/geometry/linear_gradient.h
-index 65cd4cb07c7..d337a7de29b 100644
---- a/ui/gfx/geometry/linear_gradient.h
-+++ b/ui/gfx/geometry/linear_gradient.h
-@@ -5,6 +5,8 @@
- #ifndef UI_GFX_LINEAR_GRADIENT_H_
- #define UI_GFX_LINEAR_GRADIENT_H_
- 
-+#include <stdint.h>
-+
- #include <array>
- #include <string>
- 
diff --git a/iwyu-add-stdint.h-for-uint32_t-in-cc.patch b/iwyu-add-stdint.h-for-uint32_t-in-cc.patch
deleted file mode 100644
index 0d5232d..0000000
--- a/iwyu-add-stdint.h-for-uint32_t-in-cc.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e80fc92c8ac9f727486bddeb964206fe7a52fac5 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 10 Apr 2023 15:44:41 +0000
-Subject: [PATCH] IWYU: add stdint.h for uint32_t in cc::TargetProperty
-
-Change-Id: If8b3a9cdf0d310391aeed3abf303e2ea054697b1
-Bug: 957519
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4406545
-Reviewed-by: Stefan Zager <szager@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#1128159}
----
- cc/trees/target_property.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/cc/trees/target_property.cc b/cc/trees/target_property.cc
-index f6e873a01a1..7d73467a92f 100644
---- a/cc/trees/target_property.cc
-+++ b/cc/trees/target_property.cc
-@@ -4,6 +4,8 @@
- 
- #include "cc/trees/target_property.h"
- 
-+#include <stdint.h>
-+
- #include "ui/gfx/animation/keyframe/target_property.h"
- 
- namespace cc {
diff --git a/iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch b/iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch
deleted file mode 100644
index 59cf7b9..0000000
--- a/iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5ec376a5f7170cbd30727f21bb8185ec915a9893 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 4 Apr 2023 17:30:49 +0000
-Subject: [PATCH] IWYU: add stdint.h for uint32_t in
- chrome_pdf::DocumentAttachmentInfo
-
-Bug: 957519
-Change-Id: I8efc538b2ae901c7d5076fdf692a31250c16cbbe
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4395997
-Reviewed-by: Lei Zhang <thestig@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1126091}
----
- pdf/document_attachment_info.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/pdf/document_attachment_info.h b/pdf/document_attachment_info.h
-index e0fffc2ca4e..ad106fdf5e0 100644
---- a/pdf/document_attachment_info.h
-+++ b/pdf/document_attachment_info.h
-@@ -5,6 +5,8 @@
- #ifndef PDF_DOCUMENT_ATTACHMENT_INFO_H_
- #define PDF_DOCUMENT_ATTACHMENT_INFO_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- 
- 
diff --git a/iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch b/iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch
deleted file mode 100644
index 010e22a..0000000
--- a/iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e920736d83fe9138c72569985fce37d9e0543c91 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 4 Apr 2023 14:51:19 +0000
-Subject: [PATCH] IWYU: add stdint.h for uint64_t in EncounteredSurfaceTracker
-
-Bug: 957519
-Change-Id: Id454f688c3067c4755c2c1353f22e0f75643aed9
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4396357
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Reviewed-by: Antonio Sartori <antoniosartori@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1125978}
----
- chrome/browser/privacy_budget/encountered_surface_tracker.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/chrome/browser/privacy_budget/encountered_surface_tracker.h b/chrome/browser/privacy_budget/encountered_surface_tracker.h
-index 012ca2c5952..32d0ac6629e 100644
---- a/chrome/browser/privacy_budget/encountered_surface_tracker.h
-+++ b/chrome/browser/privacy_budget/encountered_surface_tracker.h
-@@ -5,6 +5,8 @@
- #ifndef CHROME_BROWSER_PRIVACY_BUDGET_ENCOUNTERED_SURFACE_TRACKER_H_
- #define CHROME_BROWSER_PRIVACY_BUDGET_ENCOUNTERED_SURFACE_TRACKER_H_
- 
-+#include <stdint.h>
-+
- #include <map>
- 
- #include "base/containers/flat_set.h"
diff --git a/iwyu-add-stdint.h-for-various-int-types-in-base.patch b/iwyu-add-stdint.h-for-various-int-types-in-base.patch
deleted file mode 100644
index 3c3e0d7..0000000
--- a/iwyu-add-stdint.h-for-various-int-types-in-base.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From afbe6c6ee713519263305d7e2d91cc9f1379afe2 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Mon, 3 Apr 2023 20:41:40 +0000
-Subject: [PATCH] IWYU: add stdint.h for various int types in //base
-
-Bug: 957519
-Change-Id: I750de80f0d27d93ef3383052ddb4eefd5ee13abe
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4394430
-Reviewed-by: Daniel Cheng <dcheng@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#1125558}
----
- base/debug/profiler.h       | 1 +
- base/strings/string_piece.h | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/base/debug/profiler.h b/base/debug/profiler.h
-index 5f0deadd5d3..035affc7c4d 100644
---- a/base/debug/profiler.h
-+++ b/base/debug/profiler.h
-@@ -6,6 +6,7 @@
- #define BASE_DEBUG_PROFILER_H_
- 
- #include <stddef.h>
-+#include <stdint.h>
- 
- #include <string>
- 
-diff --git a/base/strings/string_piece.h b/base/strings/string_piece.h
-index 899b654cbe8..9dde6ec29bb 100644
---- a/base/strings/string_piece.h
-+++ b/base/strings/string_piece.h
-@@ -22,6 +22,7 @@
- #define BASE_STRINGS_STRING_PIECE_H_
- 
- #include <stddef.h>
-+#include <stdint.h>
- 
- #include <algorithm>
- #include <iosfwd>
diff --git a/iwyu-add-stdint.h-for-various-int-types-in-comp.patch b/iwyu-add-stdint.h-for-various-int-types-in-comp.patch
deleted file mode 100644
index fb3d834..0000000
--- a/iwyu-add-stdint.h-for-various-int-types-in-comp.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 81b275691c28e2a8ae91514305a0e213461fcda4 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Tue, 11 Apr 2023 13:30:43 +0000
-Subject: [PATCH] IWYU: add stdint.h for various integer types in //components
-
-Bug: 957519
-Change-Id: I920fc7c442b05c3522a6533c4b0ec83b403fd0f0
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4406547
-Reviewed-by: Colin Blundell <blundell@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#1128605}
----
- components/autofill/core/browser/autofill_ablation_study.h      | 2 ++
- components/crash/core/app/crash_reporter_client.h               | 2 ++
- .../feature_engagement/internal/event_storage_validator.h       | 2 ++
- components/omnibox/browser/on_device_head_model.h               | 2 ++
- .../core/browser/generation/password_generator.h                | 2 ++
- components/payments/content/utility/fingerprint_parser.h        | 1 +
- components/viz/common/view_transition_element_resource_id.h     | 2 ++
- 8 files changed, 15 insertions(+)
-
-diff --git a/components/autofill/core/browser/autofill_ablation_study.h b/components/autofill/core/browser/autofill_ablation_study.h
-index ada8121982e..4ddec085621 100644
---- a/components/autofill/core/browser/autofill_ablation_study.h
-+++ b/components/autofill/core/browser/autofill_ablation_study.h
-@@ -5,6 +5,8 @@
- #ifndef COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
- #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_ABLATION_STUDY_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- 
- class GURL;
-diff --git a/components/crash/core/app/crash_reporter_client.h b/components/crash/core/app/crash_reporter_client.h
-index 9f8f20dfa65..a604df7a5ea 100644
---- a/components/crash/core/app/crash_reporter_client.h
-+++ b/components/crash/core/app/crash_reporter_client.h
-@@ -5,6 +5,8 @@
- #ifndef COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
- #define COMPONENTS_CRASH_CORE_APP_CRASH_REPORTER_CLIENT_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- 
- #include "build/build_config.h"
-diff --git a/components/feature_engagement/internal/event_storage_validator.h b/components/feature_engagement/internal/event_storage_validator.h
-index 647a359ee24..f3f792205af 100644
---- a/components/feature_engagement/internal/event_storage_validator.h
-+++ b/components/feature_engagement/internal/event_storage_validator.h
-@@ -5,6 +5,8 @@
- #ifndef COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
- #define COMPONENTS_FEATURE_ENGAGEMENT_INTERNAL_EVENT_STORAGE_VALIDATOR_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- 
- namespace feature_engagement {
-diff --git a/components/omnibox/browser/on_device_head_model.h b/components/omnibox/browser/on_device_head_model.h
-index d51277918cf..3a6039ffd33 100644
---- a/components/omnibox/browser/on_device_head_model.h
-+++ b/components/omnibox/browser/on_device_head_model.h
-@@ -5,6 +5,8 @@
- #ifndef COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_
- #define COMPONENTS_OMNIBOX_BROWSER_ON_DEVICE_HEAD_MODEL_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- #include <utility>
- #include <vector>
-diff --git a/components/password_manager/core/browser/generation/password_generator.h b/components/password_manager/core/browser/generation/password_generator.h
-index b0d621ce35f..683dd668888 100644
---- a/components/password_manager/core/browser/generation/password_generator.h
-+++ b/components/password_manager/core/browser/generation/password_generator.h
-@@ -5,6 +5,8 @@
- #ifndef COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
- #define COMPONENTS_PASSWORD_MANAGER_CORE_BROWSER_GENERATION_PASSWORD_GENERATOR_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- 
- 
-diff --git a/components/payments/content/utility/fingerprint_parser.h b/components/payments/content/utility/fingerprint_parser.h
-index e7983056517..3c3f8308700 100644
---- a/components/payments/content/utility/fingerprint_parser.h
-+++ b/components/payments/content/utility/fingerprint_parser.h
-@@ -6,6 +6,7 @@
- #define COMPONENTS_PAYMENTS_CONTENT_UTILITY_FINGERPRINT_PARSER_H_
- 
- #include <stddef.h>
-+#include <stdint.h>
- 
- #include <string>
- #include <vector>
-diff --git a/components/viz/common/view_transition_element_resource_id.h b/components/viz/common/view_transition_element_resource_id.h
-index fd0d06b16d6..17ae5688877 100644
---- a/components/viz/common/view_transition_element_resource_id.h
-+++ b/components/viz/common/view_transition_element_resource_id.h
-@@ -5,6 +5,8 @@
- #ifndef COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
- #define COMPONENTS_VIZ_COMMON_VIEW_TRANSITION_ELEMENT_RESOURCE_ID_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- #include <vector>
- 
diff --git a/iwyu-add-stdint.h-for-various-integer-types-in-net.patch b/iwyu-add-stdint.h-for-various-integer-types-in-net.patch
deleted file mode 100644
index ff31bbb..0000000
--- a/iwyu-add-stdint.h-for-various-integer-types-in-net.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 78e8aa30665d0344a64a98c092612ea6064dbe60 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 12 Apr 2023 08:42:20 +0000
-Subject: [PATCH] IWYU: add stdint.h for various integer types in //net
-
-Bug: 957519
-Change-Id: I7161bc8f5974a4d241c12d618d954db0787ab84c
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4394856
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Reviewed-by: Steven Bingler <bingler@chromium.org>
-Reviewed-by: Matt Mueller <mattm@chromium.org>
-Cr-Commit-Position: refs/heads/main@{#1129139}
----
- net/cert/pki/string_util.h            | 2 ++
- net/cookies/cookie_inclusion_status.h | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/net/cert/pki/string_util.h b/net/cert/pki/string_util.h
-index 1687b088606..b18f716f4b2 100644
---- a/net/cert/pki/string_util.h
-+++ b/net/cert/pki/string_util.h
-@@ -7,6 +7,8 @@
- 
- #include "net/base/net_export.h"
- 
-+#include <stdint.h>
-+
- #include <string_view>
- #include <vector>
- 
-diff --git a/net/cookies/cookie_inclusion_status.h b/net/cookies/cookie_inclusion_status.h
-index e8dd6d8d9fa..129b13ab7ba 100644
---- a/net/cookies/cookie_inclusion_status.h
-+++ b/net/cookies/cookie_inclusion_status.h
-@@ -5,6 +5,8 @@
- #ifndef NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- #define NET_COOKIES_COOKIE_INCLUSION_STATUS_H_
- 
-+#include <stdint.h>
-+
- #include <bitset>
- #include <cstdint>
- #include <ostream>
diff --git a/openscreen-iwyu-add-stdint.h.patch b/openscreen-iwyu-add-stdint.h.patch
deleted file mode 100644
index 5ab7bcb..0000000
--- a/openscreen-iwyu-add-stdint.h.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From f8d65c61edd2ba483f1f6167c8a5fe5ad53254ea Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 5 Apr 2023 18:53:56 +0200
-Subject: [PATCH] IWYU: add stdint.h for various integer types
-
-Bug: chromium:957519
-Change-Id: If28a50f5b1c68fffd1ba546dea18b4d906a42bbf
-Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/4403253
-Reviewed-by: Mark Foltz <mfoltz@chromium.org>
-Commit-Queue: Mark Foltz <mfoltz@chromium.org>
----
- AUTHORS                                    | 1 +
- discovery/dnssd/public/dns_sd_txt_record.h | 2 ++
- util/base64.h                              | 2 ++
- 3 files changed, 5 insertions(+)
-
-diff --git a/AUTHORS b/AUTHORS
-index 768523fc..4e9e5667 100644
---- a/AUTHORS
-+++ b/AUTHORS
-@@ -5,3 +5,4 @@ Peter Thatcher <pthatcher@chromium.org>
- Jordan Bayles <jophba@chromium.org>
- Max Yakimakha <yakimakha@chromium.org>
- Ryan Keane <rwkeane@google.com>
-+Stephan Hartmann <stha09@googlemail.com>
-diff --git a/discovery/dnssd/public/dns_sd_txt_record.h b/discovery/dnssd/public/dns_sd_txt_record.h
-index edf2c782..c9b5c436 100644
---- a/discovery/dnssd/public/dns_sd_txt_record.h
-+++ b/discovery/dnssd/public/dns_sd_txt_record.h
-@@ -5,6 +5,8 @@
- #ifndef DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
- #define DISCOVERY_DNSSD_PUBLIC_DNS_SD_TXT_RECORD_H_
- 
-+#include <stdint.h>
-+
- #include <functional>
- #include <map>
- #include <set>
-diff --git a/util/base64.h b/util/base64.h
-index a7af9eca..86261936 100644
---- a/util/base64.h
-+++ b/util/base64.h
-@@ -5,6 +5,8 @@
- #ifndef UTIL_BASE64_H_
- #define UTIL_BASE64_H_
- 
-+#include <stdint.h>
-+
- #include <string>
- #include <vector>
- 
diff --git a/pdfium-iwyu-add-stdint.h-for-uint32_t.patch b/pdfium-iwyu-add-stdint.h-for-uint32_t.patch
deleted file mode 100644
index a4dd838..0000000
--- a/pdfium-iwyu-add-stdint.h-for-uint32_t.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 5d9acaac1abbbe45558f2bd6cbd3b3e9efde4414 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 5 Apr 2023 16:10:25 +0000
-Subject: [PATCH] IWYU: add stdint.h for uint32_t pdfium::annotation_flags
-
-Bug: chromium:957519
-Change-Id: Id10921a5fdf93a3b92c76c84266696e92d901bd5
-Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/105890
-Reviewed-by: Lei Zhang <thestig@chromium.org>
-Commit-Queue: Lei Zhang <thestig@chromium.org>
----
- constants/annotation_flags.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/constants/annotation_flags.h b/constants/annotation_flags.h
-index 2ac244e06..d44a0c13c 100644
---- a/constants/annotation_flags.h
-+++ b/constants/annotation_flags.h
-@@ -5,6 +5,8 @@
- #ifndef CONSTANTS_ANNOTATION_FLAGS_H_
- #define CONSTANTS_ANNOTATION_FLAGS_H_
- 
-+#include <stdint.h>
-+
- namespace pdfium {
- namespace annotation_flags {
- 
diff --git a/swiftshader-add-cstdint-for-uint64_t.patch b/swiftshader-add-cstdint-for-uint64_t.patch
deleted file mode 100644
index 2b1d1b0..0000000
--- a/swiftshader-add-cstdint-for-uint64_t.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3ecab9c1aa60d548d8efeae3a231f4df7cca6cc7 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Sun, 2 Apr 2023 20:53:20 +0200
-Subject: [PATCH] IWYU: add cstdint for uint64_t in sw::LRUCache
-
-Bug: chromium:957519
-Change-Id: I70970ceda50dfc38f3d149fea03e8a6a79a35934
-Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/71268
-Commit-Queue: Shahbaz Youssefi <syoussefi@google.com>
-Reviewed-by: Shahbaz Youssefi <syoussefi@google.com>
-Kokoro-Result: kokoro <noreply+kokoro@google.com>
-Tested-by: Shahbaz Youssefi <syoussefi@google.com>
----
- src/System/LRUCache.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/System/LRUCache.hpp b/src/System/LRUCache.hpp
-index 1c244906441..a04cdfafbc0 100644
---- a/src/System/LRUCache.hpp
-+++ b/src/System/LRUCache.hpp
-@@ -18,6 +18,7 @@
- #include "System/Debug.hpp"
- 
- #include <cstddef>
-+#include <cstdint>
- #include <functional>
- #include <unordered_set>
- #include <vector>
diff --git a/unbundle-do-not-use-ZipAnalyzer-traits-header.patch b/unbundle-do-not-use-ZipAnalyzer-traits-header.patch
deleted file mode 100644
index 7397401..0000000
--- a/unbundle-do-not-use-ZipAnalyzer-traits-header.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From c8b965be5b61c2412df938e1feb380b69bd92ee9 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Thu, 6 Apr 2023 07:15:03 +0000
-Subject: [PATCH] [unbundle] do not use ZipAnalyzer traits header
-
-It is enough to include chrome/common/safe_browsing/archive_analyzer_results.h.
-
-Bug: None
-Change-Id: Ia63a66b77c073fa4fdb8470db34b4c24722293cc
-Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4373706
-Reviewed-by: Daniel Rubery <drubery@chromium.org>
-Commit-Queue: Stephan Hartmann <stha09@googlemail.com>
-Cr-Commit-Position: refs/heads/main@{#1127041}
----
- chrome/services/file_util/public/mojom/BUILD.gn   | 3 ++-
- chrome/services/file_util/safe_archive_analyzer.h | 1 +
- 2 files changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/chrome/services/file_util/public/mojom/BUILD.gn b/chrome/services/file_util/public/mojom/BUILD.gn
-index b9e80cc748e..461d2d00b5e 100644
---- a/chrome/services/file_util/public/mojom/BUILD.gn
-+++ b/chrome/services/file_util/public/mojom/BUILD.gn
-@@ -55,7 +55,8 @@ mojom("mojom") {
-           cpp = "::safe_browsing::ArchiveAnalyzerResults"
-         },
-       ]
--      traits_headers = [ "//chrome/common/safe_browsing/zip_analyzer.h" ]
-+      traits_headers =
-+          [ "//chrome/common/safe_browsing/archive_analyzer_results.h" ]
-       traits_private_headers = [ "safe_archive_analyzer_param_traits.h" ]
-       traits_public_deps = [
-         "//chrome/common/safe_browsing:proto",
-diff --git a/chrome/services/file_util/safe_archive_analyzer.h b/chrome/services/file_util/safe_archive_analyzer.h
-index 62307b87839..0231205377c 100644
---- a/chrome/services/file_util/safe_archive_analyzer.h
-+++ b/chrome/services/file_util/safe_archive_analyzer.h
-@@ -7,6 +7,7 @@
- 
- #include "chrome/common/safe_browsing/archive_analyzer_results.h"
- #include "chrome/common/safe_browsing/rar_analyzer.h"
-+#include "chrome/common/safe_browsing/zip_analyzer.h"
- #include "chrome/services/file_util/public/mojom/safe_archive_analyzer.mojom.h"
- #include "mojo/public/cpp/bindings/remote.h"
- 
diff --git a/update-patches.sh b/update-patches.sh
index 601d9a5..273a6d3 100755
--- a/update-patches.sh
+++ b/update-patches.sh
@@ -4,11 +4,11 @@ mkdir tmp
 mv ozone-add-va-api-support-to-wayland.patch remove-main-main10-profile-limit.patch skia-gamma.patch vaapi-add-av1-support.patch tmp
 
 rm *.patch
-git clone https://github.com/archlinux/svntogit-packages.git --branch packages/chromium --single-branch chr
-mv chr/trunk/*.patch .
-nvim -d PKGBUILD chr/trunk/PKGBUILD
+git clone https://gitlab.archlinux.org/archlinux/packaging/packages/chromium
+mv chromium/*.patch .
+nvim -d PKGBUILD chromium/PKGBUILD
 makepkg --printsrcinfo > .SRCINFO
-rm -rf chr
+rm -rf chromium
 
 mv tmp/* .
 rmdir tmp