diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2019-09-25 12:02:40 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2019-10-17 16:58:45 +0200 |
commit | 86e8470f5db9adf3ae939629129979338e9c36f6 (patch) | |
tree | 62d3c0ef2278feb6bc5ceaefc10637c182fc33c9 | |
parent | ada2505fc7be4f8f90b7f5bf3cad34657818729d (diff) | |
download | alpine_aports-86e8470f5db9adf3ae939629129979338e9c36f6.tar.bz2 alpine_aports-86e8470f5db9adf3ae939629129979338e9c36f6.tar.xz alpine_aports-86e8470f5db9adf3ae939629129979338e9c36f6.zip |
community/chromium: upgrade to 77.0.3865.75
(cherry picked from commit 54af9f8ac24f52d382c5758e2445bf0206eff40e)
-rw-r--r-- | community/chromium/APKBUILD | 20 | ||||
-rw-r--r-- | community/chromium/chromium-71.0.3578.98-skia-aarch64-buildfix.patch | 21 | ||||
-rw-r--r-- | community/chromium/chromium-77.0.3865.75-harfbuzz-subset.patch | 49 | ||||
-rw-r--r-- | community/chromium/chromium-77.0.3865.90-linked-hash-set.patch | 130 | ||||
-rw-r--r-- | community/chromium/chromium-gcc-r1.patch | 14 | ||||
-rw-r--r-- | community/chromium/musl-sandbox.patch | 61 | ||||
-rw-r--r-- | community/chromium/one_euro_filter-build-fix.patch | 13 |
7 files changed, 242 insertions, 66 deletions
diff --git a/community/chromium/APKBUILD b/community/chromium/APKBUILD index 818bcee588..d1b667d709 100644 --- a/community/chromium/APKBUILD +++ b/community/chromium/APKBUILD | |||
@@ -1,7 +1,7 @@ | |||
1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> | 1 | # Contributor: Carlo Landmeter <clandmeter@gmail.com> |
2 | # Maintainer: Carlo Landmeter <clandmeter@gmail.com> | 2 | # Maintainer: Carlo Landmeter <clandmeter@gmail.com> |
3 | pkgname=chromium | 3 | pkgname=chromium |
4 | pkgver=76.0.3809.132 | 4 | pkgver=77.0.3865.75 |
5 | pkgrel=0 | 5 | pkgrel=0 |
6 | pkgdesc="chromium web browser" | 6 | pkgdesc="chromium web browser" |
7 | url="http://www.chromium.org/" | 7 | url="http://www.chromium.org/" |
@@ -101,7 +101,6 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn | |||
101 | secure_getenv.patch | 101 | secure_getenv.patch |
102 | 102 | ||
103 | chromium-use-alpine-target.patch | 103 | chromium-use-alpine-target.patch |
104 | chromium-gcc-r1.patch | ||
105 | media-base.patch | 104 | media-base.patch |
106 | musl-crashpad.patch | 105 | musl-crashpad.patch |
107 | musl-v8-monotonic-pthread-cont_timedwait.patch | 106 | musl-v8-monotonic-pthread-cont_timedwait.patch |
@@ -110,8 +109,10 @@ source="https://commondatastorage.googleapis.com/chromium-browser-official/$pkgn | |||
110 | gcc-fno-delete-null-pointer-checks.patch | 109 | gcc-fno-delete-null-pointer-checks.patch |
111 | gcc-arm.patch | 110 | gcc-arm.patch |
112 | musl-arm-limits.patch | 111 | musl-arm-limits.patch |
113 | chromium-71.0.3578.98-skia-aarch64-buildfix.patch | ||
114 | aarch64-fixes.patch | 112 | aarch64-fixes.patch |
113 | one_euro_filter-build-fix.patch | ||
114 | chromium-77.0.3865.75-harfbuzz-subset.patch | ||
115 | chromium-77.0.3865.90-linked-hash-set.patch | ||
115 | " | 116 | " |
116 | 117 | ||
117 | builddir="$srcdir"/$pkgname-$pkgver | 118 | builddir="$srcdir"/$pkgname-$pkgver |
@@ -318,7 +319,7 @@ package() { | |||
318 | "$pkgdir"/usr/share/applications/chromium.desktop | 319 | "$pkgdir"/usr/share/applications/chromium.desktop |
319 | 320 | ||
320 | cd "$builddir" | 321 | cd "$builddir" |
321 | for size in 22 24 48 64 128 256; do | 322 | for size in 24 48 64 128 256; do |
322 | install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ | 323 | install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ |
323 | "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" | 324 | "$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png" |
324 | done | 325 | done |
@@ -337,7 +338,7 @@ chromedriver() { | |||
337 | mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin | 338 | mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin |
338 | } | 339 | } |
339 | 340 | ||
340 | sha512sums="e267d4a975fdcc33125d8fed1597e2dc8ec37a78ee2f9a4e03a1aaf6b83b594b444280b7f2ee68b41d227e7daf31b9de91ab2f998f9146613ebd50651c0d16e8 chromium-76.0.3809.132.tar.xz | 341 | sha512sums="7ab5103d75ddaeded69b63110a4ce401f4773017981eb2abaa650cc8a0c013323f7cd4beb19b6bfb6b0542a0269d86f6274da302b3b25d662c7a945f6d17f5d6 chromium-77.0.3865.75.tar.xz |
341 | a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29 pstables-2.8.h | 342 | a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29 pstables-2.8.h |
342 | b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh | 343 | b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh |
343 | f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf | 344 | f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf |
@@ -348,14 +349,13 @@ ef31809702ef020e02445ac36857c621cf852dea14c2fdf291ea0700b6fc6d94e3704726a051e95d | |||
348 | 90efbc89151c77f32434364dcbaabaf9d9a207f4a77f147cd51b3fe100832fbfb3a9fb665303a79a3d788e400f4f41890de202ccbb7bd1fc6252e33c6e74e429 musl-fixes-breakpad.patch | 349 | 90efbc89151c77f32434364dcbaabaf9d9a207f4a77f147cd51b3fe100832fbfb3a9fb665303a79a3d788e400f4f41890de202ccbb7bd1fc6252e33c6e74e429 musl-fixes-breakpad.patch |
349 | 4640c175657f6a53f8a8d1c6bd2208ec30751d739a086b8f4f49250a88e522441a4919c1e47673cbee54c24c9cc65f18d386071fc4667662e4d13201f0bb7e64 musl-hacks.patch | 350 | 4640c175657f6a53f8a8d1c6bd2208ec30751d739a086b8f4f49250a88e522441a4919c1e47673cbee54c24c9cc65f18d386071fc4667662e4d13201f0bb7e64 musl-hacks.patch |
350 | 95ead57f7338649351948d100e32e5ec1eeadb02bffa136ff15c6c515eceb8013c444be092d777c1b62b945bfb83b97778ba4d3a0ccc2d7c2c9a0a8cd8ee0f01 musl-libc++.patch | 351 | 95ead57f7338649351948d100e32e5ec1eeadb02bffa136ff15c6c515eceb8013c444be092d777c1b62b945bfb83b97778ba4d3a0ccc2d7c2c9a0a8cd8ee0f01 musl-libc++.patch |
351 | 2f6111926a6575a117de18bf27b9052a5d33d4de3b0fdfe4016925ee8ac5d88ad13b7366d228c0670a4bca5fe4df391c2288caefcb96d86360286edfe015dc70 musl-sandbox.patch | 352 | 5bb41c9a17545e2504cbfd760a1c138897ae9241a03ae0fe54632ddff679c273ec61e80946a4cd70ff79f237d1a442ca9e6ff4d2f5b0f6458db9239de2d1d3d7 musl-sandbox.patch |
352 | 83b4cc042d501bd94ce953d1bc94361adf9d6f0d1fa71c04c5d3688c0befb81fdb6ccf31e6cab6a22d0057db309b473bc6af75535675c61d167035e36dd1d6c6 no-execinfo.patch | 353 | 83b4cc042d501bd94ce953d1bc94361adf9d6f0d1fa71c04c5d3688c0befb81fdb6ccf31e6cab6a22d0057db309b473bc6af75535675c61d167035e36dd1d6c6 no-execinfo.patch |
353 | db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f820b62c01163283c4829caa37afd6a9ca7592a54d3c65819 no-mallinfo.patch | 354 | db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f820b62c01163283c4829caa37afd6a9ca7592a54d3c65819 no-mallinfo.patch |
354 | 81c590942e73a62027290684c56030796e4bb953dd5007db787733ba84a505326a65001267b820ac3f44212c7e903c102809961f8e4ad42c57e21c44ad41cfe6 resolver.patch | 355 | 81c590942e73a62027290684c56030796e4bb953dd5007db787733ba84a505326a65001267b820ac3f44212c7e903c102809961f8e4ad42c57e21c44ad41cfe6 resolver.patch |
355 | 84732900f50799ee8d4c9a572a8703c1cd67c6a3b8f8dcf97f308319dcef6ac3d41ea5ddfb2ef4d695bdebdae691e30d5631a8d04e59b931935ba188b0308a61 swiftshader.patch | 356 | 84732900f50799ee8d4c9a572a8703c1cd67c6a3b8f8dcf97f308319dcef6ac3d41ea5ddfb2ef4d695bdebdae691e30d5631a8d04e59b931935ba188b0308a61 swiftshader.patch |
356 | 7f9b816ff9088f84929dc9853ab8cf0c705ef95fedb9e9c3e85bc50c8befb76e39ecf5e754fa3fc8b34b42397875ec41c0729f880a642262b675ebf79901810a secure_getenv.patch | 357 | 7f9b816ff9088f84929dc9853ab8cf0c705ef95fedb9e9c3e85bc50c8befb76e39ecf5e754fa3fc8b34b42397875ec41c0729f880a642262b675ebf79901810a secure_getenv.patch |
357 | 246c43a0ab557671119ebc4ecb292925ebfee25312fb50e739a179dc085d23b9623bec2d7baecdd37ebd9318f8770664f20c12de6383def74cd89b7845d149ce chromium-use-alpine-target.patch | 358 | 246c43a0ab557671119ebc4ecb292925ebfee25312fb50e739a179dc085d23b9623bec2d7baecdd37ebd9318f8770664f20c12de6383def74cd89b7845d149ce chromium-use-alpine-target.patch |
358 | 6e2bcbed44786c6c0d3beda935269f30fdcdf07c400defa6bf73f8359a60b1d59cc2f80dbc106be651a535635995641321d9e524b18919d3975bd6008a641d59 chromium-gcc-r1.patch | ||
359 | 589a7acf149d44db081da2dd24a7769f2b9572a8cc64d2aad78577a64768d3b6fb2bfa02292b5260acd2c4a28c3ae9b82847ff901ce8a21baeca0b46dcda0ca9 media-base.patch | 359 | 589a7acf149d44db081da2dd24a7769f2b9572a8cc64d2aad78577a64768d3b6fb2bfa02292b5260acd2c4a28c3ae9b82847ff901ce8a21baeca0b46dcda0ca9 media-base.patch |
360 | 05c1af43038f76014f5f8b605085310414242f2bfad0e3258ddb29a08e7f4307de31b2d551b0a291986cc7d5a01cf3a003ac864216877195bb4310fd33193f0f musl-crashpad.patch | 360 | 05c1af43038f76014f5f8b605085310414242f2bfad0e3258ddb29a08e7f4307de31b2d551b0a291986cc7d5a01cf3a003ac864216877195bb4310fd33193f0f musl-crashpad.patch |
361 | 6953e83d4034f7a016dd055fed152a8a448f741a4c4f7a8f3b03cc7a4589d3d3c03775f844d76d6d4478ac15c655fee0be7355f0d5062ddc7fa9f6ce4b011116 musl-v8-monotonic-pthread-cont_timedwait.patch | 361 | 6953e83d4034f7a016dd055fed152a8a448f741a4c4f7a8f3b03cc7a4589d3d3c03775f844d76d6d4478ac15c655fee0be7355f0d5062ddc7fa9f6ce4b011116 musl-v8-monotonic-pthread-cont_timedwait.patch |
@@ -363,5 +363,7 @@ db7f676d3476820c29f234b1f8f17a74e82b72d67fc727c715307734fd238e3cb0f99d8b5320d45f | |||
363 | bb0f3dc1ade429a398d487ae190a278948533398c4a1085aeb35ff57fefb90a1e598008ba839423ca0acd30ba4c992950f395dba3b9994d3c7187fe68b9a93d7 gcc-fno-delete-null-pointer-checks.patch | 363 | bb0f3dc1ade429a398d487ae190a278948533398c4a1085aeb35ff57fefb90a1e598008ba839423ca0acd30ba4c992950f395dba3b9994d3c7187fe68b9a93d7 gcc-fno-delete-null-pointer-checks.patch |
364 | 91296fcbdfc4b35899e2af949024c7041d85cc64644cf5fe73c8e46a0523b09d1fb8849f315bd212c1ac25caf57553e933cb4eeb8d1856960441d24b2dd20e27 gcc-arm.patch | 364 | 91296fcbdfc4b35899e2af949024c7041d85cc64644cf5fe73c8e46a0523b09d1fb8849f315bd212c1ac25caf57553e933cb4eeb8d1856960441d24b2dd20e27 gcc-arm.patch |
365 | 3bcffb36f28a01d8bb91f1c1ee1e327caebb1e139d4e8772ad15460ee69cb5ea3307a235dc83184a9e09b687882d9617f3a3ce1a7b07cbd6e11b0a5d6a6ace81 musl-arm-limits.patch | 365 | 3bcffb36f28a01d8bb91f1c1ee1e327caebb1e139d4e8772ad15460ee69cb5ea3307a235dc83184a9e09b687882d9617f3a3ce1a7b07cbd6e11b0a5d6a6ace81 musl-arm-limits.patch |
366 | d4d46ea95ed8d47cd4b09f27d99df61cc6b72b4cb92b865310f245259d5adf02cd136888cd44ad12aeba3fd4d638982437fdf230e817d0188cc5ea76fec82cd1 chromium-71.0.3578.98-skia-aarch64-buildfix.patch | 366 | f0a0fa663fd7a88346d69675a96dfd864364f6ba41d19a5adfbfb0f13fd784b194a60cd2c63edfcc21d6b049628eade690ff803f787dbdd29d84cd8312be4d4a aarch64-fixes.patch |
367 | f0a0fa663fd7a88346d69675a96dfd864364f6ba41d19a5adfbfb0f13fd784b194a60cd2c63edfcc21d6b049628eade690ff803f787dbdd29d84cd8312be4d4a aarch64-fixes.patch" | 367 | 739eaab1d9e4ab73e9ae79c8315122751ada5a45a716853667b69f0c6d268a580afeef969fff4f64dfdf6574309d0148d338c5850d3e6de2400771685b74c104 one_euro_filter-build-fix.patch |
368 | 009261f10d12fad86eb0c1d6b543d2b0c2a9ccca28cb85ea3b4b08c4ecc968df0dc62e18c56ae0d36fce99271ba80e34ba39d2022023c265edf2b71e41d445c8 chromium-77.0.3865.75-harfbuzz-subset.patch | ||
369 | 8dd33aa2ffaff63477e164c744bd40840304939fba97201bc1c221e64e58fd00032095dd83a70c19e9dca3190115b3954ab155b870eacf935b71eb8e4e4a8d35 chromium-77.0.3865.90-linked-hash-set.patch" | ||
diff --git a/community/chromium/chromium-71.0.3578.98-skia-aarch64-buildfix.patch b/community/chromium/chromium-71.0.3578.98-skia-aarch64-buildfix.patch deleted file mode 100644 index 15260a53b9..0000000000 --- a/community/chromium/chromium-71.0.3578.98-skia-aarch64-buildfix.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | diff -up chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix chromium-71.0.3578.98/third_party/skia/src/opts/SkRasterPipeline_opts.h | ||
2 | --- third_party/skia/src/opts/SkRasterPipeline_opts.h.aarch64fix 2018-12-14 11:17:43.249121756 -0500 | ||
3 | +++ third_party/skia/src/opts/SkRasterPipeline_opts.h 2018-12-14 11:20:07.770030234 -0500 | ||
4 | @@ -658,7 +658,7 @@ SI F approx_powf(F x, F y) { | ||
5 | } | ||
6 | |||
7 | SI F from_half(U16 h) { | ||
8 | -#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
9 | +#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
10 | return vcvt_f32_f16(h); | ||
11 | |||
12 | #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
13 | @@ -678,7 +678,7 @@ SI F from_half(U16 h) { | ||
14 | } | ||
15 | |||
16 | SI U16 to_half(F f) { | ||
17 | -#if defined(SK_CPU_ARM64) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
18 | +#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. | ||
19 | return vcvt_f16_f32(f); | ||
20 | |||
21 | #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) | ||
diff --git a/community/chromium/chromium-77.0.3865.75-harfbuzz-subset.patch b/community/chromium/chromium-77.0.3865.75-harfbuzz-subset.patch new file mode 100644 index 0000000000..fff75e76d2 --- /dev/null +++ b/community/chromium/chromium-77.0.3865.75-harfbuzz-subset.patch | |||
@@ -0,0 +1,49 @@ | |||
1 | From 27e25336b8316ff3ec4e464058682ed85801fd06 Mon Sep 17 00:00:00 2001 | ||
2 | From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | ||
3 | Date: Mon, 29 Jul 2019 10:54:28 +0000 | ||
4 | Subject: [PATCH] Also link against libharfbuzz-subset when use_system_harfbuzz is true | ||
5 | |||
6 | When building HarfBuzz as part of Chromium, there is a single source set | ||
7 | with all the files we need in the build. | ||
8 | |||
9 | Upstream HarfBuzz, on the other hand, produces a few different libraries: | ||
10 | harfbuzz, harfbuzz-icu and harfbuzz-subset. When |use_system_harfbuzz| is | ||
11 | true, we were only looking for (and using) harfbuzz.pc with pkg-config even | ||
12 | though we also use symbols from libharfbuzz-subset.so. This resulted in | ||
13 | errors when linking: | ||
14 | |||
15 | ld: obj/skia/skia/SkPDFSubsetFont.o: in function `SkPDFSubsetFont(sk_sp<SkData>, SkPDFGlyphUse const&, SkPDF::Metadata::Subsetter, char const*, int)': | ||
16 | SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x48a): undefined reference to `hb_subset_input_create_or_fail' | ||
17 | ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x4af): undefined reference to `hb_subset_input_glyph_set' | ||
18 | ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5d7): undefined reference to `hb_subset_input_set_retain_gids' | ||
19 | ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5e4): undefined reference to `hb_subset_input_set_drop_hints' | ||
20 | ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x5f3): undefined reference to `hb_subset' | ||
21 | ld: SkPDFSubsetFont.cpp:(.text._Z15SkPDFSubsetFont5sk_spI6SkDataERK13SkPDFGlyphUseN5SkPDF8Metadata9SubsetterEPKci+0x66f): undefined reference to `hb_subset_input_destroy' | ||
22 | |||
23 | as reported in | ||
24 | https://groups.google.com/a/chromium.org/d/msg/chromium-packagers/UyJsVJ5QqWo/jSv5z7-rEQAJ | ||
25 | |||
26 | Change-Id: I997af075c7b7263cd7cc71a63db5b0f93bd1ab59 | ||
27 | Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1715288 | ||
28 | Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> | ||
29 | Commit-Queue: Dominik Röttsches <drott@chromium.org> | ||
30 | Reviewed-by: Dominik Röttsches <drott@chromium.org> | ||
31 | Cr-Commit-Position: refs/heads/master@{#681760} | ||
32 | --- | ||
33 | |||
34 | diff --git a/third_party/harfbuzz-ng/BUILD.gn b/third_party/harfbuzz-ng/BUILD.gn | ||
35 | index 37d8e33..72013eb1d 100644 | ||
36 | --- ./third_party/harfbuzz-ng/BUILD.gn | ||
37 | +++ ./third_party/harfbuzz-ng/BUILD.gn | ||
38 | @@ -16,7 +16,10 @@ | ||
39 | "//third_party:freetype_harfbuzz", | ||
40 | "//third_party/freetype:freetype_source", | ||
41 | ] | ||
42 | - packages = [ "harfbuzz" ] | ||
43 | + packages = [ | ||
44 | + "harfbuzz", | ||
45 | + "harfbuzz-subset", | ||
46 | + ] | ||
47 | } | ||
48 | } else { | ||
49 | config("harfbuzz_config") { | ||
diff --git a/community/chromium/chromium-77.0.3865.90-linked-hash-set.patch b/community/chromium/chromium-77.0.3865.90-linked-hash-set.patch new file mode 100644 index 0000000000..adb626f6fd --- /dev/null +++ b/community/chromium/chromium-77.0.3865.90-linked-hash-set.patch | |||
@@ -0,0 +1,130 @@ | |||
1 | From 74138b9febd37eac0fc26b8efb110014a83a52c6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jeremy Roman <jbroman@chromium.org> | ||
3 | Date: Wed, 07 Aug 2019 13:26:48 +0000 | ||
4 | Subject: [PATCH] WTF: Make LinkedHashSet understand values for which memset initialization would be bad. | ||
5 | |||
6 | Includes a unit test which fails before, and uses this to fix FontCacheKeyTraits. | ||
7 | |||
8 | Bug: 980025 | ||
9 | Change-Id: If41f97444c7fd37b9b95d6dadaf3da5689079e9e | ||
10 | Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1739948 | ||
11 | Reviewed-by: Kentaro Hara <haraken@chromium.org> | ||
12 | Reviewed-by: Yutaka Hirano <yhirano@chromium.org> | ||
13 | Commit-Queue: Jeremy Roman <jbroman@chromium.org> | ||
14 | Cr-Commit-Position: refs/heads/master@{#684731} | ||
15 | --- | ||
16 | |||
17 | diff --git a/third_party/blink/renderer/platform/fonts/font_cache_key.h b/third_party/blink/renderer/platform/fonts/font_cache_key.h | ||
18 | index 0efc8fb..90063cb 100644 | ||
19 | --- ./third_party/blink/renderer/platform/fonts/font_cache_key.h | ||
20 | +++ ./third_party/blink/renderer/platform/fonts/font_cache_key.h | ||
21 | @@ -133,6 +133,10 @@ | ||
22 | |||
23 | struct FontCacheKeyTraits : WTF::SimpleClassHashTraits<FontCacheKey> { | ||
24 | STATIC_ONLY(FontCacheKeyTraits); | ||
25 | + | ||
26 | + // std::string's empty state need not be zero in all implementations, | ||
27 | + // and it is held within FontFaceCreationParams. | ||
28 | + static const bool kEmptyValueIsZero = false; | ||
29 | }; | ||
30 | |||
31 | } // namespace blink | ||
32 | diff --git a/third_party/blink/renderer/platform/wtf/linked_hash_set.h b/third_party/blink/renderer/platform/wtf/linked_hash_set.h | ||
33 | index b35b6e9..77e524c 100644 | ||
34 | --- ./third_party/blink/renderer/platform/wtf/linked_hash_set.h | ||
35 | +++ ./third_party/blink/renderer/platform/wtf/linked_hash_set.h | ||
36 | @@ -146,6 +146,11 @@ | ||
37 | LinkedHashSetNodeBase* next) | ||
38 | : LinkedHashSetNodeBase(prev, next), value_(value) {} | ||
39 | |||
40 | + LinkedHashSetNode(ValueArg&& value, | ||
41 | + LinkedHashSetNodeBase* prev, | ||
42 | + LinkedHashSetNodeBase* next) | ||
43 | + : LinkedHashSetNodeBase(prev, next), value_(std::move(value)) {} | ||
44 | + | ||
45 | LinkedHashSetNode(LinkedHashSetNode&& other) | ||
46 | : LinkedHashSetNodeBase(std::move(other)), | ||
47 | value_(std::move(other.value_)) {} | ||
48 | @@ -445,10 +450,13 @@ | ||
49 | |||
50 | // The slot is empty when the next_ field is zero so it's safe to zero | ||
51 | // the backing. | ||
52 | - static const bool kEmptyValueIsZero = true; | ||
53 | + static const bool kEmptyValueIsZero = ValueTraits::kEmptyValueIsZero; | ||
54 | |||
55 | static const bool kHasIsEmptyValueFunction = true; | ||
56 | static bool IsEmptyValue(const Node& node) { return !node.next_; } | ||
57 | + static Node EmptyValue() { | ||
58 | + return Node(ValueTraits::EmptyValue(), nullptr, nullptr); | ||
59 | + } | ||
60 | |||
61 | static const int kDeletedValue = -1; | ||
62 | |||
63 | diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc b/third_party/blink/renderer/platform/wtf/list_hash_set_test.cc | ||
64 | index 4c3f899..cd1be00 100644 | ||
65 | --- ./third_party/blink/renderer/platform/wtf/list_hash_set_test.cc | ||
66 | +++ ./third_party/blink/renderer/platform/wtf/list_hash_set_test.cc | ||
67 | @@ -487,6 +487,7 @@ | ||
68 | }; | ||
69 | |||
70 | struct Complicated { | ||
71 | + Complicated() : Complicated(0) {} | ||
72 | Complicated(int value) : simple_(value) { objects_constructed_++; } | ||
73 | |||
74 | Complicated(const Complicated& other) : simple_(other.simple_) { | ||
75 | @@ -495,9 +496,6 @@ | ||
76 | |||
77 | Simple simple_; | ||
78 | static int objects_constructed_; | ||
79 | - | ||
80 | - private: | ||
81 | - Complicated() = delete; | ||
82 | }; | ||
83 | |||
84 | int Complicated::objects_constructed_ = 0; | ||
85 | @@ -731,4 +729,45 @@ | ||
86 | |||
87 | } // anonymous namespace | ||
88 | |||
89 | +// A unit type which objects to its state being initialized wrong. | ||
90 | +struct InvalidZeroValue { | ||
91 | + InvalidZeroValue() = default; | ||
92 | + InvalidZeroValue(WTF::HashTableDeletedValueType) : deleted_(true) {} | ||
93 | + ~InvalidZeroValue() { CHECK(ok_); } | ||
94 | + bool IsHashTableDeletedValue() const { return deleted_; } | ||
95 | + | ||
96 | + bool ok_ = true; | ||
97 | + bool deleted_ = false; | ||
98 | +}; | ||
99 | + | ||
100 | +template <> | ||
101 | +struct HashTraits<InvalidZeroValue> : SimpleClassHashTraits<InvalidZeroValue> { | ||
102 | + static const bool kEmptyValueIsZero = false; | ||
103 | +}; | ||
104 | + | ||
105 | +template <> | ||
106 | +struct DefaultHash<InvalidZeroValue> { | ||
107 | + struct Hash { | ||
108 | + static unsigned GetHash(const InvalidZeroValue&) { return 0; } | ||
109 | + static bool Equal(const InvalidZeroValue&, const InvalidZeroValue&) { | ||
110 | + return true; | ||
111 | + } | ||
112 | + }; | ||
113 | +}; | ||
114 | + | ||
115 | +template <typename Set> | ||
116 | +class ListOrLinkedHashSetInvalidZeroTest : public testing::Test {}; | ||
117 | + | ||
118 | +using InvalidZeroValueSetTypes = | ||
119 | + testing::Types<ListHashSet<InvalidZeroValue>, | ||
120 | + ListHashSet<InvalidZeroValue, 1>, | ||
121 | + LinkedHashSet<InvalidZeroValue>>; | ||
122 | +TYPED_TEST_SUITE(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValueSetTypes); | ||
123 | + | ||
124 | +TYPED_TEST(ListOrLinkedHashSetInvalidZeroTest, InvalidZeroValue) { | ||
125 | + using Set = TypeParam; | ||
126 | + Set set; | ||
127 | + set.insert(InvalidZeroValue()); | ||
128 | +} | ||
129 | + | ||
130 | } // namespace WTF | ||
diff --git a/community/chromium/chromium-gcc-r1.patch b/community/chromium/chromium-gcc-r1.patch deleted file mode 100644 index 6979b11451..0000000000 --- a/community/chromium/chromium-gcc-r1.patch +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h | ||
2 | index 99f230ce7e9a..de2415d402f5 100644 | ||
3 | --- base/numerics/safe_math_shared_impl.h | ||
4 | +++ base/numerics/safe_math_shared_impl.h | ||
5 | @@ -21,8 +21,7 @@ | ||
6 | #if !defined(__native_client__) && \ | ||
7 | ((defined(__clang__) && \ | ||
8 | ((__clang_major__ > 3) || \ | ||
9 | - (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ | ||
10 | - (defined(__GNUC__) && __GNUC__ >= 5)) | ||
11 | + (__clang_major__ == 3 && __clang_minor__ >= 4)))) | ||
12 | #include "base/numerics/safe_math_clang_gcc_impl.h" | ||
13 | #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) | ||
14 | #else | ||
diff --git a/community/chromium/musl-sandbox.patch b/community/chromium/musl-sandbox.patch index 5a7239fd9e..f485f6cc75 100644 --- a/community/chromium/musl-sandbox.patch +++ b/community/chromium/musl-sandbox.patch | |||
@@ -38,10 +38,10 @@ index 348ab6e..4550f9e 100644 | |||
38 | .ElseIf(is_fork_or_clone_vfork, Error(EPERM)) | 38 | .ElseIf(is_fork_or_clone_vfork, Error(EPERM)) |
39 | .Else(CrashSIGSYSClone()); | 39 | .Else(CrashSIGSYSClone()); |
40 | } | 40 | } |
41 | diff --git sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc | 41 | diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc |
42 | index 7dbcc87..782be78 100644 | 42 | index 7dbcc87..589262f 100644 |
43 | --- sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc | 43 | --- ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc |
44 | +++ sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc | 44 | +++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc |
45 | @@ -391,6 +391,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { | 45 | @@ -391,6 +391,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { |
46 | #if defined(__i386__) | 46 | #if defined(__i386__) |
47 | case __NR_waitpid: | 47 | case __NR_waitpid: |
@@ -75,10 +75,10 @@ index 7dbcc87..782be78 100644 | |||
75 | case __NR_msync: | 75 | case __NR_msync: |
76 | case __NR_munlockall: | 76 | case __NR_munlockall: |
77 | case __NR_readahead: | 77 | case __NR_readahead: |
78 | diff --git sandbox/linux/system_headers/arm64_linux_syscalls.h sandbox/linux/system_headers/arm64_linux_syscalls.h | 78 | diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h b/sandbox/linux/system_headers/arm64_linux_syscalls.h |
79 | index 59d0eab..7ae7002 100644 | 79 | index 59d0eab..7ae7002 100644 |
80 | --- sandbox/linux/system_headers/arm64_linux_syscalls.h | 80 | --- ./sandbox/linux/system_headers/arm64_linux_syscalls.h |
81 | +++ sandbox/linux/system_headers/arm64_linux_syscalls.h | 81 | +++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h |
82 | @@ -1063,4 +1063,8 @@ | 82 | @@ -1063,4 +1063,8 @@ |
83 | #define __NR_memfd_create 279 | 83 | #define __NR_memfd_create 279 |
84 | #endif | 84 | #endif |
@@ -88,10 +88,10 @@ index 59d0eab..7ae7002 100644 | |||
88 | +#endif | 88 | +#endif |
89 | + | 89 | + |
90 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_ | 90 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_ |
91 | diff --git sandbox/linux/system_headers/arm_linux_syscalls.h sandbox/linux/system_headers/arm_linux_syscalls.h | 91 | diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h b/sandbox/linux/system_headers/arm_linux_syscalls.h |
92 | index 1addd53..7843b5e 100644 | 92 | index 1addd53..7843b5e 100644 |
93 | --- sandbox/linux/system_headers/arm_linux_syscalls.h | 93 | --- ./sandbox/linux/system_headers/arm_linux_syscalls.h |
94 | +++ sandbox/linux/system_headers/arm_linux_syscalls.h | 94 | +++ ./sandbox/linux/system_headers/arm_linux_syscalls.h |
95 | @@ -1385,6 +1385,10 @@ | 95 | @@ -1385,6 +1385,10 @@ |
96 | #define __NR_memfd_create (__NR_SYSCALL_BASE+385) | 96 | #define __NR_memfd_create (__NR_SYSCALL_BASE+385) |
97 | #endif | 97 | #endif |
@@ -103,10 +103,10 @@ index 1addd53..7843b5e 100644 | |||
103 | // ARM private syscalls. | 103 | // ARM private syscalls. |
104 | #if !defined(__ARM_NR_BASE) | 104 | #if !defined(__ARM_NR_BASE) |
105 | #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) | 105 | #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) |
106 | diff --git sandbox/linux/system_headers/mips64_linux_syscalls.h sandbox/linux/system_headers/mips64_linux_syscalls.h | 106 | diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h b/sandbox/linux/system_headers/mips64_linux_syscalls.h |
107 | index ec75815..612fcfa 100644 | 107 | index ec75815..612fcfa 100644 |
108 | --- sandbox/linux/system_headers/mips64_linux_syscalls.h | 108 | --- ./sandbox/linux/system_headers/mips64_linux_syscalls.h |
109 | +++ sandbox/linux/system_headers/mips64_linux_syscalls.h | 109 | +++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h |
110 | @@ -1271,4 +1271,8 @@ | 110 | @@ -1271,4 +1271,8 @@ |
111 | #define __NR_memfd_create (__NR_Linux + 314) | 111 | #define __NR_memfd_create (__NR_Linux + 314) |
112 | #endif | 112 | #endif |
@@ -116,10 +116,10 @@ index ec75815..612fcfa 100644 | |||
116 | +#endif | 116 | +#endif |
117 | + | 117 | + |
118 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_ | 118 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_ |
119 | diff --git sandbox/linux/system_headers/mips_linux_syscalls.h sandbox/linux/system_headers/mips_linux_syscalls.h | 119 | diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h b/sandbox/linux/system_headers/mips_linux_syscalls.h |
120 | index ddbf97f..1742acd 100644 | 120 | index ddbf97f..1742acd 100644 |
121 | --- sandbox/linux/system_headers/mips_linux_syscalls.h | 121 | --- ./sandbox/linux/system_headers/mips_linux_syscalls.h |
122 | +++ sandbox/linux/system_headers/mips_linux_syscalls.h | 122 | +++ ./sandbox/linux/system_headers/mips_linux_syscalls.h |
123 | @@ -1433,4 +1433,8 @@ | 123 | @@ -1433,4 +1433,8 @@ |
124 | #define __NR_memfd_create (__NR_Linux + 354) | 124 | #define __NR_memfd_create (__NR_Linux + 354) |
125 | #endif | 125 | #endif |
@@ -129,10 +129,10 @@ index ddbf97f..1742acd 100644 | |||
129 | +#endif | 129 | +#endif |
130 | + | 130 | + |
131 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_ | 131 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_ |
132 | diff --git sandbox/linux/system_headers/x86_32_linux_syscalls.h sandbox/linux/system_headers/x86_32_linux_syscalls.h | 132 | diff --git a/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/sandbox/linux/system_headers/x86_32_linux_syscalls.h |
133 | index a6afc62..7ed0a3b 100644 | 133 | index a6afc62..7ed0a3b 100644 |
134 | --- sandbox/linux/system_headers/x86_32_linux_syscalls.h | 134 | --- ./sandbox/linux/system_headers/x86_32_linux_syscalls.h |
135 | +++ sandbox/linux/system_headers/x86_32_linux_syscalls.h | 135 | +++ ./sandbox/linux/system_headers/x86_32_linux_syscalls.h |
136 | @@ -1422,5 +1422,9 @@ | 136 | @@ -1422,5 +1422,9 @@ |
137 | #define __NR_memfd_create 356 | 137 | #define __NR_memfd_create 356 |
138 | #endif | 138 | #endif |
@@ -143,10 +143,10 @@ index a6afc62..7ed0a3b 100644 | |||
143 | + | 143 | + |
144 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ | 144 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ |
145 | 145 | ||
146 | diff --git sandbox/linux/system_headers/x86_64_linux_syscalls.h sandbox/linux/system_headers/x86_64_linux_syscalls.h | 146 | diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/sandbox/linux/system_headers/x86_64_linux_syscalls.h |
147 | index 349504a..ea3c7c9 100644 | 147 | index 349504a..ea3c7c9 100644 |
148 | --- sandbox/linux/system_headers/x86_64_linux_syscalls.h | 148 | --- ./sandbox/linux/system_headers/x86_64_linux_syscalls.h |
149 | +++ sandbox/linux/system_headers/x86_64_linux_syscalls.h | 149 | +++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h |
150 | @@ -1290,5 +1290,9 @@ | 150 | @@ -1290,5 +1290,9 @@ |
151 | #define __NR_memfd_create 319 | 151 | #define __NR_memfd_create 319 |
152 | #endif | 152 | #endif |
@@ -157,3 +157,20 @@ index 349504a..ea3c7c9 100644 | |||
157 | + | 157 | + |
158 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ | 158 | #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ |
159 | 159 | ||
160 | diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc b/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc | ||
161 | index 017f13c..50aeec3 100644 | ||
162 | --- ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc | ||
163 | +++ ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc | ||
164 | @@ -88,10 +88,10 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const { | ||
165 | case __NR_sysinfo: | ||
166 | case __NR_times: | ||
167 | case __NR_uname: | ||
168 | - return Allow(); | ||
169 | - case __NR_sched_getaffinity: | ||
170 | case __NR_sched_getparam: | ||
171 | case __NR_sched_getscheduler: | ||
172 | + return Allow(); | ||
173 | + case __NR_sched_getaffinity: | ||
174 | case __NR_sched_setscheduler: | ||
175 | return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno); | ||
176 | case __NR_prlimit64: | ||
diff --git a/community/chromium/one_euro_filter-build-fix.patch b/community/chromium/one_euro_filter-build-fix.patch new file mode 100644 index 0000000000..827358ed57 --- /dev/null +++ b/community/chromium/one_euro_filter-build-fix.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | diff --git a/third_party/one_euro_filter/src/one_euro_filter.h b/third_party/one_euro_filter/src/one_euro_filter.h | ||
2 | index 7f8d15b..a8cd0ab 100644 | ||
3 | --- ./third_party/one_euro_filter/src/one_euro_filter.h | ||
4 | +++ ./third_party/one_euro_filter/src/one_euro_filter.h | ||
5 | @@ -1,6 +1,8 @@ | ||
6 | #ifndef ONE_EURO_ONE_EURO_FILTER_H_ | ||
7 | #define ONE_EURO_ONE_EURO_FILTER_H_ | ||
8 | |||
9 | +#include <memory> | ||
10 | + | ||
11 | #include "low_pass_filter.h" | ||
12 | |||
13 | namespace one_euro_filter { | ||