From b08a3303acb5eb53d03179c0bbd610f99824848d Mon Sep 17 00:00:00 2001 From: JustKidding Date: Thu, 4 May 2023 21:07:32 -0500 Subject: upgpkg: ungoogled-chromium 113.0.5672.63-1 upstream release --- .SRCINFO | 62 ++++- PKGBUILD | 93 +++++++- ...string-for-std-strlen-in-web_view_impl.cc.patch | 27 +++ chromium-112-gcc-13-0001-openscreen.patch | 34 +++ chromium-112-gcc-13-0003-ruy.patch | 18 ++ chromium-112-gcc-13-0004-swiftshader.patch | 25 ++ chromium-112-gcc-13-0005-tensorflow-tflite.patch | 18 ++ ...ium-112-gcc-13-0006-vulkanmemoryallocator.patch | 11 + chromium-112-gcc-13-0007-misc.patch | 251 +++++++++++++++++++++ chromium-112-gcc-13-0008-dawn.patch | 23 ++ chromium-112-gcc-13-0009-base.patch | 34 +++ chromium-112-gcc-13-0010-components.patch | 92 ++++++++ chromium-112-gcc-13-0011-s2cellid.patch | 24 ++ chromium-112-gcc-13-0014-maldoca.patch | 19 ++ chromium-112-gcc-13-0015-net.patch | 37 +++ chromium-112-gcc-13-0016-cc-targetproperty.patch | 25 ++ chromium-112-gcc-13-0017-gpu_feature_info.patch | 29 +++ ...112-gcc-13-0018-encounteredsurfacetracker.patch | 26 +++ ...um-112-gcc-13-0019-documentattachmentinfo.patch | 28 +++ chromium-112-gcc-13-0020-pdfium.patch | 28 +++ ...-13-0021-gcc-copy-list-init-net-HostCache.patch | 28 +++ ...cc-ambiguous-ViewTransitionElementId-type.patch | 27 +++ ...cc-13-0023-gcc-incomplete-type-v8-subtype.patch | 37 +++ chromium-113-gcc-13-vulkan-build-fixes.patch | 22 ++ download-bubble-typename.patch | 40 ++++ ...relax-constraints-on-VirtualCursor-layout.patch | 48 ---- webauthn-variant.patch | 12 + 27 files changed, 1050 insertions(+), 68 deletions(-) create mode 100644 add-cstring-for-std-strlen-in-web_view_impl.cc.patch create mode 100644 chromium-112-gcc-13-0001-openscreen.patch create mode 100644 chromium-112-gcc-13-0003-ruy.patch create mode 100644 chromium-112-gcc-13-0004-swiftshader.patch create mode 100644 chromium-112-gcc-13-0005-tensorflow-tflite.patch create mode 100644 chromium-112-gcc-13-0006-vulkanmemoryallocator.patch create mode 100644 chromium-112-gcc-13-0007-misc.patch create mode 100644 chromium-112-gcc-13-0008-dawn.patch create mode 100644 chromium-112-gcc-13-0009-base.patch create mode 100644 chromium-112-gcc-13-0010-components.patch create mode 100644 chromium-112-gcc-13-0011-s2cellid.patch create mode 100644 chromium-112-gcc-13-0014-maldoca.patch create mode 100644 chromium-112-gcc-13-0015-net.patch create mode 100644 chromium-112-gcc-13-0016-cc-targetproperty.patch create mode 100644 chromium-112-gcc-13-0017-gpu_feature_info.patch create mode 100644 chromium-112-gcc-13-0018-encounteredsurfacetracker.patch create mode 100644 chromium-112-gcc-13-0019-documentattachmentinfo.patch create mode 100644 chromium-112-gcc-13-0020-pdfium.patch create mode 100644 chromium-112-gcc-13-0021-gcc-copy-list-init-net-HostCache.patch create mode 100644 chromium-112-gcc-13-0022-gcc-ambiguous-ViewTransitionElementId-type.patch create mode 100644 chromium-112-gcc-13-0023-gcc-incomplete-type-v8-subtype.patch create mode 100644 chromium-113-gcc-13-vulkan-build-fixes.patch create mode 100644 download-bubble-typename.patch delete mode 100644 sql-relax-constraints-on-VirtualCursor-layout.patch create mode 100644 webauthn-variant.patch diff --git a/.SRCINFO b/.SRCINFO index 973b91f..4d33f6b 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = ungoogled-chromium pkgdesc = A lightweight approach to removing Google web service dependency - pkgver = 112.0.5615.165 + pkgver = 113.0.5672.63 pkgrel = 1 url = https://github.com/ungoogled-software/ungoogled-chromium arch = x86_64 @@ -34,7 +34,6 @@ pkgbase = ungoogled-chromium depends = hicolor-icon-theme depends = fontconfig depends = woff2 - depends = aom depends = brotli depends = libjpeg depends = icu @@ -44,7 +43,6 @@ pkgbase = ungoogled-chromium depends = libxml2 depends = ffmpeg depends = libwebp - depends = minizip depends = opus depends = harfbuzz depends = re2 @@ -60,23 +58,69 @@ pkgbase = ungoogled-chromium provides = chromium conflicts = chromium options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-112.0.5615.165.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-113.0.5672.63.tar.xz source = https://github.com/foutrelis/chromium-launcher/archive/v8/chromium-launcher-8.tar.gz - source = sql-relax-constraints-on-VirtualCursor-layout.patch + source = add-cstring-for-std-strlen-in-web_view_impl.cc.patch + source = download-bubble-typename.patch + source = webauthn-variant.patch source = disable-GlobalMediaControlsCastStartStop.patch source = use-oauth2-client-switches-as-default.patch - source = ungoogled-chromium-112.0.5615.165-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/112.0.5615.165-1.tar.gz + source = ungoogled-chromium-113.0.5672.63-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/113.0.5672.63-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 = 168c62fea9f428f99fbf967f36a75ee5da160429e3a5b86bf02188c5fe7c79fd + source = chromium-112-gcc-13-0001-openscreen.patch + source = chromium-112-gcc-13-0003-ruy.patch + source = chromium-112-gcc-13-0004-swiftshader.patch + source = chromium-112-gcc-13-0005-tensorflow-tflite.patch + source = chromium-112-gcc-13-0006-vulkanmemoryallocator.patch + source = chromium-112-gcc-13-0007-misc.patch + source = chromium-112-gcc-13-0008-dawn.patch + source = chromium-112-gcc-13-0009-base.patch + source = chromium-112-gcc-13-0010-components.patch + source = chromium-112-gcc-13-0011-s2cellid.patch + source = chromium-112-gcc-13-0014-maldoca.patch + source = chromium-112-gcc-13-0015-net.patch + source = chromium-112-gcc-13-0016-cc-targetproperty.patch + source = chromium-112-gcc-13-0017-gpu_feature_info.patch + source = chromium-112-gcc-13-0018-encounteredsurfacetracker.patch + source = chromium-112-gcc-13-0019-documentattachmentinfo.patch + source = chromium-112-gcc-13-0020-pdfium.patch + source = chromium-112-gcc-13-0021-gcc-copy-list-init-net-HostCache.patch + source = chromium-112-gcc-13-0022-gcc-ambiguous-ViewTransitionElementId-type.patch + source = chromium-112-gcc-13-0023-gcc-incomplete-type-v8-subtype.patch + source = chromium-113-gcc-13-vulkan-build-fixes.patch + sha256sums = 76cec11dc13abe6703305b0300e1fe24c8f547c1ff313f7be09db0e23d12ee1e sha256sums = 213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a - sha256sums = e66be069d932fe18811e789c57b96249b7250257ff91a3d82d15e2a7283891b7 + sha256sums = 5f868cba9e4d387499711738adc6fd87ab9f1ef61f464016bc682660ae59206a + sha256sums = d464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a + sha256sums = 590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7 sha256sums = 7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302 sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 - sha256sums = 3e28fa0a5988be4086993e483bd031ac6d2f3284ffbebdf1f7954c7ef2b86398 + sha256sums = ad7a3169d95f182df748940349e2c25868a201949486257829fdb42c69a83a51 sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69 sha256sums = e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307 sha256sums = be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c + sha256sums = d0e037f134842db091f7f88afa5e999531850d92a5399a1663783853fc14d3fe + sha256sums = 4c90e796fe2eaa5f07cfd01cf4527c0a42ed21c98777fe4bd7e7720f4c34efc9 + sha256sums = dc3135570e6f625178e5390aa77f7b9b79533fd13d50ea21cccb18b3cafb546b + sha256sums = ef6b52377a7e7590d1fe7e4029eccafbd44c0531abe78b12c05e9c2a08be8eb9 + sha256sums = fe1013d0b31669d722472b39aea86948f8c7b28c4096e6bf31175570dfc40464 + sha256sums = e9eb4684da654c03e2ff5cda1069b6f5b344de333d6800730cec8f4d15000a08 + sha256sums = dfae1b997efb6e6af1c9a8e986c82c16d19b6401c3d91a3dd67803f9ccb4fea2 + sha256sums = bf39f1e3adc9126db89fd4215a2d6632fda03ab93606b526776ff999350e2488 + sha256sums = 351b8548712a8d5edc009165cfbe104bc65e214c7c79d22d97b6d8eb3d7d731f + sha256sums = fb52f89b7017da19f3be7daa6743786456f67ad9455a9c423736051d3f7a0058 + sha256sums = 7a68c0ea1e4e6edc823e330070c8182b50eaaab64d7630ffe1578658d188170a + sha256sums = 59c6623042f2be866da818516caf0c26098b018bb749050ae15b471e6abf047a + sha256sums = 7bf7676ec9fcbf288919a372b3623826d272ece536b3b5e4f6c6bf3643bfe67e + sha256sums = 7cf5f81d45c31e4b8f73840ac360a3cb412ca72a33435d842af5446fd742cf80 + sha256sums = e49f2b58b6ea45ea1eccd4699e772bef52c8f2171b5e8e3714490e20e7791c3e + sha256sums = 15b0ad5feed40930861e6b463ee20f4d84029eec4c803a0d346aa91200c17bca + sha256sums = 850b20191a9d894bdf99806f7838b8e231474561405b2cc2ee51d6fb0d099e43 + sha256sums = 804888df05e86517a0d894e716c20f438bb109c344e4be29f4d01dec754115a7 + sha256sums = 8381b911b69cef40a52285cf87949ab534f2485df8d3980be73c5aae5c693e32 + sha256sums = 42ca609763db35363bf756bf3fa4f119e84fe58d3dfe0fc32151afe89aabf85a + sha256sums = e7f84823c43f494eb481f0a83f5d13ab9ed8eb0f179dba1a4b715ba91d788390 pkgname = ungoogled-chromium diff --git a/PKGBUILD b/PKGBUILD index d3949db..36a8113 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ # Contributor: Daniel J Griffiths pkgname=ungoogled-chromium -pkgver=112.0.5615.165 +pkgver=113.0.5672.63 pkgrel=1 _launcher_ver=8 _manual_clone=0 @@ -30,12 +30,16 @@ 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 - sql-relax-constraints-on-VirtualCursor-layout.patch + add-cstring-for-std-strlen-in-web_view_impl.cc.patch + download-bubble-typename.patch + webauthn-variant.patch disable-GlobalMediaControlsCastStartStop.patch use-oauth2-client-switches-as-default.patch) -sha256sums=('168c62fea9f428f99fbf967f36a75ee5da160429e3a5b86bf02188c5fe7c79fd' +sha256sums=('76cec11dc13abe6703305b0300e1fe24c8f547c1ff313f7be09db0e23d12ee1e' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - 'e66be069d932fe18811e789c57b96249b7250257ff91a3d82d15e2a7283891b7' + '5f868cba9e4d387499711738adc6fd87ab9f1ef61f464016bc682660ae59206a' + 'd464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a' + '590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7' '7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') @@ -52,12 +56,54 @@ source=(${source[@]} $pkgname-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz ozone-add-va-api-support-to-wayland.patch vaapi-add-av1-support.patch - remove-main-main10-profile-limit.patch) + remove-main-main10-profile-limit.patch + chromium-112-gcc-13-0001-openscreen.patch + chromium-112-gcc-13-0003-ruy.patch + chromium-112-gcc-13-0004-swiftshader.patch + chromium-112-gcc-13-0005-tensorflow-tflite.patch + chromium-112-gcc-13-0006-vulkanmemoryallocator.patch + chromium-112-gcc-13-0007-misc.patch + chromium-112-gcc-13-0008-dawn.patch + chromium-112-gcc-13-0009-base.patch + chromium-112-gcc-13-0010-components.patch + chromium-112-gcc-13-0011-s2cellid.patch + chromium-112-gcc-13-0014-maldoca.patch + chromium-112-gcc-13-0015-net.patch + chromium-112-gcc-13-0016-cc-targetproperty.patch + chromium-112-gcc-13-0017-gpu_feature_info.patch + chromium-112-gcc-13-0018-encounteredsurfacetracker.patch + chromium-112-gcc-13-0019-documentattachmentinfo.patch + chromium-112-gcc-13-0020-pdfium.patch + chromium-112-gcc-13-0021-gcc-copy-list-init-net-HostCache.patch + chromium-112-gcc-13-0022-gcc-ambiguous-ViewTransitionElementId-type.patch + chromium-112-gcc-13-0023-gcc-incomplete-type-v8-subtype.patch + chromium-113-gcc-13-vulkan-build-fixes.patch) sha256sums=(${sha256sums[@]} - '3e28fa0a5988be4086993e483bd031ac6d2f3284ffbebdf1f7954c7ef2b86398' + 'ad7a3169d95f182df748940349e2c25868a201949486257829fdb42c69a83a51' 'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69' 'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307' - 'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c') + 'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c' + 'd0e037f134842db091f7f88afa5e999531850d92a5399a1663783853fc14d3fe' + '4c90e796fe2eaa5f07cfd01cf4527c0a42ed21c98777fe4bd7e7720f4c34efc9' + 'dc3135570e6f625178e5390aa77f7b9b79533fd13d50ea21cccb18b3cafb546b' + 'ef6b52377a7e7590d1fe7e4029eccafbd44c0531abe78b12c05e9c2a08be8eb9' + 'fe1013d0b31669d722472b39aea86948f8c7b28c4096e6bf31175570dfc40464' + 'e9eb4684da654c03e2ff5cda1069b6f5b344de333d6800730cec8f4d15000a08' + 'dfae1b997efb6e6af1c9a8e986c82c16d19b6401c3d91a3dd67803f9ccb4fea2' + 'bf39f1e3adc9126db89fd4215a2d6632fda03ab93606b526776ff999350e2488' + '351b8548712a8d5edc009165cfbe104bc65e214c7c79d22d97b6d8eb3d7d731f' + 'fb52f89b7017da19f3be7daa6743786456f67ad9455a9c423736051d3f7a0058' + '7a68c0ea1e4e6edc823e330070c8182b50eaaab64d7630ffe1578658d188170a' + '59c6623042f2be866da818516caf0c26098b018bb749050ae15b471e6abf047a' + '7bf7676ec9fcbf288919a372b3623826d272ece536b3b5e4f6c6bf3643bfe67e' + '7cf5f81d45c31e4b8f73840ac360a3cb412ca72a33435d842af5446fd742cf80' + 'e49f2b58b6ea45ea1eccd4699e772bef52c8f2171b5e8e3714490e20e7791c3e' + '15b0ad5feed40930861e6b463ee20f4d84029eec4c803a0d346aa91200c17bca' + '850b20191a9d894bdf99806f7838b8e231474561405b2cc2ee51d6fb0d099e43' + '804888df05e86517a0d894e716c20f438bb109c344e4be29f4d01dec754115a7' + '8381b911b69cef40a52285cf87949ab534f2485df8d3980be73c5aae5c693e32' + '42ca609763db35363bf756bf3fa4f119e84fe58d3dfe0fc32151afe89aabf85a' + 'e7f84823c43f494eb481f0a83f5d13ab9ed8eb0f179dba1a4b715ba91d788390') # 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 @@ -71,7 +117,7 @@ declare -gA _system_libs=( [harfbuzz-ng]=harfbuzz [icu]=icu [jsoncpp]=jsoncpp - [libaom]=aom + #[libaom]=aom # https://aomedia.googlesource.com/aom/+/706ee36dcc82 #[libavif]=libavif # https://github.com/AOMediaCodec/libavif/commit/4d2776a3 [libdrm]= [libjpeg]=libjpeg @@ -84,7 +130,7 @@ declare -gA _system_libs=( [re2]=re2 [snappy]=snappy [woff2]=woff2 - [zlib]=minizip + #[zlib]=minizip # broken include from chrome/common/safe_browsing/zip_analyzer.h ) _unwanted_bundled_libs=( $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/') @@ -122,19 +168,44 @@ prepare() { patch -Np1 -i ../use-oauth2-client-switches-as-default.patch # Upstream fixes - patch -Np1 -i ../sql-relax-constraints-on-VirtualCursor-layout.patch + patch -Np1 -i ../add-cstring-for-std-strlen-in-web_view_impl.cc.patch # Disable kGlobalMediaControlsCastStartStop by default # https://crbug.com/1314342 patch -Np1 -i ../disable-GlobalMediaControlsCastStartStop.patch - # Fixes for building with libstdc++ instead of libc++ + # Build fixes + patch -Np1 -i ../download-bubble-typename.patch + patch -Np1 -i ../webauthn-variant.patch # Custom Patches patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch patch -Np1 -i ../remove-main-main10-profile-limit.patch patch -Np1 -i ../vaapi-add-av1-support.patch + # gcc 13 patches + patch -Np1 -i ../chromium-112-gcc-13-0001-openscreen.patch + patch -Np1 -i ../chromium-112-gcc-13-0003-ruy.patch + patch -Np1 -i ../chromium-112-gcc-13-0004-swiftshader.patch + patch -Np1 -i ../chromium-112-gcc-13-0005-tensorflow-tflite.patch + patch -Np1 -i ../chromium-112-gcc-13-0006-vulkanmemoryallocator.patch + patch -Np1 -i ../chromium-112-gcc-13-0007-misc.patch + patch -Np1 -i ../chromium-112-gcc-13-0008-dawn.patch + patch -Np1 -i ../chromium-112-gcc-13-0009-base.patch + patch -Np1 -i ../chromium-112-gcc-13-0010-components.patch + patch -Np1 -i ../chromium-112-gcc-13-0011-s2cellid.patch + patch -Np1 -i ../chromium-112-gcc-13-0014-maldoca.patch + patch -Np1 -i ../chromium-112-gcc-13-0015-net.patch + patch -Np1 -i ../chromium-112-gcc-13-0016-cc-targetproperty.patch + patch -Np1 -i ../chromium-112-gcc-13-0017-gpu_feature_info.patch + patch -Np1 -i ../chromium-112-gcc-13-0018-encounteredsurfacetracker.patch + patch -Np1 -i ../chromium-112-gcc-13-0019-documentattachmentinfo.patch + patch -Np1 -i ../chromium-112-gcc-13-0020-pdfium.patch + patch -Np1 -i ../chromium-112-gcc-13-0021-gcc-copy-list-init-net-HostCache.patch + patch -Np1 -i ../chromium-112-gcc-13-0022-gcc-ambiguous-ViewTransitionElementId-type.patch + patch -Np1 -i ../chromium-112-gcc-13-0023-gcc-incomplete-type-v8-subtype.patch + patch -Np1 -i ../chromium-113-gcc-13-vulkan-build-fixes.patch + # Ungoogled Chromium changes _ungoogled_repo="$srcdir/$pkgname-$_uc_ver" _utils="${_ungoogled_repo}/utils" 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 new file mode 100644 index 0000000..e90e2fa --- /dev/null +++ b/add-cstring-for-std-strlen-in-web_view_impl.cc.patch @@ -0,0 +1,27 @@ +From 2e14a3ac178ee87aa9154e5a15dcd986af1b6059 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +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 +Commit-Queue: Alex Ilin +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 + #include ++#include + #include + #include + #include diff --git a/chromium-112-gcc-13-0001-openscreen.patch b/chromium-112-gcc-13-0001-openscreen.patch new file mode 100644 index 0000000..6f3ca9b --- /dev/null +++ b/chromium-112-gcc-13-0001-openscreen.patch @@ -0,0 +1,34 @@ +https://chromium-review.googlesource.com/c/openscreen/+/4403253 + +From f8d65c61edd2ba483f1f6167c8a5fe5ad53254ea Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Wed, 05 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 +Commit-Queue: Mark Foltz +--- a/third_party/openscreen/src/discovery/dnssd/public/dns_sd_txt_record.h ++++ b/third_party/openscreen/src/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 ++ + #include + #include + #include +--- a/third_party/openscreen/src/util/base64.h ++++ b/third_party/openscreen/src/util/base64.h +@@ -5,6 +5,8 @@ + #ifndef UTIL_BASE64_H_ + #define UTIL_BASE64_H_ + ++#include ++ + #include + #include + diff --git a/chromium-112-gcc-13-0003-ruy.patch b/chromium-112-gcc-13-0003-ruy.patch new file mode 100644 index 0000000..e5a5d0b --- /dev/null +++ b/chromium-112-gcc-13-0003-ruy.patch @@ -0,0 +1,18 @@ +https://github.com/google/ruy/pull/329 + +From 7f6f4cfe5fd301bdeb2d7c19ba8b0d7963090f78 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Fri, 31 Mar 2023 14:58:38 +0000 +Subject: [PATCH] IWYU: add string for std::string + +--- a/third_party/ruy/src/ruy/profiler/instrumentation.h ++++ b/third_party/ruy/src/ruy/profiler/instrumentation.h +@@ -19,6 +19,7 @@ limitations under the License. + #ifdef RUY_PROFILER + #include + #include ++#include + #include + #endif + + diff --git a/chromium-112-gcc-13-0004-swiftshader.patch b/chromium-112-gcc-13-0004-swiftshader.patch new file mode 100644 index 0000000..0a789c6 --- /dev/null +++ b/chromium-112-gcc-13-0004-swiftshader.patch @@ -0,0 +1,25 @@ +https://swiftshader-review.googlesource.com/c/SwiftShader/+/71268 + +From 3ecab9c1aa60d548d8efeae3a231f4df7cca6cc7 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Sun, 02 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 +Reviewed-by: Shahbaz Youssefi +Kokoro-Result: kokoro +Tested-by: Shahbaz Youssefi +--- a/third_party/swiftshader/src/System/LRUCache.hpp ++++ b/third_party/swiftshade/rsrc/System/LRUCache.hpp +@@ -18,6 +18,7 @@ + #include "System/Debug.hpp" + + #include ++#include + #include + #include + #include + diff --git a/chromium-112-gcc-13-0005-tensorflow-tflite.patch b/chromium-112-gcc-13-0005-tensorflow-tflite.patch new file mode 100644 index 0000000..508f00b --- /dev/null +++ b/chromium-112-gcc-13-0005-tensorflow-tflite.patch @@ -0,0 +1,18 @@ +https://github.com/tensorflow/tensorflow/pull/60299 + +From 9dbee4329ffd0474b939927f6d337959fb72318a Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Fri, 31 Mar 2023 16:01:44 +0000 +Subject: [PATCH] tflite: add stdint.h for int types in internal::Spectrogram + +--- a/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc ++++ b/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc +@@ -17,6 +17,7 @@ limitations under the License. + + #include + #include ++#include + + #include "third_party/fft2d/fft.h" + + diff --git a/chromium-112-gcc-13-0006-vulkanmemoryallocator.patch b/chromium-112-gcc-13-0006-vulkanmemoryallocator.patch new file mode 100644 index 0000000..1760256 --- /dev/null +++ b/chromium-112-gcc-13-0006-vulkanmemoryallocator.patch @@ -0,0 +1,11 @@ +https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator/commit/383f06b9fd9d36fb54cb3d4ac3363a670104bc62 +--- a/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h ++++ b/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +@@ -2389,6 +2389,7 @@ + #undef VMA_IMPLEMENTATION + + #include ++#include + #include + #include + #include diff --git a/chromium-112-gcc-13-0007-misc.patch b/chromium-112-gcc-13-0007-misc.patch new file mode 100644 index 0000000..fe0e860 --- /dev/null +++ b/chromium-112-gcc-13-0007-misc.patch @@ -0,0 +1,251 @@ +These patches are in the same file as they touch the same files and +need to be applied in order. + +https://chromium-review.googlesource.com/c/chromium/src/+/4401098 +https://chromium-review.googlesource.com/c/chromium/src/+/4401098 +https://chromium-review.googlesource.com/c/chromium/src/+/4394541 +https://chromium-review.googlesource.com/c/chromium/src/+/4400997 +https://chromium-review.googlesource.com/c/chromium/src/+/4330267 + +From dae4f1f4114ff6c6811aa3a0410e88e7a53b0531 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Wed, 05 Apr 2023 17:46:42 +0000 +Subject: [PATCH] IWYU: add cstdint for uint8_t in web_bluetooth_device_id + +Bug: 957519 +Change-Id: I2dba0b0088f6975d7ce59c3a14427d2dc5838477 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4401098 +Reviewed-by: Jack Hsieh +Commit-Queue: Stephan Hartmann +Cr-Commit-Position: refs/heads/main@{#1126677} +--- a/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h ++++ b/third_party/blink/public/common/bluetooth/web_bluetooth_device_id.h +@@ -5,6 +5,8 @@ + #ifndef THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_ + #define THIRD_PARTY_BLINK_PUBLIC_COMMON_BLUETOOTH_WEB_BLUETOOTH_DEVICE_ID_H_ + ++#include ++ + #include + #include + + +From 83de2fa6806fc337e61fef0bd156dc2602542db3 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Tue, 04 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 +Commit-Queue: Ken Rockot +Commit-Queue: Stephan Hartmann +Cr-Commit-Position: refs/heads/main@{#1126023} +--- 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 ++#include + #include + + #include "base/atomicops.h" + +From 7815db39abc8ccf64305c5fbac7e0f88bcc8b371 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Wed, 05 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 +Reviewed-by: Scott Violet +Cr-Commit-Position: refs/heads/main@{#1126829} +--- 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 ++ + #include "base/component_export.h" + #include "ui/gfx/geometry/matrix3_f.h" + +--- 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 ++ + namespace ui { + + enum class ScrollGranularity : uint8_t { +--- 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 ++ + #include + #include + + +From 6bbf6b001e085025cf33412b15eb79d46e2e670c Mon Sep 17 00:00:00 2001 +From: Bruno Pitrus +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 +Auto-Submit: Bruno Pitrus +Reviewed-by: Reilly Grant +Commit-Queue: Ken Rockot +Reviewed-by: Robert Kaplow +Cr-Commit-Position: refs/heads/main@{#1128822} +--- 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 + #include + + #include "base/gtest_prod_util.h" +--- 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 + #include + #include + +--- 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 + #include + + #include "base/files/file_path.h" +--- 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 ++#include + #include + #include + +--- 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 + #include + #include + #include +--- 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 ++#include ++ + #include "base/files/file_path.h" + #include "base/strings/string_piece_forward.h" + #include "build/chromeos_buildflags.h" +--- 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 + #include + #include + +--- 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 ++ + #include "base/strings/string_piece.h" + #include "net/base/net_export.h" + +--- 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 ++#include + #include + #include + #include +--- 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 ++#include + #include + + #include "base/strings/string_piece.h" +--- 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 + + #include ++#include ++#include ++#include + #include + + #include "third_party/blink/public/common/common_export.h" +--- 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 ++#include + + namespace blink { + +--- a/ui/gfx/geometry/linear_gradient.h ++++ b/ui/gfx/geometry/linear_gradient.h +@@ -8,6 +8,8 @@ + #include + + #include ++#include ++#include + #include + + #include "ui/gfx/geometry/geometry_skia_export.h" + diff --git a/chromium-112-gcc-13-0008-dawn.patch b/chromium-112-gcc-13-0008-dawn.patch new file mode 100644 index 0000000..3ebacab --- /dev/null +++ b/chromium-112-gcc-13-0008-dawn.patch @@ -0,0 +1,23 @@ +https://dawn-review.googlesource.com/c/dawn/+/126120 + +From a7423b3d8367a706c50ab787df2fe5eedb6c3c9f Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Mon, 03 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 +Commit-Queue: Stephan Hartmann +Kokoro: Kokoro +--- a/third_party/dawn/src/dawn/native/stream/ByteVectorSink.h ++++ b/third_party/dawn/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 + #include + #include + diff --git a/chromium-112-gcc-13-0009-base.patch b/chromium-112-gcc-13-0009-base.patch new file mode 100644 index 0000000..d14b860 --- /dev/null +++ b/chromium-112-gcc-13-0009-base.patch @@ -0,0 +1,34 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4394430 + +From afbe6c6ee713519263305d7e2d91cc9f1379afe2 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Mon, 03 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 +Commit-Queue: Stephan Hartmann +Cr-Commit-Position: refs/heads/main@{#1125558} +--- a/base/debug/profiler.h ++++ b/base/debug/profiler.h +@@ -6,6 +6,7 @@ + #define BASE_DEBUG_PROFILER_H_ + + #include ++#include + + #include + +--- a/base/strings/string_piece.h ++++ b/base/strings/string_piece.h +@@ -22,6 +22,7 @@ + #define BASE_STRINGS_STRING_PIECE_H_ + + #include ++#include + + #include + #include + diff --git a/chromium-112-gcc-13-0010-components.patch b/chromium-112-gcc-13-0010-components.patch new file mode 100644 index 0000000..87d4df3 --- /dev/null +++ b/chromium-112-gcc-13-0010-components.patch @@ -0,0 +1,92 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4406547 + +From 81b275691c28e2a8ae91514305a0e213461fcda4 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +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 +Commit-Queue: Stephan Hartmann +Cr-Commit-Position: refs/heads/main@{#1128605} +--- 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 ++ + #include + + class GURL; +--- 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 ++ + #include + + #include "build/build_config.h" +--- 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 ++ + #include + + namespace feature_engagement { +--- 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 ++ + #include + #include + #include +--- 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 ++ + #include + + +diff --git a/components/payments/content/utility/fingerprint_parser.h b/components/payments/content/utility/fingerprint_parser.h +index e7983056517e8..3c3f83087002a 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 ++#include + + #include + #include +--- 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 ++ + #include + #include + + diff --git a/chromium-112-gcc-13-0011-s2cellid.patch b/chromium-112-gcc-13-0011-s2cellid.patch new file mode 100644 index 0000000..4736e20 --- /dev/null +++ b/chromium-112-gcc-13-0011-s2cellid.patch @@ -0,0 +1,24 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4418467 + +From dbb0a49610aa491c5eaa1461342485721c37354c Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +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 +Reviewed-by: Andrew Moylan +Cr-Commit-Position: refs/heads/main@{#1130286} +--- 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 + #include ++#include + #include + #include + #include // NOLINT(readability/streams) + diff --git a/chromium-112-gcc-13-0014-maldoca.patch b/chromium-112-gcc-13-0014-maldoca.patch new file mode 100644 index 0000000..3a5e44b --- /dev/null +++ b/chromium-112-gcc-13-0014-maldoca.patch @@ -0,0 +1,19 @@ +https://github.com/google/maldoca/commit/dc14ae0a5452a2f47a1c28e0aecd691639c097cf + +From dc14ae0a5452a2f47a1c28e0aecd691639c097cf Mon Sep 17 00:00:00 2001 +From: b-maldoca <66144360+b-maldoca@users.noreply.github.com> +Date: Wed, 12 Apr 2023 21:36:57 +0200 +Subject: [PATCH] fixing import in maldoca/ole/header.h (#88) + +--- a/third_party/maldoca/src/maldoca/ole/header.h ++++ b/third_party/maldoca/src/maldoca/ole/header.h +@@ -43,6 +43,8 @@ + #ifndef MALDOCA_OLE_HEADER_H_ + #define MALDOCA_OLE_HEADER_H_ + ++#include ++ + #include "absl/strings/string_view.h" + + namespace maldoca { + diff --git a/chromium-112-gcc-13-0015-net.patch b/chromium-112-gcc-13-0015-net.patch new file mode 100644 index 0000000..c331bef --- /dev/null +++ b/chromium-112-gcc-13-0015-net.patch @@ -0,0 +1,37 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4394856 + +From 78e8aa30665d0344a64a98c092612ea6064dbe60 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +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 +Reviewed-by: Steven Bingler +Reviewed-by: Matt Mueller +Cr-Commit-Position: refs/heads/main@{#1129139} +--- 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 ++ + #include + #include + +--- 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 ++ + #include + #include + #include + diff --git a/chromium-112-gcc-13-0016-cc-targetproperty.patch b/chromium-112-gcc-13-0016-cc-targetproperty.patch new file mode 100644 index 0000000..951a22a --- /dev/null +++ b/chromium-112-gcc-13-0016-cc-targetproperty.patch @@ -0,0 +1,25 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4406545 + +From e80fc92c8ac9f727486bddeb964206fe7a52fac5 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +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 +Commit-Queue: Stephan Hartmann +Cr-Commit-Position: refs/heads/main@{#1128159} +--- a/cc/trees/target_property.cc ++++ b/cc/trees/target_property.cc +@@ -4,6 +4,8 @@ + + #include "cc/trees/target_property.h" + ++#include ++ + #include "ui/gfx/animation/keyframe/target_property.h" + + namespace cc { + diff --git a/chromium-112-gcc-13-0017-gpu_feature_info.patch b/chromium-112-gcc-13-0017-gpu_feature_info.patch new file mode 100644 index 0000000..d2002e0 --- /dev/null +++ b/chromium-112-gcc-13-0017-gpu_feature_info.patch @@ -0,0 +1,29 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4401097 + +From 2a7bf74bdb6348781dd4f3fbe9897969c4e7b819 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +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 +Reviewed-by: vikas soni +Cr-Commit-Position: refs/heads/main@{#1128679} +--- + +diff --git a/gpu/config/gpu_feature_info.h b/gpu/config/gpu_feature_info.h +index d269ce2..45edc112 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 ++ + #include + #include + + diff --git a/chromium-112-gcc-13-0018-encounteredsurfacetracker.patch b/chromium-112-gcc-13-0018-encounteredsurfacetracker.patch new file mode 100644 index 0000000..cde1181 --- /dev/null +++ b/chromium-112-gcc-13-0018-encounteredsurfacetracker.patch @@ -0,0 +1,26 @@ +From e920736d83fe9138c72569985fce37d9e0543c91 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Tue, 04 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 +Reviewed-by: Antonio Sartori +Cr-Commit-Position: refs/heads/main@{#1125978} +--- + +diff --git a/chrome/browser/privacy_budget/encountered_surface_tracker.h b/chrome/browser/privacy_budget/encountered_surface_tracker.h +index 012ca2c..32d0ac6 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 ++ + #include + + #include "base/containers/flat_set.h" diff --git a/chromium-112-gcc-13-0019-documentattachmentinfo.patch b/chromium-112-gcc-13-0019-documentattachmentinfo.patch new file mode 100644 index 0000000..f0f4b48 --- /dev/null +++ b/chromium-112-gcc-13-0019-documentattachmentinfo.patch @@ -0,0 +1,28 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4395997 + +From 5ec376a5f7170cbd30727f21bb8185ec915a9893 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Tue, 04 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 +Commit-Queue: Lei Zhang +Cr-Commit-Position: refs/heads/main@{#1126091} +--- + +diff --git a/pdf/document_attachment_info.h b/pdf/document_attachment_info.h +index e0fffc2ca..ad106fdf 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 ++ + #include + + diff --git a/chromium-112-gcc-13-0020-pdfium.patch b/chromium-112-gcc-13-0020-pdfium.patch new file mode 100644 index 0000000..ff37518 --- /dev/null +++ b/chromium-112-gcc-13-0020-pdfium.patch @@ -0,0 +1,28 @@ +https://pdfium-review.googlesource.com/c/pdfium/+/105890 + +From 5d9acaac1abbbe45558f2bd6cbd3b3e9efde4414 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Wed, 05 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 +Commit-Queue: Lei Zhang +--- + +diff --git a/constants/annotation_flags.h b/constants/annotation_flags.h +index 2ac244e..d44a0c1 100644 +--- a/third_party/pdfium/constants/annotation_flags.h ++++ b/third_party/pdfium/constants/annotation_flags.h +@@ -5,6 +5,8 @@ + #ifndef CONSTANTS_ANNOTATION_FLAGS_H_ + #define CONSTANTS_ANNOTATION_FLAGS_H_ + ++#include ++ + namespace pdfium { + namespace annotation_flags { + + diff --git a/chromium-112-gcc-13-0021-gcc-copy-list-init-net-HostCache.patch b/chromium-112-gcc-13-0021-gcc-copy-list-init-net-HostCache.patch new file mode 100644 index 0000000..2f12a80 --- /dev/null +++ b/chromium-112-gcc-13-0021-gcc-copy-list-init-net-HostCache.patch @@ -0,0 +1,28 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4395935 + +From b969f3cc2482f118819919900d0d42fe81c947e2 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Tue, 04 Apr 2023 16:10:52 +0000 +Subject: [PATCH] GCC: fix copy-list-initialization in net::HostCache + +absl::optional has an explicit constructor and therefore all +constructors are considered on copy-list-initialization (CWG1228). + +Bug: 819294 +Change-Id: Ifce659f6a3ed072e0336b5655f2237c0613bddbe +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4395935 +Reviewed-by: Adam Langley +Commit-Queue: Stephan Hartmann +Cr-Commit-Position: refs/heads/main@{#1126024} +--- a/net/dns/host_cache.cc ++++ b/net/dns/host_cache.cc +@@ -389,7 +389,7 @@ + + // Even if otherwise empty, having the metadata result object signifies + // receiving a compatible HTTPS record. +- https_record_compatibility_ = {true}; ++ https_record_compatibility_ = std::vector{true}; + + if (endpoint_metadatas_.value().empty()) + error_ = ERR_NAME_NOT_RESOLVED; + diff --git a/chromium-112-gcc-13-0022-gcc-ambiguous-ViewTransitionElementId-type.patch b/chromium-112-gcc-13-0022-gcc-ambiguous-ViewTransitionElementId-type.patch new file mode 100644 index 0000000..8d64bf6 --- /dev/null +++ b/chromium-112-gcc-13-0022-gcc-ambiguous-ViewTransitionElementId-type.patch @@ -0,0 +1,27 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/4406546 + +From 5157addae4101604be0cc5de2d755cf54c5fc38e Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Tue, 11 Apr 2023 15:09:36 +0000 +Subject: [PATCH] GCC: fix ambiguous ViewTransitionElementId type + +GCC sees cc::ViewTransitionElementId and +blink::ViewTransitionElementId. Add namespace to avoid confusion. + +Bug: 819294 +Change-Id: I5ab81a04b4c7c15a1a0441266fc6f1e0ceb81a05 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4406546 +Reviewed-by: Ian Vollick +Commit-Queue: Stephan Hartmann +Cr-Commit-Position: refs/heads/main@{#1128644} +--- a/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h ++++ b/third_party/blink/renderer/platform/graphics/paint/effect_paint_property_node.h +@@ -116,7 +116,7 @@ + + // An identifier for a view transition element. `id.valid()` returns true if + // this has been set, and false otherwise. +- ViewTransitionElementId view_transition_element_id; ++ blink::ViewTransitionElementId view_transition_element_id; + + // An identifier to tag transition element resources generated and cached in + // the Viz process. This generated resource can be used as content for other diff --git a/chromium-112-gcc-13-0023-gcc-incomplete-type-v8-subtype.patch b/chromium-112-gcc-13-0023-gcc-incomplete-type-v8-subtype.patch new file mode 100644 index 0000000..ae9459f --- /dev/null +++ b/chromium-112-gcc-13-0023-gcc-incomplete-type-v8-subtype.patch @@ -0,0 +1,37 @@ +https://chromium-review.googlesource.com/c/v8/v8/+/4394663 + +From c5ab3e4f0c5a3ce880941184ef8447c27cd19a93 Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann +Date: Mon, 03 Apr 2023 12:19:34 +0200 +Subject: [PATCH] libstdc++: fix incomplete type in v8::internal::is_subtype + +Using std::convertible with incomplete types is UB. However, till +GCC 12 it was accepted and std::convertible returned false. +This fails now for e.g. v8::internal::WasmArray. Use +std::disjunction and std::conjunction instead which are short- +circuiting, because std::is_base_of is already true. + +Bug: chromium:957519 +Change-Id: Ia26643dbdf0fb00d5586c71ae6b18e8d0f3cf96e +Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4394663 +Commit-Queue: Stephan Hartmann +Reviewed-by: Clemens Backes +Cr-Commit-Position: refs/heads/main@{#86904} +--- + +diff --git a/src/codegen/tnode.h b/src/codegen/tnode.h +index 3a8f844..c1de483 100644 +--- a/v8/src/codegen/tnode.h ++++ b/v8/src/codegen/tnode.h +@@ -270,8 +270,9 @@ + template + struct is_subtype { + static const bool value = +- std::is_base_of::value || (std::is_same::value && +- std::is_convertible::value); ++ std::disjunction, ++ std::conjunction, ++ std::is_convertible>>::value; + }; + template + struct is_subtype, U> { diff --git a/chromium-113-gcc-13-vulkan-build-fixes.patch b/chromium-113-gcc-13-vulkan-build-fixes.patch new file mode 100644 index 0000000..a55f2ad --- /dev/null +++ b/chromium-113-gcc-13-vulkan-build-fixes.patch @@ -0,0 +1,22 @@ +--- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h 2023-05-01 16:27:24.571426478 +0200 ++++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h 2023-05-01 16:30:07.095704670 +0200 +@@ -2610,6 +2610,9 @@ + #pragma GCC diagnostic ignored "-Wunused-private-field" + #endif + #endif ++#if VMA_STATS_STRING_ENABLED ++ #include // For snprintf ++#endif + + + /******************************************************************************* +--- a/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/parameter_name.h 2023-05-01 16:31:04.658413452 +0200 ++++ b/third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/parameter_name.h 2023-05-01 16:31:54.107411574 +0200 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + /** + * Parameter name string supporting deferred formatting for array subscripts. diff --git a/download-bubble-typename.patch b/download-bubble-typename.patch new file mode 100644 index 0000000..c7d4f19 --- /dev/null +++ b/download-bubble-typename.patch @@ -0,0 +1,40 @@ +diff --git a/chrome/browser/download/bubble/download_bubble_update_service.cc b/chrome/browser/download/bubble/download_bubble_update_service.cc +index 13460309d0e..a18d2f8a272 100644 +--- a/chrome/browser/download/bubble/download_bubble_update_service.cc ++++ b/chrome/browser/download/bubble/download_bubble_update_service.cc +@@ -87,7 +87,7 @@ ItemSortKey GetSortKey(const Item& item) { + // Helper to get an iterator to the last element in the cache. The cache + // must not be empty. + template +-SortedItems::iterator GetLastIter(SortedItems& cache) { ++typename SortedItems::iterator GetLastIter(SortedItems& cache) { + CHECK(!cache.empty()); + auto it = cache.end(); + return std::prev(it); +@@ -656,9 +656,9 @@ bool DownloadBubbleUpdateService::RemoveItemFromCacheImpl( + } + + template +-SortedItems::iterator ++typename SortedItems::iterator + DownloadBubbleUpdateService::RemoveItemFromCacheByIter( +- SortedItems::iterator iter, ++ typename SortedItems::iterator iter, + SortedItems& cache, + IterMap& iter_map) { + CHECK(iter != cache.end()); +diff --git a/chrome/browser/download/bubble/download_bubble_update_service.h b/chrome/browser/download/bubble/download_bubble_update_service.h +index 4c3c0bc1193..38048873aa9 100644 +--- a/chrome/browser/download/bubble/download_bubble_update_service.h ++++ b/chrome/browser/download/bubble/download_bubble_update_service.h +@@ -179,8 +179,8 @@ class DownloadBubbleUpdateService + + // Removes item if we already have the iterator to it. Returns next iterator. + template +- SortedItems::iterator RemoveItemFromCacheByIter( +- SortedItems::iterator iter, ++ typename SortedItems::iterator RemoveItemFromCacheByIter( ++ typename SortedItems::iterator iter, + SortedItems& cache, + IterMap& iter_map); + diff --git a/sql-relax-constraints-on-VirtualCursor-layout.patch b/sql-relax-constraints-on-VirtualCursor-layout.patch deleted file mode 100644 index d1e65ee..0000000 --- a/sql-relax-constraints-on-VirtualCursor-layout.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 7d1394bd639e3bcf68082ac3fc33eeed6a00d2e6 Mon Sep 17 00:00:00 2001 -From: Elly Fong-Jones -Date: Thu, 2 Mar 2023 00:15:11 +0000 -Subject: [PATCH] sql: relax constraints on VirtualCursor layout - -VirtualCursor::FromSqliteCursor required that VirtualCursor had a -standard layout, but in fact VirtualCursor shouldn't have a standard -layout, and the fact that it does with libc++ is a deviation from the -C++ standard. This change: - -1. Relaxes the requirement that VirtualCursor has a standard layout, and -2. Relaxes the requirement that the sqlite_cursor_ field has to be at - offset 0 - -by use of offsetof() and pointer subtraction. This change both improves -standards compliance and makes this code build with libstdc++. - -Bug: 1380656 -Change-Id: I9c47abd9197b187da0360ca5619ccf7dadab4f33 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4292313 -Reviewed-by: Austin Sullivan -Commit-Queue: Elly Fong-Jones -Cr-Commit-Position: refs/heads/main@{#1111925} ---- - sql/recover_module/cursor.h | 10 ++++------ - 1 file changed, 4 insertions(+), 6 deletions(-) - -diff --git a/sql/recover_module/cursor.h b/sql/recover_module/cursor.h -index 1970bdca8c6..4cb06557009 100644 ---- a/sql/recover_module/cursor.h -+++ b/sql/recover_module/cursor.h -@@ -63,12 +63,10 @@ class VirtualCursor { - // |sqlite_cursor| must have been returned by VirtualTable::SqliteCursor(). - static inline VirtualCursor* FromSqliteCursor( - sqlite3_vtab_cursor* sqlite_cursor) { -- static_assert(std::is_standard_layout::value, -- "needed for the reinterpret_cast below"); -- static_assert(offsetof(VirtualCursor, sqlite_cursor_) == 0, -- "sqlite_cursor_ must be the first member of the class"); -- VirtualCursor* result = reinterpret_cast(sqlite_cursor); -- DCHECK_EQ(sqlite_cursor, &result->sqlite_cursor_); -+ VirtualCursor* result = reinterpret_cast( -+ (reinterpret_cast(sqlite_cursor) - -+ offsetof(VirtualCursor, sqlite_cursor_))); -+ CHECK_EQ(sqlite_cursor, &result->sqlite_cursor_); - return result; - } - diff --git a/webauthn-variant.patch b/webauthn-variant.patch new file mode 100644 index 0000000..ec8ba7a --- /dev/null +++ b/webauthn-variant.patch @@ -0,0 +1,12 @@ +diff --git a/chrome/browser/webauthn/authenticator_request_dialog_model.h b/chrome/browser/webauthn/authenticator_request_dialog_model.h +index f4992a74bd6..45cabe39974 100644 +--- a/chrome/browser/webauthn/authenticator_request_dialog_model.h ++++ b/chrome/browser/webauthn/authenticator_request_dialog_model.h +@@ -7,6 +7,7 @@ + + #include + #include ++#include + #include + + #include "base/containers/span.h" -- cgit v1.2.3