diff options
| author | JustKidding <jk@vin.ovh> | 2023-05-12 07:17:28 -0500 |
|---|---|---|
| committer | JustKidding <jk@vin.ovh> | 2023-05-12 07:17:28 -0500 |
| commit | 4eae77131d0f6cf13f01d111683c152938157457 (patch) | |
| tree | 75a6ce96ec2b1f5878e81845aef372a64e37fb6c | |
| parent | 0a64e771b141862e529cb52350db4f22b671d8c6 (diff) | |
| download | ungoogled-chromium-4eae77131d0f6cf13f01d111683c152938157457.tar.gz ungoogled-chromium-4eae77131d0f6cf13f01d111683c152938157457.tar.bz2 ungoogled-chromium-4eae77131d0f6cf13f01d111683c152938157457.zip | |
upgpkg: ungoogled-chromium 113.0.5672.92-1
upstream release
28 files changed, 504 insertions, 483 deletions
@@ -1,6 +1,6 @@ pkgbase = ungoogled-chromium pkgdesc = A lightweight approach to removing Google web service dependency - pkgver = 113.0.5672.63 + pkgver = 113.0.5672.92 pkgrel = 1 url = https://github.com/ungoogled-software/ungoogled-chromium arch = x86_64 @@ -44,6 +44,7 @@ pkgbase = ungoogled-chromium depends = libxml2 depends = ffmpeg depends = libwebp + depends = minizip depends = opus depends = harfbuzz depends = re2 @@ -56,74 +57,66 @@ 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.63 - provides = chromedriver=113.0.5672.63 + provides = chromium=113.0.5672.92 + provides = chromedriver=113.0.5672.92 conflicts = chromium conflicts = chromedriver options = !lto - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-113.0.5672.63.tar.xz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-113.0.5672.92.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 = 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.63-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/113.0.5672.63-1.tar.gz + source = ungoogled-chromium-113.0.5672.92-1.tar.gz::https://github.com/ungoogled-software/ungoogled-chromium/archive/113.0.5672.92-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 - 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 = a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5 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 = d464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a sha256sums = 590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7 + sha256sums = 6359d8f891f860d2ae49e1dc3d2ae972e251c24ffb19ff2f8e64523b2d8234c4 sha256sums = 7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302 sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 - sha256sums = ad7a3169d95f182df748940349e2c25868a201949486257829fdb42c69a83a51 + sha256sums = b36ecce88a380b760c468592c1bb69be4b5dbae20b084ae0aba01236720b3690 sha256sums = e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69 sha256sums = e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307 sha256sums = be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c - sha256sums = d0e037f134842db091f7f88afa5e999531850d92a5399a1663783853fc14d3fe - sha256sums = 4c90e796fe2eaa5f07cfd01cf4527c0a42ed21c98777fe4bd7e7720f4c34efc9 - sha256sums = dc3135570e6f625178e5390aa77f7b9b79533fd13d50ea21cccb18b3cafb546b - sha256sums = ef6b52377a7e7590d1fe7e4029eccafbd44c0531abe78b12c05e9c2a08be8eb9 - sha256sums = 3c719fff7777af4c43e752a747be42894d074dd8fd58199a4b105721d380ee6d - 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 @@ -9,7 +9,7 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ungoogled-chromium -pkgver=113.0.5672.63 +pkgver=113.0.5672.92 pkgrel=1 _launcher_ver=8 _manual_clone=0 @@ -31,15 +31,49 @@ 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 download-bubble-typename.patch webauthn-variant.patch + random-fixes-for-gcc13.patch disable-GlobalMediaControlsCastStartStop.patch use-oauth2-client-switches-as-default.patch) -sha256sums=('76cec11dc13abe6703305b0300e1fe24c8f547c1ff313f7be09db0e23d12ee1e' +sha256sums=('a4520b53c824d75bcbc80bcf5da0c3d6f213038c8e31904b8a3bfbe415893ba5' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' '5f868cba9e4d387499711738adc6fd87ab9f1ef61f464016bc682660ae59206a' + '208f2ebcef5c690207e6e798ffbf9e92214e9d35f415c2f6b93efebad831b7e2' + '94baaaa6fbec0af6ec2e967f0b7440b4261a927e853e212d84f0aeaf56ae53f0' + '0003e737072f4f1b22ff932221595e85dd9bf65720ccac36f840cccb8000e3e1' + 'ffe499d63c9c1074cbc3995c188c89b748388dbb9dccf975ce28a434c723acf7' + '7af466e4b5985cc9f0b33df2f3cd2e458c7cbfd7190505d105aad4401c9d072b' + '727588a1b42f6cfe54acf4759a0c3ad3778590d5a5cefcdcb54b579ba16b09c8' + '0914be53b2205b34e4da96f5a94505ac2a01e3639ff433535a23be2d0d581fa7' + '8c9662bed23bfd66ae76d044541f316624386ca4b3baef57a47289feb3db58a9' + '890b6836cea4c31513166db720b210da20d20bcd97a713545268cceffd707af5' + 'ffa23c6233b47e0b4d688e30a44a2550e1236bbd0dc57b996d33dc42266530af' + 'f6a0e149ef5195883c56a875ae366ed92d9960652f2657bfb65b5408badafc65' + '3255477d02d49ef86d47c727b9369f46dc787319bb648bf267a68f37e2041e50' + '94995b4e37671dcd27968bd5a2ebcf50e67bd22659a4bb4a5d0a4f81ff54f471' + '88320e0f08cc7b53807961d0735e7c1bd455a6faf9d8a5d056b7ba7809e37355' + '5dfbfd073f78c887bbffca2b644116571cc9b1196867e44e8fc0cbb40afcf1bc' + 'd97dc00f66fa5868584e4b6d5ef817911eab2dc8022a37c75a00d063f4dac483' 'd464eed4be4e9bf6187b4c40a759c523b7befefa25ba34ad6401b2a07649ca2a' '590fabbb26270947cb477378b53a9dcd17855739076b4af9983e1e54dfcab6d7' + '6359d8f891f860d2ae49e1dc3d2ae972e251c24ffb19ff2f8e64523b2d8234c4' '7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') @@ -56,54 +90,12 @@ 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 - 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) + remove-main-main10-profile-limit.patch) sha256sums=(${sha256sums[@]} - 'ad7a3169d95f182df748940349e2c25868a201949486257829fdb42c69a83a51' + 'b36ecce88a380b760c468592c1bb69be4b5dbae20b084ae0aba01236720b3690' 'e9e8d3a82da818f0a67d4a09be4ecff5680b0534d7f0198befb3654e9fab5b69' 'e742cc5227b6ad6c3e0c2026edd561c6d3151e7bf0afb618578ede181451b307' - 'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c' - 'd0e037f134842db091f7f88afa5e999531850d92a5399a1663783853fc14d3fe' - '4c90e796fe2eaa5f07cfd01cf4527c0a42ed21c98777fe4bd7e7720f4c34efc9' - 'dc3135570e6f625178e5390aa77f7b9b79533fd13d50ea21cccb18b3cafb546b' - 'ef6b52377a7e7590d1fe7e4029eccafbd44c0531abe78b12c05e9c2a08be8eb9' - '3c719fff7777af4c43e752a747be42894d074dd8fd58199a4b105721d380ee6d' - 'e9eb4684da654c03e2ff5cda1069b6f5b344de333d6800730cec8f4d15000a08' - 'dfae1b997efb6e6af1c9a8e986c82c16d19b6401c3d91a3dd67803f9ccb4fea2' - 'bf39f1e3adc9126db89fd4215a2d6632fda03ab93606b526776ff999350e2488' - '351b8548712a8d5edc009165cfbe104bc65e214c7c79d22d97b6d8eb3d7d731f' - 'fb52f89b7017da19f3be7daa6743786456f67ad9455a9c423736051d3f7a0058' - '7a68c0ea1e4e6edc823e330070c8182b50eaaab64d7630ffe1578658d188170a' - '59c6623042f2be866da818516caf0c26098b018bb749050ae15b471e6abf047a' - '7bf7676ec9fcbf288919a372b3623826d272ece536b3b5e4f6c6bf3643bfe67e' - '7cf5f81d45c31e4b8f73840ac360a3cb412ca72a33435d842af5446fd742cf80' - 'e49f2b58b6ea45ea1eccd4699e772bef52c8f2171b5e8e3714490e20e7791c3e' - '15b0ad5feed40930861e6b463ee20f4d84029eec4c803a0d346aa91200c17bca' - '850b20191a9d894bdf99806f7838b8e231474561405b2cc2ee51d6fb0d099e43' - '804888df05e86517a0d894e716c20f438bb109c344e4be29f4d01dec754115a7' - '8381b911b69cef40a52285cf87949ab534f2485df8d3980be73c5aae5c693e32' - '42ca609763db35363bf756bf3fa4f119e84fe58d3dfe0fc32151afe89aabf85a' - 'e7f84823c43f494eb481f0a83f5d13ab9ed8eb0f179dba1a4b715ba91d788390') + 'be8d3475427553feb5bd46665ead3086301ed93c9a41cf6cc2644811c5bda51c') # 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 @@ -130,7 +122,7 @@ declare -gA _system_libs=( [re2]=re2 [snappy]=snappy [woff2]=woff2 - #[zlib]=minizip # broken include from chrome/common/safe_browsing/zip_analyzer.h + [zlib]=minizip ) _unwanted_bundled_libs=( $(printf "%s\n" ${!_system_libs[@]} | sed 's/^libjpeg$/&_turbo/') @@ -169,6 +161,22 @@ prepare() { # 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 # Disable kGlobalMediaControlsCastStartStop by default # https://crbug.com/1314342 @@ -177,30 +185,9 @@ prepare() { # Build fixes patch -Np1 -i ../download-bubble-typename.patch patch -Np1 -i ../webauthn-variant.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 dos2unix third_party/vulkan_memory_allocator/include/vk_mem_alloc.h - 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 + patch -Np1 -i ../random-fixes-for-gcc13.patch + # Custom Patches patch -Np1 -i ../ozone-add-va-api-support-to-wayland.patch diff --git a/chromium-112-gcc-13-0007-misc.patch b/add-missing-includes-causing-build-errors.patch index fe0e860..3e308ba 100644 --- a/chromium-112-gcc-13-0007-misc.patch +++ b/add-missing-includes-causing-build-errors.patch @@ -1,107 +1,8 @@ -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 <stha09@googlemail.com> -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 <chengweih@chromium.org> -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -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 <stdint.h> -+ - #include <array> - #include <string> - - -From 83de2fa6806fc337e61fef0bd156dc2602542db3 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -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 <rockot@google.com> -Commit-Queue: Ken Rockot <rockot@google.com> -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -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 <atomic> -+#include <cstdint> - #include <type_traits> - - #include "base/atomicops.h" - -From 7815db39abc8ccf64305c5fbac7e0f88bcc8b371 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -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 <stha09@googlemail.com> -Reviewed-by: Scott Violet <sky@chromium.org> -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 <stdint.h> -+ - #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 <stdint.h> -+ - 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 <stdint.h> -+ - #include <array> - #include <string> - - 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 +Subject: [PATCH] Add missing includes causing build errors with GCC/libstdc++ + 13 Bug: 957519 Change-Id: If09ae682695714a19e37f3830013a003caba025a @@ -112,6 +13,24 @@ 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 @@ @@ -122,6 +41,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -132,6 +53,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -142,6 +65,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -152,6 +77,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -162,6 +89,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -174,6 +103,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -184,6 +115,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -195,6 +128,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -205,6 +140,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -215,6 +152,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -227,6 +166,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #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 @@ @@ -237,6 +178,8 @@ Cr-Commit-Position: refs/heads/main@{#1128822} 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 @@ @@ -248,4 +191,3 @@ Cr-Commit-Position: refs/heads/main@{#1128822} #include <string> #include "ui/gfx/geometry/geometry_skia_export.h" - diff --git a/chromium-112-gcc-13-0001-openscreen.patch b/chromium-112-gcc-13-0001-openscreen.patch deleted file mode 100644 index 6f3ca9b..0000000 --- a/chromium-112-gcc-13-0001-openscreen.patch +++ /dev/null @@ -1,34 +0,0 @@ -https://chromium-review.googlesource.com/c/openscreen/+/4403253 - -From f8d65c61edd2ba483f1f6167c8a5fe5ad53254ea Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -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 <mfoltz@chromium.org> -Commit-Queue: Mark Foltz <mfoltz@chromium.org> ---- 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 <stdint.h> -+ - #include <functional> - #include <map> - #include <set> ---- 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 <stdint.h> -+ - #include <string> - #include <vector> - diff --git a/chromium-112-gcc-13-0003-ruy.patch b/chromium-112-gcc-13-0003-ruy.patch deleted file mode 100644 index e5a5d0b..0000000 --- a/chromium-112-gcc-13-0003-ruy.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://github.com/google/ruy/pull/329 - -From 7f6f4cfe5fd301bdeb2d7c19ba8b0d7963090f78 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -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 <cstdio> - #include <mutex> -+#include <string> - #include <vector> - #endif - - diff --git a/chromium-112-gcc-13-0005-tensorflow-tflite.patch b/chromium-112-gcc-13-0005-tensorflow-tflite.patch deleted file mode 100644 index 508f00b..0000000 --- a/chromium-112-gcc-13-0005-tensorflow-tflite.patch +++ /dev/null @@ -1,18 +0,0 @@ -https://github.com/tensorflow/tensorflow/pull/60299 - -From 9dbee4329ffd0474b939927f6d337959fb72318a Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -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 <assert.h> - #include <math.h> -+#include <stdint.h> - - #include "third_party/fft2d/fft.h" - - diff --git a/chromium-112-gcc-13-0006-vulkanmemoryallocator.patch b/chromium-112-gcc-13-0006-vulkanmemoryallocator.patch deleted file mode 100644 index 1760256..0000000 --- a/chromium-112-gcc-13-0006-vulkanmemoryallocator.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 <cstdint> -+#include <cstdio> - #include <cstdlib> - #include <cstring> - #include <utility> diff --git a/chromium-112-gcc-13-0014-maldoca.patch b/chromium-112-gcc-13-0014-maldoca.patch deleted file mode 100644 index 3a5e44b..0000000 --- a/chromium-112-gcc-13-0014-maldoca.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 <cstdint> -+ - #include "absl/strings/string_view.h" - - namespace maldoca { - 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 deleted file mode 100644 index 2f12a80..0000000 --- a/chromium-112-gcc-13-0021-gcc-copy-list-init-net-HostCache.patch +++ /dev/null @@ -1,28 +0,0 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4395935 - -From b969f3cc2482f118819919900d0d42fe81c947e2 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -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 <agl@chromium.org> -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -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<bool>{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 deleted file mode 100644 index 8d64bf6..0000000 --- a/chromium-112-gcc-13-0022-gcc-ambiguous-ViewTransitionElementId-type.patch +++ /dev/null @@ -1,27 +0,0 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4406546 - -From 5157addae4101604be0cc5de2d755cf54c5fc38e Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -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 <vollick@chromium.org> -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -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 deleted file mode 100644 index ae9459f..0000000 --- a/chromium-112-gcc-13-0023-gcc-incomplete-type-v8-subtype.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://chromium-review.googlesource.com/c/v8/v8/+/4394663 - -From c5ab3e4f0c5a3ce880941184ef8447c27cd19a93 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Mon, 03 Apr 2023 12:19:34 +0200 -Subject: [PATCH] libstdc++: fix incomplete type in v8::internal::is_subtype<T, U> - -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<T, T> is already true. - -Bug: chromium:957519 -Change-Id: Ia26643dbdf0fb00d5586c71ae6b18e8d0f3cf96e -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4394663 -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -Reviewed-by: Clemens Backes <clemensb@chromium.org> -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 <class T, class U> - struct is_subtype { - static const bool value = -- std::is_base_of<U, T>::value || (std::is_same<U, MaybeObject>::value && -- std::is_convertible<T, Object>::value); -+ std::disjunction<std::is_base_of<U, T>, -+ std::conjunction<std::is_same<U, MaybeObject>, -+ std::is_convertible<T, Object>>>::value; - }; - template <class T1, class T2, class U> - struct is_subtype<UnionT<T1, T2>, U> { diff --git a/chromium-113-gcc-13-vulkan-build-fixes.patch b/chromium-113-gcc-13-vulkan-build-fixes.patch deleted file mode 100644 index a55f2ad..0000000 --- a/chromium-113-gcc-13-vulkan-build-fixes.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- 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 <cstdio> // 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 <sstream> - #include <string> - #include <vector> -+#include <cstdint> - - /** - * Parameter name string supporting deferred formatting for array subscripts. diff --git a/chromium-112-gcc-13-0008-dawn.patch b/dawn-iwyu-add-cstdint-for-uint8_t.patch index 3ebacab..9ca7362 100644 --- a/chromium-112-gcc-13-0008-dawn.patch +++ b/dawn-iwyu-add-cstdint-for-uint8_t.patch @@ -1,9 +1,8 @@ -https://dawn-review.googlesource.com/c/dawn/+/126120 - From a7423b3d8367a706c50ab787df2fe5eedb6c3c9f Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> -Date: Mon, 03 Apr 2023 13:51:27 +0000 -Subject: [PATCH] IWYU: add cstdint for uint8_t dawn::native::stream::ByteVectorSink +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 @@ -11,8 +10,14 @@ 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> ---- a/third_party/dawn/src/dawn/native/stream/ByteVectorSink.h -+++ b/third_party/dawn/src/dawn/native/stream/ByteVectorSink.h +--- + 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_ diff --git a/chromium-112-gcc-13-0011-s2cellid.patch b/iwyu-add-cstdint-for-int-types-in-s2cellid.patch index 4736e20..4941b56 100644 --- a/chromium-112-gcc-13-0011-s2cellid.patch +++ b/iwyu-add-cstdint-for-int-types-in-s2cellid.patch @@ -1,5 +1,3 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4418467 - From dbb0a49610aa491c5eaa1461342485721c37354c Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> Date: Fri, 14 Apr 2023 05:29:45 +0000 @@ -11,6 +9,25 @@ 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 @@ @@ -21,4 +38,3 @@ Cr-Commit-Position: refs/heads/main@{#1130286} #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 new file mode 100644 index 0000000..79605c8 --- /dev/null +++ b/iwyu-add-cstdint-for-uintptr_t-in-device.patch @@ -0,0 +1,28 @@ +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/chromium-112-gcc-13-0017-gpu_feature_info.patch b/iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch index d2002e0..16beef6 100644 --- a/chromium-112-gcc-13-0017-gpu_feature_info.patch +++ b/iwyu-add-stdint.h-for-int-types-in-gpu_feature_info.patch @@ -1,5 +1,3 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4401097 - From 2a7bf74bdb6348781dd4f3fbe9897969c4e7b819 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> Date: Tue, 11 Apr 2023 16:09:29 +0000 @@ -12,9 +10,11 @@ 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 d269ce2..45edc112 100644 +index d269ce2d825..45edc112dbc 100644 --- a/gpu/config/gpu_feature_info.h +++ b/gpu/config/gpu_feature_info.h @@ -5,6 +5,8 @@ @@ -26,4 +26,3 @@ index d269ce2..45edc112 100644 #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 new file mode 100644 index 0000000..d493ee9 --- /dev/null +++ b/iwyu-add-stdint.h-for-integer-types-in-ui.patch @@ -0,0 +1,56 @@ +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/chromium-112-gcc-13-0016-cc-targetproperty.patch b/iwyu-add-stdint.h-for-uint32_t-in-cc.patch index 951a22a..0d5232d 100644 --- a/chromium-112-gcc-13-0016-cc-targetproperty.patch +++ b/iwyu-add-stdint.h-for-uint32_t-in-cc.patch @@ -1,5 +1,3 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4406545 - From e80fc92c8ac9f727486bddeb964206fe7a52fac5 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> Date: Mon, 10 Apr 2023 15:44:41 +0000 @@ -11,6 +9,12 @@ 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 @@ @@ -22,4 +26,3 @@ Cr-Commit-Position: refs/heads/main@{#1128159} #include "ui/gfx/animation/keyframe/target_property.h" namespace cc { - diff --git a/chromium-112-gcc-13-0019-documentattachmentinfo.patch b/iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch index f0f4b48..59cf7b9 100644 --- a/chromium-112-gcc-13-0019-documentattachmentinfo.patch +++ b/iwyu-add-stdint.h-for-uint32_t-in-chrome_pdf.patch @@ -1,9 +1,8 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4395997 - From 5ec376a5f7170cbd30727f21bb8185ec915a9893 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> -Date: Tue, 04 Apr 2023 17:30:49 +0000 -Subject: [PATCH] IWYU: add stdint.h for uint32_t in chrome_pdf::DocumentAttachmentInfo +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 @@ -12,9 +11,11 @@ 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 e0fffc2ca..ad106fdf 100644 +index e0fffc2ca4e..ad106fdf5e0 100644 --- a/pdf/document_attachment_info.h +++ b/pdf/document_attachment_info.h @@ -5,6 +5,8 @@ diff --git a/chromium-112-gcc-13-0018-encounteredsurfacetracker.patch b/iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch index cde1181..010e22a 100644 --- a/chromium-112-gcc-13-0018-encounteredsurfacetracker.patch +++ b/iwyu-add-stdint.h-for-uint64_t-in-EncounteredSurface.patch @@ -1,6 +1,6 @@ From e920736d83fe9138c72569985fce37d9e0543c91 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> -Date: Tue, 04 Apr 2023 14:51:19 +0000 +Date: Tue, 4 Apr 2023 14:51:19 +0000 Subject: [PATCH] IWYU: add stdint.h for uint64_t in EncounteredSurfaceTracker Bug: 957519 @@ -10,9 +10,11 @@ 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 012ca2c..32d0ac6 100644 +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 @@ diff --git a/chromium-112-gcc-13-0009-base.patch b/iwyu-add-stdint.h-for-various-int-types-in-base.patch index d14b860..3c3e0d7 100644 --- a/chromium-112-gcc-13-0009-base.patch +++ b/iwyu-add-stdint.h-for-various-int-types-in-base.patch @@ -1,8 +1,6 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4394430 - From afbe6c6ee713519263305d7e2d91cc9f1379afe2 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> -Date: Mon, 03 Apr 2023 20:41:40 +0000 +Date: Mon, 3 Apr 2023 20:41:40 +0000 Subject: [PATCH] IWYU: add stdint.h for various int types in //base Bug: 957519 @@ -11,6 +9,13 @@ 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 @@ @@ -21,6 +26,8 @@ Cr-Commit-Position: refs/heads/main@{#1125558} #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 @@ @@ -31,4 +38,3 @@ Cr-Commit-Position: refs/heads/main@{#1125558} #include <algorithm> #include <iosfwd> - diff --git a/chromium-112-gcc-13-0010-components.patch b/iwyu-add-stdint.h-for-various-int-types-in-comp.patch index 87d4df3..fb3d834 100644 --- a/chromium-112-gcc-13-0010-components.patch +++ b/iwyu-add-stdint.h-for-various-int-types-in-comp.patch @@ -1,5 +1,3 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4406547 - From 81b275691c28e2a8ae91514305a0e213461fcda4 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> Date: Tue, 11 Apr 2023 13:30:43 +0000 @@ -11,6 +9,18 @@ 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 @@ @@ -22,6 +32,8 @@ Cr-Commit-Position: refs/heads/main@{#1128605} #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 @@ @@ -33,6 +45,8 @@ Cr-Commit-Position: refs/heads/main@{#1128605} #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 @@ @@ -44,6 +58,8 @@ Cr-Commit-Position: refs/heads/main@{#1128605} #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 @@ @@ -55,6 +71,8 @@ Cr-Commit-Position: refs/heads/main@{#1128605} #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 @@ @@ -67,7 +85,7 @@ Cr-Commit-Position: refs/heads/main@{#1128605} diff --git a/components/payments/content/utility/fingerprint_parser.h b/components/payments/content/utility/fingerprint_parser.h -index e7983056517e8..3c3f83087002a 100644 +index e7983056517..3c3f8308700 100644 --- a/components/payments/content/utility/fingerprint_parser.h +++ b/components/payments/content/utility/fingerprint_parser.h @@ -6,6 +6,7 @@ @@ -78,6 +96,8 @@ index e7983056517e8..3c3f83087002a 100644 #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 @@ @@ -89,4 +109,3 @@ index e7983056517e8..3c3f83087002a 100644 #include <string> #include <vector> - diff --git a/chromium-112-gcc-13-0015-net.patch b/iwyu-add-stdint.h-for-various-integer-types-in-net.patch index c331bef..ff31bbb 100644 --- a/chromium-112-gcc-13-0015-net.patch +++ b/iwyu-add-stdint.h-for-various-integer-types-in-net.patch @@ -1,5 +1,3 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/4394856 - From 78e8aa30665d0344a64a98c092612ea6064dbe60 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> Date: Wed, 12 Apr 2023 08:42:20 +0000 @@ -12,6 +10,13 @@ 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 @@ @@ -23,6 +28,8 @@ Cr-Commit-Position: refs/heads/main@{#1129139} #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 @@ @@ -34,4 +41,3 @@ Cr-Commit-Position: refs/heads/main@{#1129139} #include <bitset> #include <cstdint> #include <ostream> - diff --git a/openscreen-iwyu-add-stdint.h.patch b/openscreen-iwyu-add-stdint.h.patch new file mode 100644 index 0000000..5ab7bcb --- /dev/null +++ b/openscreen-iwyu-add-stdint.h.patch @@ -0,0 +1,51 @@ +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/chromium-112-gcc-13-0020-pdfium.patch b/pdfium-iwyu-add-stdint.h-for-uint32_t.patch index ff37518..a4dd838 100644 --- a/chromium-112-gcc-13-0020-pdfium.patch +++ b/pdfium-iwyu-add-stdint.h-for-uint32_t.patch @@ -1,8 +1,6 @@ -https://pdfium-review.googlesource.com/c/pdfium/+/105890 - From 5d9acaac1abbbe45558f2bd6cbd3b3e9efde4414 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> -Date: Wed, 05 Apr 2023 16:10:25 +0000 +Date: Wed, 5 Apr 2023 16:10:25 +0000 Subject: [PATCH] IWYU: add stdint.h for uint32_t pdfium::annotation_flags Bug: chromium:957519 @@ -11,11 +9,13 @@ 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 2ac244e..d44a0c1 100644 ---- a/third_party/pdfium/constants/annotation_flags.h -+++ b/third_party/pdfium/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_ @@ -25,4 +25,3 @@ index 2ac244e..d44a0c1 100644 namespace pdfium { namespace annotation_flags { - diff --git a/random-fixes-for-gcc13.patch b/random-fixes-for-gcc13.patch new file mode 100644 index 0000000..0531bd5 --- /dev/null +++ b/random-fixes-for-gcc13.patch @@ -0,0 +1,75 @@ +diff -upr chromium-113.0.5672.63.orig/gin/time_clamper.h chromium-113.0.5672.63/gin/time_clamper.h +--- chromium-113.0.5672.63.orig/gin/time_clamper.h 2023-04-26 21:43:06.707860200 +0000 ++++ chromium-113.0.5672.63/gin/time_clamper.h 2023-05-09 00:14:09.744221610 +0000 +@@ -6,6 +6,7 @@ + #define GIN_TIME_CLAMPER_H_ + + #include <algorithm> ++#include <cstdlib> + + #include "base/rand_util.h" + #include "base/time/time.h" +@@ -48,7 +49,7 @@ class GIN_EXPORT TimeClamper { + const int64_t micros = now_micros % 1000; + // abs() is necessary for devices with times before unix-epoch (most likely + // configured incorrectly). +- if (abs(micros) + kResolutionMicros < 1000) { ++ if (std::abs(micros) + kResolutionMicros < 1000) { + return now_micros / 1000; + } + return ClampTimeResolution(now_micros) / 1000; +diff -upr chromium-113.0.5672.63.orig/third_party/maldoca/src/maldoca/ole/header.h chromium-113.0.5672.63/third_party/maldoca/src/maldoca/ole/header.h +--- chromium-113.0.5672.63.orig/third_party/maldoca/src/maldoca/ole/header.h 2023-04-26 21:43:58.708449600 +0000 ++++ chromium-113.0.5672.63/third_party/maldoca/src/maldoca/ole/header.h 2023-05-09 00:14:09.744221610 +0000 +@@ -43,6 +43,7 @@ + #ifndef MALDOCA_OLE_HEADER_H_ + #define MALDOCA_OLE_HEADER_H_ + ++#include <cstdint> + #include "absl/strings/string_view.h" + + namespace maldoca { +diff -upr chromium-113.0.5672.63.orig/third_party/ruy/src/ruy/profiler/instrumentation.h chromium-113.0.5672.63/third_party/ruy/src/ruy/profiler/instrumentation.h +--- chromium-113.0.5672.63.orig/third_party/ruy/src/ruy/profiler/instrumentation.h 2023-04-26 21:47:36.527673200 +0000 ++++ chromium-113.0.5672.63/third_party/ruy/src/ruy/profiler/instrumentation.h 2023-05-09 00:14:09.744221610 +0000 +@@ -19,6 +19,7 @@ limitations under the License. + #ifdef RUY_PROFILER + #include <cstdio> + #include <mutex> ++#include <string> + #include <vector> + #endif + +diff -upr chromium-113.0.5672.63.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc chromium-113.0.5672.63/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc +--- chromium-113.0.5672.63.orig/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc 2023-04-26 21:47:39.531938300 +0000 ++++ chromium-113.0.5672.63/third_party/tflite/src/tensorflow/lite/kernels/internal/spectrogram.cc 2023-05-09 00:14:09.747555160 +0000 +@@ -17,6 +17,7 @@ limitations under the License. + + #include <assert.h> + #include <math.h> ++#include <stdint.h> + + #include "third_party/fft2d/fft.h" + +diff -upr chromium-113.0.5672.63.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h chromium-113.0.5672.63/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h +--- chromium-113.0.5672.63.orig/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h 2023-04-26 21:47:38.323831800 +0000 ++++ chromium-113.0.5672.63/third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h 2023-05-09 00:14:09.757555808 +0000 +@@ -2579,6 +2579,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeS + #undef VMA_IMPLEMENTATION + + #include <cstdint> ++#include <cstdio> + #include <cstdlib> + #include <cstring> + #include <utility> +diff -upr chromium-113.0.5672.63.orig/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h chromium-113.0.5672.63/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h +--- chromium-113.0.5672.63.orig/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h 2023-04-26 21:47:36.679686500 +0000 ++++ chromium-113.0.5672.63/third_party/vulkan_memory_allocator/include/vk_mem_alloc.h 2023-05-09 00:14:41.046248921 +0000 +@@ -2389,6 +2389,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeV + #undef VMA_IMPLEMENTATION + + #include <cstdint> ++#include <cstdio> + #include <cstdlib> + #include <cstring> + #include <utility> diff --git a/chromium-112-gcc-13-0004-swiftshader.patch b/swiftshader-add-cstdint-for-uint64_t.patch index 0a789c6..2b1d1b0 100644 --- a/chromium-112-gcc-13-0004-swiftshader.patch +++ b/swiftshader-add-cstdint-for-uint64_t.patch @@ -1,8 +1,6 @@ -https://swiftshader-review.googlesource.com/c/SwiftShader/+/71268 - From 3ecab9c1aa60d548d8efeae3a231f4df7cca6cc7 Mon Sep 17 00:00:00 2001 From: Stephan Hartmann <stha09@googlemail.com> -Date: Sun, 02 Apr 2023 20:53:20 +0200 +Date: Sun, 2 Apr 2023 20:53:20 +0200 Subject: [PATCH] IWYU: add cstdint for uint64_t in sw::LRUCache Bug: chromium:957519 @@ -12,8 +10,14 @@ 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> ---- a/third_party/swiftshader/src/System/LRUCache.hpp -+++ b/third_party/swiftshade/rsrc/System/LRUCache.hpp +--- + 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" @@ -22,4 +26,3 @@ Tested-by: Shahbaz Youssefi <syoussefi@google.com> #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 new file mode 100644 index 0000000..7397401 --- /dev/null +++ b/unbundle-do-not-use-ZipAnalyzer-traits-header.patch @@ -0,0 +1,44 @@ +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" + |