diff options
Diffstat (limited to 'www-client/chromium')
16 files changed, 388 insertions, 1247 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index d0fd3219472b..1a26278fb277 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,12 +1,6 @@ AUX chromium-77-system-icu.patch 649 BLAKE2B 7910fcb64460ef965eafdd05e98d41d14399fd337ac8f79bcb2c7059fccd61d552ab6efa1dbf8bdcce564716b3d12b41a587077034cb72ef610eff76f4e052d6 SHA512 7413e0cca7102008dd5bee443dcde90be69ef1d0973fee576f70544f0d0a66aa8bc7099e619c89160915d6cd6186384be46ffab4a1d747000133dda9a84e15e5 AUX chromium-78-protobuf-export.patch 694 BLAKE2B 3fffcb6a7289bac848b89275a9f76e4302042362fa9bcf2689df01e0a00806c7e838210fa8696ee8e2134127ec4cfb5c3b632e2739c225f8e9586e01de7035ce SHA512 e3a80775d958740eedc7c3df0e9dd12b0e6a51ccf871a2085ab77246814e748428133d27c60322a102eb8f50bb65fc2c607e0d2665a92393be55befcbf566ab0 AUX chromium-79-gcc-alignas.patch 3039 BLAKE2B 46f9d31944cf27479e3a7f33df5a0b37f11a7a761fa0a413bbbb3195de0fe62e33531f78155de5afefc9de4c051347328b61a3701380d8f8ae8895ca468efc94 SHA512 98f0d1f24acdb7572445210b3d29147e72dee06bc7c09e30320ed17926d70be0f68905682aef8f026481f71b6a98d0c5d6bf4dad87e9517e1a2ca5bd758e87c4 -AUX chromium-79-gcc-ambiguous-nodestructor.patch 1472 BLAKE2B 7222056fa1cbde82e855d3025e7421e75a9605f663216dd56eda49450604b51aa2174e89831edc16e2ec6844e24f5d8960619df2dfefd2f4e7c6a06fdaf4e1f3 SHA512 0bbd97f00d695b39d31c73d9c7b99e4bcb850361d0089520febb7341a1986ad23b4a39a58b4db9ea46223cd6469e4bfdc40f0465f4348fd1c7c045158e2569e3 -AUX chromium-79-gcc-name-clash.patch 6067 BLAKE2B 699196b56a16023635ae16dfc6a65c29c3f6eb6c637e10701e9dedca3efc12170b424f7b460fa634c8eba117bcbf7c7a006df293d9808e85ee1746315f3e1b04 SHA512 470772be050bae777ef16f3a8cf91392646b96307dfd83e7a7a48f57ebd229ff83aa1dab94cf1013d7e74f427e270f981c6f3ff274a52f139c872c1924b12661 -AUX chromium-79-gcc-permissive.patch 3014 BLAKE2B 4b717bd5741e72b9fd0a6dc800abfad65551d540cc95b3c224ac890533aa61dcb194a3117f8e519e546a2e991c6b12b324e5e79b54d5a0daeecdf02138432633 SHA512 8f77343c6dcb19961fa9db3c7672eae08d5e15961bfead1d9504de4cb07a600c4dd03dae73522219a50f0e03171d074fcde715da27a00e0141e40ee0addb8ca1 -AUX chromium-79-icu-65.patch 573 BLAKE2B b716eeb78ac2fe7d32328274b8ea4f79cbc858700de0cb256fddaff35e4c593ddaec3e96469fe371399db112015ffbbbb6fe91fcbf151ca1e412a4104a0ea5f9 SHA512 2503799bd638e2cd521c04b5104081d332177e68c3c22a66a4c8930a6ff0da250893ac9aa5eb30f1a97faf78a2d33b552d69d4393c1f6278ab63e3609edf338d -AUX chromium-79-include.patch 5476 BLAKE2B 3c5ba004d51f48c3e07f9b7663b79a2573dd3b6beed3e30a7222c10c77e9f0be2b0d57b8b871657aea73d2dec2a394d37f770802414a3861f1bb4b9447905f6a SHA512 59c35e86720786e24e999c32064343220fbb40a4f8dc517b83aeef0cbc0f29042c4ff2ef99db5589eadff6743fb5fa55e5d0128c6490bbfa725e52071398b8c9 -AUX chromium-79-system-hb.patch 643 BLAKE2B 82cf0464a338034e6aae27d842d5571f2d2356c6a967186e992f6487ad9f45355166957444f70d1b1451d4f05a9572a48437c5d2352a6e473329b5dc6cc18d40 SHA512 7b19a7740a12823b4aef1ab60d7e06ca77edaf34af42e9ac2b029b5560c496f6c87dbaf11fa59b950f80b836a9bd97424c8e38d2d26101b4ac9f26befa062038 AUX chromium-80-gcc-abstract.patch 3165 BLAKE2B 76142cb97cf4ea4b98275de59eabaa673fe54a355744777f7c2859bd04014be80dc5fa2f4d753f1a6185fd4cc8a9709b38ce55b5fcf139c097489e05712a7f1c SHA512 803dfa4fbf1c9a5f04efed57955c8e5694e368e655fafd7b3ad3d161927db6ce026360c27547476580756ff86b1a634607b6e841465a84daf68eb4f7ba7eeba7 AUX chromium-80-gcc-blink.patch 3288 BLAKE2B c31a35f083945358accdbe97a0c101627413cef1f2c420275a6f87078404e4cd070b52d2ff3466e97859285f19549337251d285280e944becd86e12142310895 SHA512 ed4f507c15a9ebd324f9efbbb1aad042c953e6dbe2b7a129f4e003bb399b6a8c3f61ed5ceb4685329fd9b826c738efd92d86795e21ba6d000e9031ea65558c68 AUX chromium-80-gcc-incomplete-type.patch 11677 BLAKE2B f0fdec52f628c491acfed9e87c4e542dab90f313cd9526c44ad422deae3ed1b25637aad78c21bda5753aaafe9bcebb5053734c8c664e59e091fb8e5f0c46c790 SHA512 121404b5a07ab066689694d4158fd34d6ee3a4c351c84a0792c01493653f40fea8f51b20ff215475bb45b0e229cc2e53b73d244df59ea716a8b051ac28984b10 @@ -14,20 +8,19 @@ AUX chromium-80-gcc-permissive.patch 1990 BLAKE2B 2aab6ec5beb470a220d53592f6e86b AUX chromium-80-gcc-quiche.patch 1351 BLAKE2B 7bd967a9f3cd544368c623d3612632cd2bade48ac2c099c4570d5ead62ba28487e1fa222ee0bfe108f3d4f853744d799d2860f703eae3b7d6d36af77cd328508 SHA512 2f147e77d0737370c5dea8b575c0e631476bbce54a7b1c46d0bffeb56706d6ab695b8a9a7e61402430c57ec1f28668dd6682aa5d32d32762fc3ba1735f37542b AUX chromium-80-include.patch 1495 BLAKE2B a5ed4a0df55a24498b3e88c191ecf8f87873b6a8d826f5daa6df3234593d5996257d31c5ce116b078990010633e8e8bbac0e66027329afea3355959d8fae3fa8 SHA512 c73c7af2612b80b110e10fe887cab442aebc1e23bc87cc5819384be9aa0283475fb957e3fd637d6b890411adde38c8206b1f1d998127938808c307bee0636e94 AUX chromium-80-unbundle-libxml.patch 2990 BLAKE2B 63068fef2333d9d111bfe66a78efd71088c76b08b4e5014b244012df682024ceb0db8441254481189fc449f16cbeab7f650c8cab30f9d37dedf89c2dbea1bae9 SHA512 87ef07a35a103c5b4293301705a09a60199d569fceeab1e3188c7b96067d39f237441209f4448a791dc5675321f609ee5c02fdda1081af38e50adcd15de4e0b6 -AUX chromium-81-clang.patch 692 BLAKE2B da65ab208f0afc82a6fb2e1061cffc700bfef25f0821b34b1d50e7be3f573f2bd629850e74e26a1b1f5ee7bb037d4b9caaef083b07d68bf0d3dd88770db577ed SHA512 ee006e4a8c98576ecfba0b2b76927d1b559d56da19539b3d4f0b630eba64a22a1d9c158724b5b4437cf4bd432f113de7308ab402a5c286a5899a2b1928a78fbe +AUX chromium-81-fix-browser-frame.patch 1608 BLAKE2B a335b95e1a96c05743edbdae8bf46a3ca16855445ff0901f58c67169c305152f98ce023dcb7588b3e2e41b789e635bb14c704d3871ca3be2e42384ce25554420 SHA512 34921dc146d9a09dcde629cca634eb2104084d1a1e56b20430603fea2f73f3f37e4e74a5558414581cde955df2465b8dc64c1bba5be02fc3e6ddc0a0b87d073c +AUX chromium-81-gcc-constexpr.patch 717 BLAKE2B 22a13605d2680456614e7ef53fff585b731e21b3504fc8cc5a06d87bf4edba2580a756b878069eefc4cbbc928f1c32e38b808fcb4bb36588bf81ed63d816b0df SHA512 b94847dd15f32b8b2c400eee2b461dd532b0fca8429417b648ed41270175ea7aadbc8a839ddc29c9bac8ff0d52575a696e2cb7f769b34d1ab211e97b29600107 AUX chromium-81-gcc-noexcept.patch 804 BLAKE2B fde20835e046808b3066b53d57ba754752a1594aef3a153f28c2831721edd832295edb32daa41d27944e48e0bdc4b649b4de5bd6a97d6791be5b5d8a73b77476 SHA512 5708156098e80dd439514273315eeab39fc24938e92b5887a6bb69cd93613ec6814c66a2f24b88f85a83436c2f2a8fca445a368cbf2658cba7d74001ddc30e5b -AUX chromium-81-gcc-template.patch 1126 BLAKE2B 41f04c54bd9eb7dbc9c995beeac3c485990ccff950867d19171cc2c79bf29f2e9b27aad41dbbd62592113ab446e74d6389995972b92feb8ab742a662dc55ed38 SHA512 2c2e4cb57fc2d3eb67cc864f2aaabaad5861c4433a5d99a9b41a8bc4e2790bf8736b251f18dba9844dbe83180a117a0861fc5c826457472a0956dc8e8746432b +AUX chromium-81-mojom.patch 11222 BLAKE2B c3338167ca8713e4f41b7b4e22894ad3898442babcfaeccf5cc35d4e847beb2a1e18bd08c3f682dcbd2b6f4942916d93d05669d8f7fefab739c501c8f9d217ac SHA512 04102fba583e21631252f71b18365428cc875883841bdd8ae9b9cdfd502ac4c5bc909eddeacf82a2b9425187d7ace62c6cae7d683dfee1a54ec11e2cd6c7f789 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca AUX chromium-compiler-r10.patch 5917 BLAKE2B a16ea6a1eee56a7de06f82e161536dab19a507f675fe8268b5a455bf36b9f5e6c1df02de73b303ab61e33153f06f118e22623d01f654d4a7c88ca8c3f8326401 SHA512 e64f9f75e685868cb8da8851e84362952a18e5dbca674c853a41feb582bdd4dc59219727f2c77440ec2030e21d7b436f144c552c30b2a4960cbe0da32c6f6c5e -AUX chromium-compiler-r11.patch 6374 BLAKE2B fcb5f785305ba5638b0540d67a18f5f6a3be71a1dd9102b164722e673bb32c92fed67a79dc42577a6c0267795dbbfa1347d4a41c9d58a6d09d4abbe3d1e97993 SHA512 2f11bdde45e08f4a88d4c893df64f6cc0284f34a9095059d45733c6109a14262973f5b74702da5869f45f3385dc6df1f7c3504cf0cd8fed56348ee4e80035658 +AUX chromium-compiler-r11.patch 5942 BLAKE2B 199efeda0e70377193fe5209f580eab6caca6bec1dc0b06fdbca0ecbb70101f6ac8187c26afa4b00bc9116aa8a85e50fbbf8e3a5461a1d6c8d74edb4a4b0a3b3 SHA512 f9080a90d064d72d375ab78250e1f0147856641953adefe09b1dee8771b464b102d6ad02ef7be384d55b0953b9a861fb41973966ad564858a71d85811f5a783f AUX chromium-fix-char_traits.patch 355 BLAKE2B 5269c43c4d36dc1cd190aedc04e3172fbef0048484ac7e4db15fffd69009c8ba02f0ed786c64b292fbbcd2409ad70545817cd7d45a2cb51fd76bf72250ca0018 SHA512 85ab70f168f56c01e01bdf210d107bebd7c344e95dcb692a19a0f7883ed6aec5325b38c35cd3c9b37c1915820d5e8d401e8ee92c289436fb8bc8341c3c6007a8 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d AUX chromium-unbundle-zlib-r1.patch 515 BLAKE2B f3263f7450a940449d7edc0aef46a888248e0245a71797435a985fda8ef3c1abb8823a5a363cff1db0e2d09715942322e5d5ae9ab3554a5a3aeb2db748102a97 SHA512 89d62431e11cf8f3b48afdf9a133a8532916d445676de12acb48b0aaca3aa45106e25de399e7ee37a6220b0766c0ea65f10da219d4bb9a7a02275b4364e493ad AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 -DIST chromium-79.0.3945.130.tar.xz 778319112 BLAKE2B ac6d7c08c34afc4de8383964f76a5eabc9209de185535a27eff2d6934a77d01fd6b07d5c5afb16e9dd936b2650da76d460e8a485ab16f8300144c7de9b3be2bb SHA512 4b5d4769b068f20b8028085a148cbaf31311eeffad0a22c5c0909af273a8e57e077b33cc93331bbeff9165477262eed2e345b2224ac4f76d8bdb79f983596a81 DIST chromium-80.0.3987.87.tar.xz 801310184 BLAKE2B d051f77b0e6f167632e383e23983531ee1f44f1fce1629f482cf42882c294816bd98c51ad043b5258aa9652a8da14edf278f70fc63f6978c9dfececa547a1fca SHA512 69aebd760d9b8f2c5f4d15a3a144cd4292ffb11b1536af3596f907e730ac64e909d739bb6e9d322a8f56fac75e4f0b2b5c4c36c4fe4bb52147276b5b0dd03620 -DIST chromium-81.0.4040.5.tar.xz 828003840 BLAKE2B 81b3d4b15d5cdc99bcb19ab3745e49b402f00d68a557f58fa3ae0e6b584c28473dba5ca8622373721e54c64760adbf7cb9daae93c1b29336e7f9fc3a387b199f SHA512 47928d6fc022dc0d8b51562c8079baf25aad098f93c52dd4d07d70fa6d9c4b56b4920e163ff3b44d328e741184d5af327394fa56aa36c54509406f2d67e525ed -EBUILD chromium-79.0.3945.130.ebuild 22703 BLAKE2B c69e08a9bfdd3ec572888a740198cf3a810fa772c024cc42532cfa21ee578d9e28d7bf60b6b092b658663e432cdf355564a57594f50b02f33b8c0398252edccc SHA512 a94ba1b8cff2712134d77f502b9ae33f6125a899e8a894b0bf4141c68f6d12b8ae9cefad38d5056b688079052f021d3a1b71bec6cf89f8eb97ef38ff13d74965 -EBUILD chromium-80.0.3987.87.ebuild 22679 BLAKE2B 8116d9f192a02cb2bb5ed38f5426844144f2426402b3c7cab4a33533c4599815c2a932c20a74b908c674e8c502f7fa26d3d624dc22e92afc7bd4c6787b3604e1 SHA512 60581ba0b19c2ba8f6ea3ca54492cec1372b8f1f6d46ac142c2e9d3eff0ea0fc81db6c04a747eaa3c6427a7a3887db27e641cac6eb69884f65a6af0221ae78dc -EBUILD chromium-81.0.4040.5.ebuild 22851 BLAKE2B a91a6e251ba432035095980064491632711015501a529d408dd2f2a8d4013c43c92b376858e5dbc5660acb6169ecebb084d67e2511c3b944371fcea3c899f66d SHA512 ed110cea36147c1ce49092b299833b88848d70cb945b76631868e7e5e5113cf726b23d9b077ade2727d1f73c07126489b2c2a494415018d48760f49c75ecc107 +DIST chromium-81.0.4044.9.tar.xz 791346280 BLAKE2B 790a8537a7a2a9cc6c209afb570580cc05a8f85bd0f61c4d8c13765f8d776962833468390b5685caac3d3590be1d602298e79961beded8b0b4a2b5b5ab1dcbc7 SHA512 e9fb98a66cea6b65e25dda55cceb687a3697e3810b32c1f5ddfc8341e3289b9077056898984ea07b4cdbe33f2e651a197cb57fa89d484ad728672282e43ca48f +EBUILD chromium-80.0.3987.87.ebuild 22678 BLAKE2B 7d79aa727a138908ed29fb5807c81436e890140a8984ba4a28837ccaf6e9eec6d3a0bf5d9c6831b46b57ab0e354168963963815d1a7b16fb409f1c0cd2131d5e SHA512 9c00e99b7d2d139eeddccdbfc88a2f86b09b3562d0877e10d851c40096825ef0d03f63285e6d1780317ebc649257273fcb807a58d11a550484f36f8c22e3c8ab +EBUILD chromium-81.0.4044.9.ebuild 22833 BLAKE2B cf146dc33a2393e72134155a7379c1e208f85a773ed4afe4de4e8a14661620897e2c166bd298465a00321a19e557806c1ab936e68656250d15ccc3fc2c47bdde SHA512 1bb6ab5cb9b4bb266d7a8729fd12bb04600a5338c44c9f3f0d65549a226be9da525adb320abcb48dee583a494e5d4d8550a5cfa7eaf4d0d1a63d80e0ca56ef3c MISC metadata.xml 1456 BLAKE2B cf9ade50335e564cd481d2a9da288ee97d9fe086a948f3226459acc918e9b25d1f61e8384cb4300f9ae253cdd1ea250cdd308784e7cf8fff4b443193e84906d5 SHA512 b0abba4bb13d33ca955db05411a135a66389099ee623c84dcc2ba6f4cd7fe222d5976adbf297767f4bd1e311b765c4500bf43713e5e6daaf0ef45d4fe8894ca7 diff --git a/www-client/chromium/chromium-79.0.3945.130.ebuild b/www-client/chromium/chromium-79.0.3945.130.ebuild deleted file mode 100644 index 76a0f4f0682a..000000000000 --- a/www-client/chromium/chromium-79.0.3945.130.ebuild +++ /dev/null @@ -1,736 +0,0 @@ -# Copyright 2009-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python2_7 ) - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr - sv sw ta te th tr uk vi zh-CN zh-TW" - -inherit check-reqs chromium-2 desktop flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs xdg-utils - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" -REQUIRED_USE="component-build? ( !suid )" - -COMMON_DEPEND=" - >=app-accessibility/at-spi2-atk-2.26:2 - app-arch/bzip2:= - cups? ( >=net-print/cups-1.3.11:= ) - >=dev-libs/atk-2.26 - dev-libs/expat:= - dev-libs/glib:2 - system-icu? ( >=dev-libs/icu-65:= ) - >=dev-libs/libxml2-2.9.4-r3:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.26:= - >=dev-libs/re2-0.2016.11.01:= - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/fontconfig:= - media-libs/freetype:= - >=media-libs/harfbuzz-2.4.0:0=[icu(-)] - media-libs/libjpeg-turbo:= - media-libs/libpng:= - system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) - >=media-libs/openh264-1.6.0:= - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( - >=media-video/ffmpeg-4:= - || ( - media-video/ffmpeg[-samba] - >=net-fs/samba-4.5.10-r1[-debug(-)] - ) - !=net-fs/samba-4.5.12-r0 - media-libs/opus:= - ) - sys-apps/dbus:= - sys-apps/pciutils:= - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3[X] - x11-libs/libX11:= - x11-libs/libXcomposite:= - x11-libs/libXcursor:= - x11-libs/libXdamage:= - x11-libs/libXext:= - x11-libs/libXfixes:= - >=x11-libs/libXi-1.6.0:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - app-arch/snappy:= - media-libs/flac:= - >=media-libs/libwebp-0.4.0:= - sys-libs/zlib:=[minizip] - kerberos? ( virtual/krb5 ) -" -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND="${COMMON_DEPEND} - !<www-plugins/chrome-binary-plugins-57 - x11-misc/xdg-utils - virtual/opengl - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) -" -DEPEND="${COMMON_DEPEND} -" -# dev-vcs/git - https://bugs.gentoo.org/593476 -BDEPEND=" - ${PYTHON_DEPS} - >=app-arch/gzip-1.7 - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - dev-util/gn - dev-vcs/git - >=dev-util/gperf-3.0.3 - >=dev-util/ninja-1.7.2 - >=net-libs/nodejs-7.6.0[inspector] - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - closure-compile? ( virtual/jre ) - virtual/pkgconfig -" - -: ${CHROMIUM_FORCE_CLANG=no} - -if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then - BDEPEND+=" >=sys-devel/clang-7" -fi - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Some web pages may require additional fonts to display properly. -Try installing some of the following packages if some characters -are not displayed properly: -- media-fonts/arphicfonts -- media-fonts/droid -- media-fonts/ipamonafont -- media-fonts/noto -- media-fonts/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -To fix broken icons on the Downloads page, you should install an icon -theme that covers the appropriate MIME types, and configure this as your -GTK+ icon theme. - -For native file dialogs in KDE, install kde-apps/kdialog. -" - -PATCHES=( - "${FILESDIR}/chromium-compiler-r10.patch" - "${FILESDIR}/chromium-fix-char_traits.patch" - "${FILESDIR}/chromium-unbundle-zlib-r1.patch" - "${FILESDIR}/chromium-77-system-icu.patch" - "${FILESDIR}/chromium-78-protobuf-export.patch" - "${FILESDIR}/chromium-79-system-hb.patch" - "${FILESDIR}/chromium-79-include.patch" - "${FILESDIR}/chromium-79-icu-65.patch" - "${FILESDIR}/chromium-79-gcc-ambiguous-nodestructor.patch" - "${FILESDIR}/chromium-79-gcc-name-clash.patch" - "${FILESDIR}/chromium-79-gcc-permissive.patch" - "${FILESDIR}/chromium-79-gcc-alignas.patch" -) - -pre_build_checks() { - if [[ ${MERGE_TYPE} != binary ]]; then - local -x CPP="$(tc-getCXX) -E" - if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 8.0; then - die "At least gcc 8.0 is required" - fi - # component build hangs with tcmalloc enabled due to sandbox issue, bug #695976. - if has usersandbox ${FEATURES} && use tcmalloc && use component-build; then - die "Component build with tcmalloc requires FEATURES=-usersandbox." - fi - fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - CHECKREQS_DISK_BUILD="7G" - if ( shopt -s extglob; is-flagq '-g?(gdb)?([1-9])' ); then - CHECKREQS_DISK_BUILD="25G" - if ! use component-build; then - CHECKREQS_MEMORY="16G" - fi - fi - check-reqs_pkg_setup -} - -pkg_pretend() { - pre_build_checks -} - -pkg_setup() { - pre_build_checks - - chromium_suid_sandbox_check_kernel_config -} - -src_prepare() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - default - - mkdir -p third_party/node/linux/node-linux-x64/bin || die - ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die - - local keeplibs=( - base/third_party/cityhash - base/third_party/double_conversion - base/third_party/dynamic_annotations - base/third_party/icu - base/third_party/nspr - base/third_party/superfasthash - base/third_party/symbolize - base/third_party/valgrind - base/third_party/xdg_mime - base/third_party/xdg_user_dirs - buildtools/third_party/libc++ - buildtools/third_party/libc++abi - chrome/third_party/mozilla_security_manager - courgette/third_party - net/third_party/mozilla_security_manager - net/third_party/nss - net/third_party/quic - net/third_party/uri_template - third_party/abseil-cpp - third_party/angle - third_party/angle/src/common/third_party/base - third_party/angle/src/common/third_party/smhasher - third_party/angle/src/common/third_party/xxhash - third_party/angle/src/third_party/compiler - third_party/angle/src/third_party/libXNVCtrl - third_party/angle/src/third_party/trace_event - third_party/angle/third_party/glslang - third_party/angle/third_party/spirv-headers - third_party/angle/third_party/spirv-tools - third_party/angle/third_party/vulkan-headers - third_party/angle/third_party/vulkan-loader - third_party/angle/third_party/vulkan-tools - third_party/angle/third_party/vulkan-validation-layers - third_party/apple_apsl - third_party/axe-core - third_party/blink - third_party/boringssl - third_party/boringssl/src/third_party/fiat - third_party/boringssl/src/third_party/sike - third_party/boringssl/linux-aarch64/crypto/third_party/sike - third_party/boringssl/linux-x86_64/crypto/third_party/sike - third_party/breakpad - third_party/breakpad/breakpad/src/third_party/curl - third_party/brotli - third_party/cacheinvalidation - third_party/catapult - third_party/catapult/common/py_vulcanize/third_party/rcssmin - third_party/catapult/common/py_vulcanize/third_party/rjsmin - third_party/catapult/third_party/beautifulsoup4 - third_party/catapult/third_party/html5lib-python - third_party/catapult/third_party/polymer - third_party/catapult/third_party/six - third_party/catapult/tracing/third_party/d3 - third_party/catapult/tracing/third_party/gl-matrix - third_party/catapult/tracing/third_party/jpeg-js - third_party/catapult/tracing/third_party/jszip - third_party/catapult/tracing/third_party/mannwhitneyu - third_party/catapult/tracing/third_party/oboe - third_party/catapult/tracing/third_party/pako - third_party/ced - third_party/cld_3 - third_party/closure_compiler - third_party/crashpad - third_party/crashpad/crashpad/third_party/lss - third_party/crashpad/crashpad/third_party/zlib - third_party/crc32c - third_party/cros_system_api - third_party/dav1d - third_party/dawn - third_party/depot_tools - third_party/devscripts - third_party/dom_distiller_js - third_party/emoji-segmenter - third_party/flatbuffers - third_party/flot - third_party/freetype - third_party/glslang - third_party/google_input_tools - third_party/google_input_tools/third_party/closure_library - third_party/google_input_tools/third_party/closure_library/third_party/closure - third_party/googletest - third_party/hunspell - third_party/iccjpeg - third_party/inspector_protocol - third_party/jinja2 - third_party/jsoncpp - third_party/jstemplate - third_party/khronos - third_party/leveldatabase - third_party/libXNVCtrl - third_party/libaddressinput - third_party/libaom - third_party/libaom/source/libaom/third_party/vector - third_party/libaom/source/libaom/third_party/x86inc - third_party/libjingle - third_party/libphonenumber - third_party/libsecret - third_party/libsrtp - third_party/libsync - third_party/libudev - third_party/libwebm - third_party/libxml/chromium - third_party/libyuv - third_party/llvm - third_party/lss - third_party/lzma_sdk - third_party/markupsafe - third_party/mesa - third_party/metrics_proto - third_party/modp_b64 - third_party/nasm - third_party/node - third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 - third_party/one_euro_filter - third_party/openscreen - third_party/openscreen/src/third_party/tinycbor/src/src - third_party/ots - third_party/pdfium - third_party/pdfium/third_party/agg23 - third_party/pdfium/third_party/base - third_party/pdfium/third_party/bigint - third_party/pdfium/third_party/freetype - third_party/pdfium/third_party/lcms - third_party/pdfium/third_party/libopenjpeg20 - third_party/pdfium/third_party/libpng16 - third_party/pdfium/third_party/libtiff - third_party/pdfium/third_party/skia_shared - third_party/perfetto - third_party/pffft - third_party/ply - third_party/polymer - third_party/private-join-and-compute - third_party/protobuf - third_party/protobuf/third_party/six - third_party/pyjson5 - third_party/qcms - third_party/rnnoise - third_party/s2cellid - third_party/sfntly - third_party/simplejson - third_party/skia - third_party/skia/include/third_party/skcms - third_party/skia/include/third_party/vulkan - third_party/skia/third_party/gif - third_party/skia/third_party/skcms - third_party/skia/third_party/vulkan - third_party/smhasher - third_party/spirv-headers - third_party/SPIRV-Tools - third_party/sqlite - third_party/swiftshader - third_party/swiftshader/third_party/llvm-7.0 - third_party/swiftshader/third_party/llvm-subzero - third_party/swiftshader/third_party/marl - third_party/swiftshader/third_party/subzero - third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 - third_party/unrar - third_party/usrsctp - third_party/vulkan - third_party/web-animations-js - third_party/webdriver - third_party/webrtc - third_party/webrtc/common_audio/third_party/fft4g - third_party/webrtc/common_audio/third_party/spl_sqrt_floor - third_party/webrtc/modules/third_party/fft - third_party/webrtc/modules/third_party/g711 - third_party/webrtc/modules/third_party/g722 - third_party/webrtc/rtc_base/third_party/base64 - third_party/webrtc/rtc_base/third_party/sigslot - third_party/widevine - third_party/woff2 - third_party/zlib/google - tools/grit/third_party/six - url/third_party/mozilla - v8/src/third_party/siphash - v8/src/third_party/valgrind - v8/src/third_party/utf8-decoder - v8/third_party/inspector_protocol - v8/third_party/v8 - - # gyp -> gn leftovers - base/third_party/libevent - third_party/adobe - third_party/speech-dispatcher - third_party/usb_ids - third_party/xdg-utils - third_party/yasm/run_yasm.py - ) - if ! use system-ffmpeg; then - keeplibs+=( third_party/ffmpeg third_party/opus ) - fi - if ! use system-icu; then - keeplibs+=( third_party/icu ) - fi - if ! use system-libvpx; then - keeplibs+=( third_party/libvpx ) - keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc ) - fi - if use tcmalloc; then - keeplibs+=( third_party/tcmalloc ) - fi - - # Remove most bundled libraries. Some are still needed. - build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die -} - -src_configure() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - local myconf_gn="" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - if [[ ${CHROMIUM_FORCE_CLANG} == yes ]] && ! tc-is-clang; then - # Force clang since gcc is pretty broken at the moment. - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - strip-unsupported-flags - fi - - if tc-is-clang; then - myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" - else - myconf_gn+=" is_clang=false" - fi - - # Define a custom toolchain for GN - myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" - - if tc-is-cross-compiler; then - tc-export BUILD_{AR,CC,CXX,NM} - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" - myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" - else - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" - fi - - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. - myconf_gn+=" is_debug=false" - - # Component build isn't generally intended for use by end users. It's mostly useful - # for development and debugging. - myconf_gn+=" is_component_build=$(usex component-build true false)" - - myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf_gn+=" enable_nacl=false" - - # Use system-provided libraries. - # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #459932). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - - # libevent: https://bugs.gentoo.org/593458 - local gn_system_libraries=( - flac - fontconfig - freetype - # Need harfbuzz_from_pkgconfig target - #harfbuzz-ng - libdrm - libjpeg - libpng - libwebp - libxml - libxslt - openh264 - re2 - snappy - yasm - zlib - ) - if use system-ffmpeg; then - gn_system_libraries+=( ffmpeg opus ) - fi - if use system-icu; then - gn_system_libraries+=( icu ) - fi - if use system-libvpx; then - gn_system_libraries+=( libvpx ) - fi - build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die - - # See dependency logic in third_party/BUILD.gn - myconf_gn+=" use_system_harfbuzz=true" - - # Optional dependencies. - myconf_gn+=" closure_compile=$(usex closure-compile true false)" - myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" - myconf_gn+=" enable_widevine=$(usex widevine true false)" - myconf_gn+=" use_cups=$(usex cups true false)" - myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)" - myconf_gn+=" use_kerberos=$(usex kerberos true false)" - myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" - - # TODO: link_pulseaudio=true for GN. - - myconf_gn+=" fieldtrial_testing_like_official_build=true" - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - # Trying to use gold results in linker crash. - myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false" - - # Disable forced lld, bug 641556 - myconf_gn+=" use_lld=false" - - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" - myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" - - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . - # Note: these are for Gentoo use ONLY. For your own distribution, - # please get your own set of keys. Feel free to contact chromium@gentoo.org - # for more info. - local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" - local google_default_client_id="329227923882.apps.googleusercontent.com" - local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu" - myconf_gn+=" google_api_key=\"${google_api_key}\"" - myconf_gn+=" google_default_client_id=\"${google_default_client_id}\"" - myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\"" - local myarch="$(tc-arch)" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - - # Prevent linker from running out of address space, bug #471810 . - if use x86; then - filter-flags "-g*" - fi - - # Prevent libvpx build failures. Bug 530248, 544702, 546984. - if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then - filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 - fi - fi - - if [[ $myarch = amd64 ]] ; then - myconf_gn+=" target_cpu=\"x64\"" - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - myconf_gn+=" target_cpu=\"x86\"" - ffmpeg_target_arch=ia32 - - # This is normally defined by compiler_cpu_abi in - # build/config/compiler/BUILD.gn, but we patch that part out. - append-flags -msse2 -mfpmath=sse -mmmx - elif [[ $myarch = arm64 ]] ; then - myconf_gn+=" target_cpu=\"arm64\"" - ffmpeg_target_arch=arm64 - elif [[ $myarch = arm ]] ; then - myconf_gn+=" target_cpu=\"arm\"" - ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm) - else - die "Failed to determine target arch, got '$myarch'." - fi - - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. - myconf_gn+=" treat_warnings_as_errors=false" - - # Disable fatal linker warnings, bug 506268. - myconf_gn+=" fatal_linker_warnings=false" - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -p -m 755 "${TMPDIR}" || die - - # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ #nowarn - - #if ! use system-ffmpeg; then - if false; then - local build_ffmpeg_args="" - if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then - build_ffmpeg_args+=" --disable-asm" - fi - - # Re-configure bundled ffmpeg. See bug #491378 for example reasons. - einfo "Configuring bundled ffmpeg..." - pushd third_party/ffmpeg > /dev/null || die - chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \ - --branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die - chromium/scripts/copy_config.sh || die - chromium/scripts/generate_gn.py || die - popd > /dev/null || die - fi - - # Explicitly disable ICU data file support for system-icu builds. - if use system-icu; then - myconf_gn+=" icu_use_data_file=false" - fi - - einfo "Configuring Chromium..." - set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release - echo "$@" - "$@" || die -} - -src_compile() { - # Final link uses lots of file descriptors. - ulimit -n 2048 - - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - #"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die - - # Build mksnapshot and pax-mark it. - local x - for x in mksnapshot v8_context_snapshot_generator; do - if tc-is-cross-compiler; then - eninja -C out/Release "host/${x}" - pax-mark m "out/Release/host/${x}" - else - eninja -C out/Release "${x}" - pax-mark m "out/Release/${x}" - fi - done - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C out/Release chrome chromedriver - use suid && eninja -C out/Release chrome_sandbox - - pax-mark m out/Release/chrome - - # Build manpage; bug #684550 - sed -e 's|@@PACKAGE@@|chromium-browser|g; - s|@@MENUNAME@@|Chromium|g;' \ - chrome/app/resources/manpage.1.in > \ - out/Release/chromium-browser.1 || die -} - -src_install() { - local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome - - if use suid; then - newexe out/Release/chrome_sandbox chrome-sandbox - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" - fi - - doexe out/Release/chromedriver - - local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" ) - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die - doexe chromium-launcher.sh - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium - - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver - - # Allow users to override command-line options, bug #357629. - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.bin - doins out/Release/*.pak - doins out/Release/*.so - - if ! use system-icu; then - doins out/Release/icudtl.dat - fi - - doins -r out/Release/locales - doins -r out/Release/resources - - if [[ -d out/Release/swiftshader ]]; then - insinto "${CHROMIUM_HOME}/swiftshader" - doins out/Release/swiftshader/*.so - fi - - # Install icons and desktop entry. - local branding size - for size in 16 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser.png - done - - local mime_types="text/html;text/xml;application/xhtml+xml;" - mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797 - mime_types+="x-scheme-handler/ftp;" # bug #412185 - mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393 - make_desktop_entry \ - chromium-browser \ - "Chromium" \ - chromium-browser \ - "Network;WebBrowser" \ - "MimeType=${mime_types}\nStartupWMClass=chromium-browser" - sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die - - # Install GNOME default application entry (bug #303100). - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml - - # Install manpage; bug #684550 - doman out/Release/chromium-browser.1 - dosym chromium-browser.1 /usr/share/man/man1/chromium.1 - - readme.gentoo_create_doc -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - readme.gentoo_print_elog -} diff --git a/www-client/chromium/chromium-80.0.3987.87.ebuild b/www-client/chromium/chromium-80.0.3987.87.ebuild index 1dfd272b3bdf..04dadc95af73 100644 --- a/www-client/chromium/chromium-80.0.3987.87.ebuild +++ b/www-client/chromium/chromium-80.0.3987.87.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="amd64 ~arm64 ~x86" IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts kerberos pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" REQUIRED_USE="component-build? ( !suid )" diff --git a/www-client/chromium/chromium-81.0.4040.5.ebuild b/www-client/chromium/chromium-81.0.4044.9.ebuild index bbe6a457c792..b16c58de36f1 100644 --- a/www-client/chromium/chromium-81.0.4040.5.ebuild +++ b/www-client/chromium/chromium-81.0.4044.9.ebuild @@ -144,12 +144,12 @@ PATCHES=( "${FILESDIR}/chromium-fix-char_traits.patch" "${FILESDIR}/chromium-78-protobuf-export.patch" "${FILESDIR}/chromium-79-gcc-alignas.patch" - "${FILESDIR}/chromium-80-unbundle-libxml.patch" "${FILESDIR}/chromium-80-gcc-quiche.patch" "${FILESDIR}/chromium-80-gcc-blink.patch" - "${FILESDIR}/chromium-81-gcc-template.patch" "${FILESDIR}/chromium-81-gcc-noexcept.patch" - "${FILESDIR}/chromium-81-clang.patch" + "${FILESDIR}/chromium-81-gcc-constexpr.patch" + "${FILESDIR}/chromium-81-mojom.patch" + "${FILESDIR}/chromium-81-fix-browser-frame.patch" ) pre_build_checks() { @@ -341,7 +341,6 @@ src_prepare() { third_party/qcms third_party/rnnoise third_party/s2cellid - third_party/sfntly third_party/simplejson third_party/skia third_party/skia/include/third_party/skcms diff --git a/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch b/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch deleted file mode 100644 index d43a091b9718..000000000000 --- a/www-client/chromium/files/chromium-79-gcc-ambiguous-nodestructor.patch +++ /dev/null @@ -1,39 +0,0 @@ -From af77dc4014ead3d898fdc8a7a70fe5063ac9b102 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Fri, 25 Oct 2019 19:01:29 +0000 -Subject: [PATCH] GCC: use brace-initializer for DohUpgrade vector - -Constructing NoDestructor with parenthesis constructor is ambiguous -in GCC. Use brace-initializer to avoid that problem. This fixes this -build error: - -Bug: 819294 -Change-Id: I00dda42daa1794d11e022f26ac07f92e599d106d -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879910 -Reviewed-by: Eric Orth <ericorth@chromium.org> -Commit-Queue: José Dapena Paz <jose.dapena@lge.com> -Cr-Commit-Position: refs/heads/master@{#709569} ---- - -diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc -index 14997c4..637b6f2 100644 ---- a/net/dns/dns_util.cc -+++ b/net/dns/dns_util.cc -@@ -144,7 +144,7 @@ - // DohProviderId histogram suffix list in - // tools/metrics/histograms/histograms.xml. - static const base::NoDestructor<std::vector<DohUpgradeEntry>> -- upgradable_servers({ -+ upgradable_servers{{ - DohUpgradeEntry( - "CleanBrowsingAdult", - {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1", -@@ -215,7 +215,7 @@ - {"9.9.9.9", "149.112.112.112", "2620:fe::fe", "2620:fe::9"}, - {"dns.quad9.net", "dns9.quad9.net"} /* DoT hostname */, - {"https://dns.quad9.net/dns-query", true /* use_post */}), -- }); -+ }}; - return *upgradable_servers; - } - diff --git a/www-client/chromium/files/chromium-79-gcc-name-clash.patch b/www-client/chromium/files/chromium-79-gcc-name-clash.patch deleted file mode 100644 index 2324f4db7f91..000000000000 --- a/www-client/chromium/files/chromium-79-gcc-name-clash.patch +++ /dev/null @@ -1,135 +0,0 @@ -From e925deab264e5ebc3c5c13415aa3d44a746e8d45 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Fri, 25 Oct 2019 14:53:51 +0000 -Subject: [PATCH] GCC: avoid clash of WebThemeEngine::ForcedColors with ForcedColors enum class - -GCC fails to build because the declaration of the enum class ForcedColors -clashes with the GetForcedColors method. - -Bug: 819294 -Change-Id: I5c7647978d15c771f5372a8c70ac6aeb2284fb2f -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879452 -Reviewed-by: Kentaro Hara <haraken@chromium.org> -Commit-Queue: José Dapena Paz <jose.dapena@lge.com> -Cr-Commit-Position: refs/heads/master@{#709469} - -(backported to M79) ---- - -diff --git a/content/child/webthemeengine_impl_android.cc b/content/child/webthemeengine_impl_android.cc -index 2e703d6..3759f6c 100644 ---- a/content/child/webthemeengine_impl_android.cc -+++ b/content/child/webthemeengine_impl_android.cc -@@ -228,7 +228,7 @@ void WebThemeEngineAndroid::Paint( - native_theme_extra_params, NativeColorScheme(color_scheme)); - } - --blink::ForcedColors WebThemeEngineAndroid::ForcedColors() const { -+blink::ForcedColors WebThemeEngineAndroid::GetForcedColors() const { - return forced_colors_; - } - -diff --git a/content/child/webthemeengine_impl_android.h b/content/child/webthemeengine_impl_android.h -index 0c113a88..95e2744 100644 ---- a/content/child/webthemeengine_impl_android.h -+++ b/content/child/webthemeengine_impl_android.h -@@ -22,7 +22,7 @@ - const blink::WebRect& rect, - const blink::WebThemeEngine::ExtraParams* extra_params, - blink::WebColorScheme color_scheme) override; -- blink::ForcedColors ForcedColors() const override; -+ blink::ForcedColors GetForcedColors() const override; - void SetForcedColors(const blink::ForcedColors forced_colors) override; - blink::PreferredColorScheme PreferredColorScheme() const override; - void SetPreferredColorScheme( -diff --git a/content/child/webthemeengine_impl_default.cc b/content/child/webthemeengine_impl_default.cc -index 84db298..04af6c6 100644 ---- a/content/child/webthemeengine_impl_default.cc -+++ b/content/child/webthemeengine_impl_default.cc -@@ -232,7 +232,7 @@ - } - #endif - --blink::ForcedColors WebThemeEngineDefault::ForcedColors() const { -+blink::ForcedColors WebThemeEngineDefault::GetForcedColors() const { - return ui::NativeTheme::GetInstanceForWeb()->UsesHighContrastColors() - ? blink::ForcedColors::kActive - : blink::ForcedColors::kNone; -diff --git a/content/child/webthemeengine_impl_default.h b/content/child/webthemeengine_impl_default.h -index 73579db..1f08f67 100644 ---- a/content/child/webthemeengine_impl_default.h -+++ b/content/child/webthemeengine_impl_default.h -@@ -39,7 +39,7 @@ - int32_t vertical_arrow_bitmap_height, - int32_t horizontal_arrow_bitmap_width); - #endif -- blink::ForcedColors ForcedColors() const override; -+ blink::ForcedColors GetForcedColors() const override; - void SetForcedColors(const blink::ForcedColors forced_colors) override; - blink::PreferredColorScheme PreferredColorScheme() const override; - void SetPreferredColorScheme( -diff --git a/content/child/webthemeengine_impl_mac.cc b/content/child/webthemeengine_impl_mac.cc -index 9cb279e..553eedb 100644 ---- a/content/child/webthemeengine_impl_mac.cc -+++ b/content/child/webthemeengine_impl_mac.cc -@@ -6,7 +6,7 @@ - - namespace content { - --blink::ForcedColors WebThemeEngineMac::ForcedColors() const { -+blink::ForcedColors WebThemeEngineMac::GetForcedColors() const { - return forced_colors_; - } - -diff --git a/content/child/webthemeengine_impl_mac.h b/content/child/webthemeengine_impl_mac.h -index b3dafa1..c0b66c0 100644 ---- a/content/child/webthemeengine_impl_mac.h -+++ b/content/child/webthemeengine_impl_mac.h -@@ -13,7 +13,7 @@ - public: - ~WebThemeEngineMac() override {} - -- blink::ForcedColors ForcedColors() const override; -+ blink::ForcedColors GetForcedColors() const override; - void SetForcedColors(const blink::ForcedColors forced_colors) override; - blink::PreferredColorScheme PreferredColorScheme() const override; - void SetPreferredColorScheme( -diff --git a/third_party/blink/public/platform/web_theme_engine.h b/third_party/blink/public/platform/web_theme_engine.h -index d642462..aa2da1b 100644 ---- a/third_party/blink/public/platform/web_theme_engine.h -+++ b/third_party/blink/public/platform/web_theme_engine.h -@@ -227,7 +227,7 @@ - return base::nullopt; - } - -- virtual ForcedColors ForcedColors() const { return ForcedColors::kNone; } -+ virtual ForcedColors GetForcedColors() const { return ForcedColors::kNone; } - virtual void SetForcedColors(const blink::ForcedColors forced_colors) {} - virtual blink::PreferredColorScheme PreferredColorScheme() const { - return PreferredColorScheme::kNoPreference; -diff --git a/third_party/blink/renderer/core/css/media_values.cc b/third_party/blink/renderer/core/css/media_values.cc -index 045d793..f7c0484 100644 ---- a/third_party/blink/renderer/core/css/media_values.cc -+++ b/third_party/blink/renderer/core/css/media_values.cc -@@ -221,7 +221,7 @@ - - ForcedColors MediaValues::CalculateForcedColors() { - if (Platform::Current() && Platform::Current()->ThemeEngine()) -- return Platform::Current()->ThemeEngine()->ForcedColors(); -+ return Platform::Current()->ThemeEngine()->GetForcedColors(); - else - return ForcedColors::kNone; - } -diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 64b0d23..02cce1f 100644 ---- a/third_party/blink/renderer/core/dom/document.cc -+++ b/third_party/blink/renderer/core/dom/document.cc -@@ -8625,7 +8625,7 @@ - bool Document::InForcedColorsMode() const { - return RuntimeEnabledFeatures::ForcedColorsEnabled() && Platform::Current() && - Platform::Current()->ThemeEngine() && -- Platform::Current()->ThemeEngine()->ForcedColors() != -+ Platform::Current()->ThemeEngine()->GetForcedColors() != - ForcedColors::kNone; - } - diff --git a/www-client/chromium/files/chromium-79-gcc-permissive.patch b/www-client/chromium/files/chromium-79-gcc-permissive.patch deleted file mode 100644 index c42d56985a68..000000000000 --- a/www-client/chromium/files/chromium-79-gcc-permissive.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 528e9a3e1f25bd264549c4c7779748abfd16bb1c Mon Sep 17 00:00:00 2001 -From: Jan Wilken Dörrie <jdoerrie@chromium.org> -Date: Fri, 18 Oct 2019 11:45:24 +0000 -Subject: [PATCH] Reland "GCC: Fix base::internal::InvokeFuncImpl" - -This is a reland of 9293d5c86eec1c34fc00716645400b44a14e764e - -Original change's description: -> GCC: Fix base::internal::InvokeFuncImpl -> -> GCC doesn't like that the Value data member has no out-of-line -> definition. The problem is triggered specifically only when compiling -> -> components/services/leveldb/leveldb_database_impl.cc -> -> which has lambda functions returning locally-defined classes. -> -> The current code works as-is in C++17 mode which introduces the concept -> of inline variables, but in C++14 we need either an explicit out-of-line -> definition or a function member instead of a data member. -> -> Use std::integral_constant for defining the value. -> -> Bug: 819294 -> Change-Id: I5c68e14ce3fa9d8b4d8a2cb42d7f9b53938aabf3 -> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1862451 -> Reviewed-by: Jan Wilken Dörrie <jdoerrie@chromium.org> -> Reviewed-by: Daniel Cheng <dcheng@chromium.org> -> Commit-Queue: Jüri Valdmann <juri.valdmann@qt.io> -> Cr-Commit-Position: refs/heads/master@{#706384} - -Bug: 819294 -Change-Id: I3d5a52ddc6815516e2239f9347c60de06bf765a2 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1865212 -Reviewed-by: Daniel Cheng <dcheng@chromium.org> -Commit-Queue: Jan Wilken Dörrie <jdoerrie@chromium.org> -Cr-Commit-Position: refs/heads/master@{#707329} ---- - -diff --git a/base/bind.h b/base/bind.h -index 7a400af..1070ce6 100644 ---- a/base/bind.h -+++ b/base/bind.h -@@ -187,18 +187,15 @@ - // well-formed. Using `Invoker::Run` with a OnceCallback triggers a - // static_assert, which is why the ternary expression does not compile. - // TODO(crbug.com/752720): Remove this indirection once we have `if constexpr`. --template <bool is_once, typename Invoker> --struct InvokeFuncImpl; -+template <typename Invoker> -+constexpr auto GetInvokeFunc(std::true_type) { -+ return Invoker::RunOnce; -+} - - template <typename Invoker> --struct InvokeFuncImpl<true, Invoker> { -- static constexpr auto Value = &Invoker::RunOnce; --}; -- --template <typename Invoker> --struct InvokeFuncImpl<false, Invoker> { -- static constexpr auto Value = &Invoker::Run; --}; -+constexpr auto GetInvokeFunc(std::false_type) { -+ return Invoker::Run; -+} - - template <template <typename> class CallbackT, - typename Functor, -@@ -229,7 +226,8 @@ - // InvokeFuncStorage, so that we can ensure its type matches to - // PolymorphicInvoke, to which CallbackType will cast back. - using PolymorphicInvoke = typename CallbackType::PolymorphicInvoke; -- PolymorphicInvoke invoke_func = InvokeFuncImpl<kIsOnce, Invoker>::Value; -+ PolymorphicInvoke invoke_func = -+ GetInvokeFunc<Invoker>(std::integral_constant<bool, kIsOnce>()); - - using InvokeFuncStorage = internal::BindStateBase::InvokeFuncStorage; - return CallbackType(BindState::Create( diff --git a/www-client/chromium/files/chromium-79-icu-65.patch b/www-client/chromium/files/chromium-79-icu-65.patch deleted file mode 100644 index e0732b6ace24..000000000000 --- a/www-client/chromium/files/chromium-79-icu-65.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/third_party/blink/renderer/core/dom/document.cc b/third_party/blink/renderer/core/dom/document.cc -index 5a62770..1fae2aa 100644 ---- a/third_party/blink/renderer/core/dom/document.cc -+++ b/third_party/blink/renderer/core/dom/document.cc -@@ -6192,7 +6192,7 @@ static ParseQualifiedNameResult ParseQualifiedNameInternal( - - for (unsigned i = 0; i < length;) { - UChar32 c; -- U16_NEXT(characters, i, length, c) -+ U16_NEXT(characters, i, length, c); - if (c == ':') { - if (saw_colon) - return ParseQualifiedNameResult(kQNMultipleColons); diff --git a/www-client/chromium/files/chromium-79-include.patch b/www-client/chromium/files/chromium-79-include.patch deleted file mode 100644 index 8f2fb56176ae..000000000000 --- a/www-client/chromium/files/chromium-79-include.patch +++ /dev/null @@ -1,131 +0,0 @@ -From f7c177d35242311ea7a2cf49a0980c61664f27ba Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Fri, 25 Oct 2019 15:07:09 +0000 -Subject: [PATCH] IWYU: include algorithm to use std::lower_bound in ui/gfx/font.cc - -Fix GCC build because of missing include: -../../ui/gfx/font.cc: In function ‘gfx::Font::Weight gfx::FontWeightFromInt(int)’: -../../ui/gfx/font.cc:114:8: error: no matching function for call to ‘lower_bound(const gfx::Font::Weight*, const gfx::Font::Weight*, int&, gfx::FontWeightFromInt(int)::<lambda(const gfx::Font::Weight&, const int&)>)’ - }); - ^ -In file included from /usr/include/c++/8/bits/char_traits.h:39, - from /usr/include/c++/8/string:40, - from ../../ui/gfx/font.h:8, - from ../../ui/gfx/font.cc:5: -/usr/include/c++/8/bits/stl_algobase.h:984:5: note: candidate: ‘template<class _ForwardIterator, class _Tp> _ForwardIterator std::lower_bound(_ForwardIterator, _ForwardIterator, const _Tp&)’ - lower_bound(_ForwardIterator __first, _ForwardIterator __last, - ^~~~~~~~~~~ -/usr/include/c++/8/bits/stl_algobase.h:984:5: note: template argument deduction/substitution failed: -../../ui/gfx/font.cc:114:8: note: candidate expects 3 arguments, 4 provided - }); - ^ - -Bug: 819294 -Change-Id: Ic59dcf3a06bdd54d1d426c08a61624873a0ff30c -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879909 -Commit-Queue: Alexei Svitkine <asvitkine@chromium.org> -Reviewed-by: Alexei Svitkine <asvitkine@chromium.org> -Cr-Commit-Position: refs/heads/master@{#709472} ---- - -diff --git a/ui/gfx/font.cc b/ui/gfx/font.cc -index 21367fd7..92b159e 100644 ---- a/ui/gfx/font.cc -+++ b/ui/gfx/font.cc -@@ -4,6 +4,8 @@ - - #include "ui/gfx/font.h" - -+#include <algorithm> -+ - #include "base/strings/utf_string_conversions.h" - #include "build/build_config.h" - #include "ui/gfx/platform_font.h" - -From 97eb905ba262382bc3583078761c68f4452aea71 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Fri, 25 Oct 2019 09:27:53 +0000 -Subject: [PATCH] IWYU: launch_manager.h uses std::vector - -Add #include <vector> for using std::vector. This fixes GCC build. - -./../chrome/browser/apps/launch_service/launch_manager.h:46:15: error: ‘vector’ in namespace ‘std’ does not name a template type - static std::vector<base::FilePath> GetLaunchFilesFromCommandLine( - ^~~~~~ - -Bug: 819294 -Change-Id: I02ec3a2914a8fbe3aa0041017a0228f4b0ca1ec9 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879289 -Reviewed-by: Alexey Baskakov <loyso@chromium.org> -Commit-Queue: José Dapena Paz <jose.dapena@lge.com> -Cr-Commit-Position: refs/heads/master@{#709411} ---- - -diff --git a/chrome/browser/apps/launch_service/launch_manager.h b/chrome/browser/apps/launch_service/launch_manager.h -index 00aeb9d..76570ea 100644 ---- a/chrome/browser/apps/launch_service/launch_manager.h -+++ b/chrome/browser/apps/launch_service/launch_manager.h -@@ -6,6 +6,7 @@ - #define CHROME_BROWSER_APPS_LAUNCH_SERVICE_LAUNCH_MANAGER_H_ - - #include <string> -+#include <vector> - - #include "base/macros.h" - -From e7407ce7fa262e9fd1a19dd0957e5a950520ee3a Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Fri, 25 Oct 2019 08:25:45 +0000 -Subject: [PATCH] IWYU: include cstdint in register_context.h as it uses uintptr_t - -GCC build fix as build fails with this: -../../base/profiler/register_context.h:31:1: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’? - uintptr_t& AsUintPtr(T* value) { - ^~~~~~~~~ - intptr_t -../../base/profiler/register_context.h:110:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’? - uintptr_t stack_pointer; - ^~~~~~~~~ - intptr_t -../../base/profiler/register_context.h:111:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’? - uintptr_t frame_pointer; - ^~~~~~~~~ - intptr_t -../../base/profiler/register_context.h:112:3: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’? - uintptr_t instruction_pointer; - ^~~~~~~~~ - intptr_t -../../base/profiler/register_context.h:115:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’? - inline uintptr_t& RegisterContextStackPointer(RegisterContext* context) { - ^~~~~~~~~ - intptr_t -../../base/profiler/register_context.h:119:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’? - inline uintptr_t& RegisterContextFramePointer(RegisterContext* context) { - ^~~~~~~~~ - intptr_t -../../base/profiler/register_context.h:123:8: error: ‘uintptr_t’ does not name a type; did you mean ‘intptr_t’? - inline uintptr_t& RegisterContextInstructionPointer(RegisterContext* context) { - ^~~~~~~~~ - intptr_t - - -Bug: 819294 -Change-Id: I49567b00a6f021686c52053a22fb9c502c84f1bc -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1879908 -Reviewed-by: Mike Wittman <wittman@chromium.org> -Commit-Queue: José Dapena Paz <jose.dapena@lge.com> -Cr-Commit-Position: refs/heads/master@{#709398} ---- - -diff --git a/base/profiler/register_context.h b/base/profiler/register_context.h -index 46c4250..7dd86ff 100644 ---- a/base/profiler/register_context.h -+++ b/base/profiler/register_context.h -@@ -9,6 +9,7 @@ - #ifndef BASE_PROFILER_REGISTER_CONTEXT_H_ - #define BASE_PROFILER_REGISTER_CONTEXT_H_ - -+#include <cstdint> - #include <type_traits> - - #include "build/build_config.h" diff --git a/www-client/chromium/files/chromium-79-system-hb.patch b/www-client/chromium/files/chromium-79-system-hb.patch deleted file mode 100644 index 83e0621777f1..000000000000 --- a/www-client/chromium/files/chromium-79-system-hb.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/components/paint_preview/common/subset_font.cc b/components/paint_preview/common/subset_font.cc -index a218d63..6a5bdae 100644 ---- a/components/paint_preview/common/subset_font.cc -+++ b/components/paint_preview/common/subset_font.cc -@@ -10,11 +10,12 @@ - #include "base/bind.h" - #include "base/callback.h" - #include "base/macros.h" --#include "third_party/harfbuzz-ng/src/src/hb-subset.h" --#include "third_party/harfbuzz-ng/src/src/hb.h" - #include "third_party/skia/include/core/SkStream.h" - #include "third_party/skia/include/core/SkTypeface.h" - -+#include <hb-subset.h> -+#include <hb.h> -+ - namespace paint_preview { - - namespace { diff --git a/www-client/chromium/files/chromium-81-clang.patch b/www-client/chromium/files/chromium-81-clang.patch deleted file mode 100644 index 8f69b34a0ed3..000000000000 --- a/www-client/chromium/files/chromium-81-clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/chrome/browser/enterprise_reporting/notification/extension_request_notification.cc b/chrome/browser/enterprise_reporting/notification/extension_request_notification.cc -index 659efac..38f6ebc 100644 ---- a/chrome/browser/enterprise_reporting/notification/extension_request_notification.cc -+++ b/chrome/browser/enterprise_reporting/notification/extension_request_notification.cc -@@ -46,7 +46,7 @@ constexpr int kNotificationBodies[] = { - - } // namespace - --ExtensionRequestNotification::ExtensionRequestNotification() = default; -+ExtensionRequestNotification::ExtensionRequestNotification() {} - - ExtensionRequestNotification::ExtensionRequestNotification( - Profile* profile, diff --git a/www-client/chromium/files/chromium-81-fix-browser-frame.patch b/www-client/chromium/files/chromium-81-fix-browser-frame.patch new file mode 100644 index 000000000000..6516e1faf1aa --- /dev/null +++ b/www-client/chromium/files/chromium-81-fix-browser-frame.patch @@ -0,0 +1,35 @@ +From c73968d63c456d4aaf55c5cd439b42403a3bbeb1 Mon Sep 17 00:00:00 2001 +From: Tom Anderson <thomasanderson@chromium.org> +Date: Mon, 03 Feb 2020 19:53:50 +0000 +Subject: [PATCH] Fix browser frame view not getting a relayout after a state change + +views::NonClientView has 2 things: a views::NonClientFrameView and a +views::ClientView. We were previously only invalidating the layout on +the ClientView after a state change. This was causing the browser +frame to paint as if it were still maximized after restoring from +a maximized state on Linux. Invalidating the layout of the frame view +fixes the issue. + +BUG=1046122 +R=sky + +Change-Id: I7da525efe1f436564ffffb410afe294e901e5d89 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2033759 +Reviewed-by: Scott Violet <sky@chromium.org> +Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> +Cr-Commit-Position: refs/heads/master@{#737890} +--- + +diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +index 9abbce8..6c00d49 100644 +--- a/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc ++++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc +@@ -717,6 +717,8 @@ + NonClientView* non_client_view = widget->non_client_view(); + // non_client_view may be NULL, especially during creation. + if (non_client_view) { ++ if (non_client_view->frame_view()) ++ non_client_view->frame_view()->InvalidateLayout(); + non_client_view->client_view()->InvalidateLayout(); + non_client_view->InvalidateLayout(); + } diff --git a/www-client/chromium/files/chromium-81-gcc-constexpr.patch b/www-client/chromium/files/chromium-81-gcc-constexpr.patch new file mode 100644 index 000000000000..a9c1507c078b --- /dev/null +++ b/www-client/chromium/files/chromium-81-gcc-constexpr.patch @@ -0,0 +1,19 @@ +diff --git a/ui/views/layout/layout_types.h b/ui/views/layout/layout_types.h +index 8f9dbf4..ba118b9 100644 +--- a/ui/views/layout/layout_types.h ++++ b/ui/views/layout/layout_types.h +@@ -45,12 +45,12 @@ class VIEWS_EXPORT SizeBounds { + ~SizeBounds() = default; + + constexpr const base::Optional<int>& width() const { return width_; } +- constexpr void set_width(base::Optional<int> width) { ++ inline void set_width(base::Optional<int> width) { + width_ = std::move(width); + } + + constexpr const base::Optional<int>& height() const { return height_; } +- constexpr void set_height(base::Optional<int> height) { ++ inline void set_height(base::Optional<int> height) { + height_ = std::move(height); + } + diff --git a/www-client/chromium/files/chromium-81-gcc-template.patch b/www-client/chromium/files/chromium-81-gcc-template.patch deleted file mode 100644 index 8553d5f603b3..000000000000 --- a/www-client/chromium/files/chromium-81-gcc-template.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/third_party/blink/renderer/platform/wtf/list_hash_set.h b/third_party/blink/renderer/platform/wtf/list_hash_set.h -index 7856b7b..76534f6 100644 ---- a/third_party/blink/renderer/platform/wtf/list_hash_set.h -+++ b/third_party/blink/renderer/platform/wtf/list_hash_set.h -@@ -308,21 +308,16 @@ class ListHashSetNodeBasePointer { - NodeType& operator*() const { return *Get(); } - - private: -- template <bool = Allocator::kIsGarbageCollected> - void SetSafe(NodeType* node) { -- AsAtomicPtr(&node_)->store(node, std::memory_order_relaxed); -- } -- template <> -- void SetSafe<false>(NodeType* node) { -- node_ = node; -+ if ( Allocator::kIsGarbageCollected ) -+ AsAtomicPtr(&node_)->store(node, std::memory_order_relaxed); -+ else -+ node_ = node; - } - -- template <bool = Allocator::kIsGarbageCollected> - NodeType* GetSafe() const { -- return AsAtomicPtr(&node_)->load(std::memory_order_relaxed); -- } -- template <> -- NodeType* GetSafe<false>() const { -+ if ( Allocator::kIsGarbageCollected ) -+ return AsAtomicPtr(&node_)->load(std::memory_order_relaxed); - return node_; - } - diff --git a/www-client/chromium/files/chromium-81-mojom.patch b/www-client/chromium/files/chromium-81-mojom.patch new file mode 100644 index 000000000000..e6675931fbc8 --- /dev/null +++ b/www-client/chromium/files/chromium-81-mojom.patch @@ -0,0 +1,303 @@ +Add missing files in tarball. + +diff --git a/chrome/test/data/webui/mojo/OWNERS b/chrome/test/data/webui/mojo/OWNERS +new file mode 100644 +index 000000000000..08850f421205 +--- /dev/null ++++ b/chrome/test/data/webui/mojo/OWNERS +@@ -0,0 +1,2 @@ ++per-file *.mojom=set noparent ++per-file *.mojom=file://ipc/SECURITY_OWNERS +diff --git a/chrome/test/data/webui/mojo/foobar.mojom b/chrome/test/data/webui/mojo/foobar.mojom +new file mode 100644 +index 000000000000..446d365af8fb +--- /dev/null ++++ b/chrome/test/data/webui/mojo/foobar.mojom +@@ -0,0 +1,16 @@ ++// Copyright 2019 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++// Test Mojo interfaces for MojoWebUIControllerBrowserTest. ++ ++module test.mojom; ++ ++interface Foo { ++ GetFoo() => (string value); ++}; ++ ++interface Bar { ++ GetBar() => (string value); ++}; ++ +diff --git a/chrome/test/data/webui/mojo/mojo_web_ui_controller_browsertest.cc b/chrome/test/data/webui/mojo/mojo_web_ui_controller_browsertest.cc +new file mode 100644 +index 000000000000..658a54ace278 +--- /dev/null ++++ b/chrome/test/data/webui/mojo/mojo_web_ui_controller_browsertest.cc +@@ -0,0 +1,253 @@ ++// Copyright 2019 The Chromium Authors. All rights reserved. ++// Use of this source code is governed by a BSD-style license that can be ++// found in the LICENSE file. ++ ++#include "ui/webui/mojo_web_ui_controller.h" ++ ++#include "base/memory/ref_counted_memory.h" ++#include "base/path_service.h" ++#include "base/run_loop.h" ++#include "base/threading/sequenced_task_runner_handle.h" ++#include "chrome/browser/bad_message.h" ++#include "chrome/browser/chrome_browser_interface_binders.h" ++#include "chrome/browser/chrome_content_browser_client.h" ++#include "chrome/browser/ui/browser.h" ++#include "chrome/browser/ui/tabs/tab_strip_model.h" ++#include "chrome/test/base/in_process_browser_test.h" ++#include "chrome/test/data/grit/webui_test_resources.h" ++#include "chrome/test/data/webui/mojo/foobar.mojom.h" ++#include "content/public/browser/render_process_host.h" ++#include "content/public/browser/render_process_host_observer.h" ++#include "content/public/browser/web_contents.h" ++#include "content/public/browser/web_ui_controller_factory.h" ++#include "content/public/browser/web_ui_data_source.h" ++#include "content/public/common/content_client.h" ++#include "content/public/common/url_constants.h" ++#include "content/public/test/browser_test_utils.h" ++#include "content/public/test/no_renderer_crashes_assertion.h" ++#include "content/public/test/test_utils.h" ++#include "services/service_manager/public/cpp/binder_map.h" ++#include "testing/gtest/include/gtest/gtest.h" ++#include "ui/base/resource/resource_bundle.h" ++#include "url/gurl.h" ++ ++namespace { ++ ++// WebUIController that provides the Foo Mojo API. ++class FooUI : public ui::MojoWebUIController, public ::test::mojom::Foo { ++ public: ++ explicit FooUI(content::WebUI* web_ui) ++ : ui::MojoWebUIController(web_ui), foo_receiver_(this) { ++ content::WebUIDataSource* data_source = ++ content::WebUIDataSource::Create("foo"); ++ data_source->SetDefaultResource(IDR_MOJO_WEB_UI_CONTROLLER_TEST_HTML); ++ data_source->DisableContentSecurityPolicy(); ++ data_source->AddResourcePath("foobar.mojom-lite.js", ++ IDR_FOOBAR_MOJO_LITE_JS); ++ content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(), ++ data_source); ++ } ++ ++ void BindInterface(mojo::PendingReceiver<::test::mojom::Foo> receiver) { ++ foo_receiver_.Bind(std::move(receiver)); ++ } ++ ++ // ::test::mojom::Foo: ++ void GetFoo(GetFooCallback callback) override { ++ std::move(callback).Run("foofoo"); ++ } ++ ++ WEB_UI_CONTROLLER_TYPE_DECL(); ++ ++ private: ++ mojo::Receiver<::test::mojom::Foo> foo_receiver_; ++ ++ DISALLOW_COPY_AND_ASSIGN(FooUI); ++}; ++ ++WEB_UI_CONTROLLER_TYPE_IMPL(FooUI) ++ ++// WebUIController that provides the Foo and Bar Mojo APIs. ++class FooBarUI : public ui::MojoWebUIController, ++ public ::test::mojom::Foo, ++ public ::test::mojom::Bar { ++ public: ++ explicit FooBarUI(content::WebUI* web_ui) ++ : ui::MojoWebUIController(web_ui), ++ foo_receiver_(this), ++ bar_receiver_(this) { ++ content::WebUIDataSource* data_source = ++ content::WebUIDataSource::Create("foobar"); ++ data_source->SetDefaultResource(IDR_MOJO_WEB_UI_CONTROLLER_TEST_HTML); ++ data_source->DisableContentSecurityPolicy(); ++ data_source->AddResourcePath("foobar.mojom-lite.js", ++ IDR_FOOBAR_MOJO_LITE_JS); ++ content::WebUIDataSource::Add(web_ui->GetWebContents()->GetBrowserContext(), ++ data_source); ++ } ++ ++ void BindInterface(mojo::PendingReceiver<::test::mojom::Foo> receiver) { ++ foo_receiver_.Bind(std::move(receiver)); ++ } ++ ++ void BindInterface(mojo::PendingReceiver<::test::mojom::Bar> receiver) { ++ bar_receiver_.Bind(std::move(receiver)); ++ } ++ ++ // ::test::mojom::Foo: ++ void GetFoo(GetFooCallback callback) override { ++ std::move(callback).Run("foobarfoo"); ++ } ++ ++ // ::test::mojom::Bar: ++ void GetBar(GetBarCallback callback) override { ++ std::move(callback).Run("foobarbar"); ++ } ++ ++ WEB_UI_CONTROLLER_TYPE_DECL(); ++ ++ private: ++ mojo::Receiver<::test::mojom::Foo> foo_receiver_; ++ mojo::Receiver<::test::mojom::Bar> bar_receiver_; ++ ++ DISALLOW_COPY_AND_ASSIGN(FooBarUI); ++}; ++ ++WEB_UI_CONTROLLER_TYPE_IMPL(FooBarUI) ++ ++// WebUIControllerFactory that serves our TestWebUIController. ++class TestWebUIControllerFactory : public content::WebUIControllerFactory { ++ public: ++ TestWebUIControllerFactory() = default; ++ ++ std::unique_ptr<content::WebUIController> CreateWebUIControllerForURL( ++ content::WebUI* web_ui, ++ const GURL& url) override { ++ if (url.host_piece() == "foo") ++ return std::make_unique<FooUI>(web_ui); ++ if (url.host_piece() == "foobar") ++ return std::make_unique<FooBarUI>(web_ui); ++ ++ return nullptr; ++ } ++ ++ content::WebUI::TypeID GetWebUIType(content::BrowserContext* browser_context, ++ const GURL& url) override { ++ if (url.SchemeIs(content::kChromeUIScheme)) ++ return reinterpret_cast<content::WebUI::TypeID>(1); ++ ++ return content::WebUI::kNoWebUI; ++ } ++ ++ bool UseWebUIForURL(content::BrowserContext* browser_context, ++ const GURL& url) override { ++ return url.SchemeIs(content::kChromeUIScheme); ++ } ++ bool UseWebUIBindingsForURL(content::BrowserContext* browser_context, ++ const GURL& url) override { ++ return url.SchemeIs(content::kChromeUIScheme); ++ } ++ ++ private: ++ DISALLOW_COPY_AND_ASSIGN(TestWebUIControllerFactory); ++}; ++ ++} // namespace ++ ++class MojoWebUIControllerBrowserTest : public InProcessBrowserTest { ++ public: ++ MojoWebUIControllerBrowserTest() { ++ factory_ = std::make_unique<TestWebUIControllerFactory>(); ++ content::WebUIControllerFactory::RegisterFactory(factory_.get()); ++ } ++ ++ void SetUpOnMainThread() override { ++ base::FilePath pak_path; ++ ASSERT_TRUE(base::PathService::Get(base::DIR_MODULE, &pak_path)); ++ pak_path = pak_path.AppendASCII("browser_tests.pak"); ++ ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath( ++ pak_path, ui::SCALE_FACTOR_NONE); ++ ++ content::SetBrowserClientForTesting(&test_content_browser_client_); ++ } ++ ++ private: ++ class TestContentBrowserClient : public ChromeContentBrowserClient { ++ public: ++ TestContentBrowserClient() = default; ++ TestContentBrowserClient(const TestContentBrowserClient&) = delete; ++ TestContentBrowserClient& operator=(const TestContentBrowserClient&) = ++ delete; ++ ~TestContentBrowserClient() override = default; ++ ++ void RegisterBrowserInterfaceBindersForFrame( ++ content::RenderFrameHost* render_frame_host, ++ service_manager::BinderMapWithContext<content::RenderFrameHost*>* map) ++ override { ++ ChromeContentBrowserClient::RegisterBrowserInterfaceBindersForFrame( ++ render_frame_host, map); ++ chrome::internal::RegisterWebUIControllerInterfaceBinder< ++ ::test::mojom::Bar, FooBarUI>(map); ++ chrome::internal::RegisterWebUIControllerInterfaceBinder< ++ ::test::mojom::Foo, FooUI, FooBarUI>(map); ++ } ++ }; ++ ++ std::unique_ptr<TestWebUIControllerFactory> factory_; ++ ++ TestContentBrowserClient test_content_browser_client_; ++}; ++ ++// Attempting to access bindings succeeds for 2 allowed interfaces. ++IN_PROC_BROWSER_TEST_F(MojoWebUIControllerBrowserTest, BindingsAccess) { ++ content::WebContents* web_contents = ++ browser()->tab_strip_model()->GetActiveWebContents(); ++ ++ ASSERT_TRUE(NavigateToURL(web_contents, content::GetWebUIURL("foobar"))); ++ ++ EXPECT_EQ("foobarfoo", ++ content::EvalJs(web_contents, ++ "(async () => {" ++ " let fooRemote = test.mojom.Foo.getRemote(true);" ++ " let resp = await fooRemote.getFoo();" ++ " return resp.value;" ++ "})()")); ++ ++ EXPECT_EQ("foobarbar", ++ content::EvalJs(web_contents, ++ "(async () => {" ++ " let barRemote = test.mojom.Bar.getRemote(true);" ++ " let resp = await barRemote.getBar();" ++ " return resp.value;" ++ "})()")); ++} ++ ++// Attempting to access bindings crashes the renderer when access not allowed. ++IN_PROC_BROWSER_TEST_F(MojoWebUIControllerBrowserTest, ++ BindingsAccessViolation) { ++ content::WebContents* web_contents = ++ browser()->tab_strip_model()->GetActiveWebContents(); ++ ++ ASSERT_TRUE(NavigateToURL(web_contents, content::GetWebUIURL("foo"))); ++ ++ EXPECT_EQ("foofoo", ++ content::EvalJs(web_contents, ++ "(async () => {" ++ " let fooRemote = test.mojom.Foo.getRemote(true);" ++ " let resp = await fooRemote.getFoo();" ++ " return resp.value;" ++ "})()")); ++ ++ content::ScopedAllowRendererCrashes allow; ++ ++ // Attempt to get a remote for a disallowed interface. ++ EXPECT_FALSE( ++ content::EvalJs(web_contents, ++ "(async () => {" ++ " let barRemote = test.mojom.Bar.getRemote(true);" ++ " let resp = await barRemote.getBar();" ++ " return resp.value;" ++ "})()") ++ .error.empty()); ++ EXPECT_TRUE(web_contents->IsCrashed()); ++} +diff --git a/chrome/test/data/webui/mojo/mojo_web_ui_controller_test.html b/chrome/test/data/webui/mojo/mojo_web_ui_controller_test.html +new file mode 100644 +index 000000000000..4638ebc261c7 +--- /dev/null ++++ b/chrome/test/data/webui/mojo/mojo_web_ui_controller_test.html +@@ -0,0 +1,6 @@ ++<html> ++<head> ++<script src="chrome://resources/mojo/mojo/public/js/mojo_bindings_lite.js"></script> ++<script src="/foobar.mojom-lite.js"></script> ++</head> ++</html> diff --git a/www-client/chromium/files/chromium-compiler-r11.patch b/www-client/chromium/files/chromium-compiler-r11.patch index f910d6fe2d54..f1b958a1170d 100644 --- a/www-client/chromium/files/chromium-compiler-r11.patch +++ b/www-client/chromium/files/chromium-compiler-r11.patch @@ -1,17 +1,17 @@ -From b29cbcb0ff75b564f83ad93273e881e242f08caf Mon Sep 17 00:00:00 2001 +From 137de121a36f9349ad8435fee57940facef82878 Mon Sep 17 00:00:00 2001 From: Mike Gilbert <floppym@gentoo.org> -Date: Wed, 22 Jan 2020 09:05:36 +0000 +Date: Thu, 6 Feb 2020 07:46:57 +0000 Subject: [PATCH] Disable various compiler configs --- - build/config/compiler/BUILD.gn | 75 ++++++++++++---------------------- - 1 file changed, 25 insertions(+), 50 deletions(-) + build/config/compiler/BUILD.gn | 64 +++++++++++++--------------------- + 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 1455a9f..cf19679 100644 +index eef1140..b34b55b 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -270,8 +270,6 @@ config("compiler") { +@@ -260,8 +260,6 @@ config("compiler") { configs += [ # See the definitions below. @@ -20,7 +20,7 @@ index 1455a9f..cf19679 100644 ":compiler_codegen", ":compiler_deterministic", ] -@@ -496,31 +494,6 @@ config("compiler") { +@@ -486,20 +484,6 @@ config("compiler") { } } @@ -36,23 +36,12 @@ index 1455a9f..cf19679 100644 - "-Xclang", - "-instcombine-lower-dbg-declare=0", - ] -- -- if (llvm_force_head_revision) { -- # Before Clang 10, lax vector conversions were allowed by default. -- # Chromium currently relies on this behavior. -- # TODO(crbug.com/1042470): Fix the code and remove this flag. -- if (is_win) { -- cflags += [ "/clang:-flax-vector-conversions=all" ] -- } else if (cros_sdk_version == "") { -- cflags += [ "-flax-vector-conversions=all" ] -- } -- } - } - # C11/C++11 compiler flags setup. # --------------------------- if (is_linux || is_android || (is_nacl && is_clang) || current_os == "aix") { -@@ -1467,6 +1440,12 @@ config("default_warnings") { +@@ -1446,6 +1430,12 @@ config("default_warnings") { cflags_cc += [ "-Wno-class-memaccess" ] } @@ -65,7 +54,7 @@ index 1455a9f..cf19679 100644 # -Wunused-local-typedefs is broken in gcc, # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=63872 cflags += [ "-Wno-unused-local-typedefs" ] -@@ -1592,7 +1571,7 @@ config("chromium_code") { +@@ -1560,7 +1550,7 @@ config("chromium_code") { defines = [ "_HAS_NODISCARD" ] } } else { @@ -74,7 +63,7 @@ index 1455a9f..cf19679 100644 if (treat_warnings_as_errors) { cflags += [ "-Werror" ] -@@ -1601,10 +1580,6 @@ config("chromium_code") { +@@ -1569,10 +1559,6 @@ config("chromium_code") { # well. ldflags = [ "-Werror" ] } @@ -85,7 +74,7 @@ index 1455a9f..cf19679 100644 # In Chromium code, we define __STDC_foo_MACROS in order to get the # C99 macros on Mac and Linux. -@@ -1613,15 +1588,6 @@ config("chromium_code") { +@@ -1581,15 +1567,6 @@ config("chromium_code") { "__STDC_FORMAT_MACROS", ] @@ -101,7 +90,7 @@ index 1455a9f..cf19679 100644 if (is_mac) { cflags_objc = [ "-Wobjc-missing-property-synthesis" ] cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -2025,7 +1991,8 @@ config("default_stack_frames") { +@@ -1993,7 +1970,8 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -111,7 +100,7 @@ index 1455a9f..cf19679 100644 if (is_win) { # TODO(thakis): Remove is_clang here, https://crbug.com/598772 if (is_official_build && full_wpo_on_official && !is_clang) { -@@ -2051,7 +2018,8 @@ config("optimize") { +@@ -2019,7 +1997,8 @@ config("optimize") { } # Same config as 'optimize' but without the WPO flag. @@ -121,7 +110,7 @@ index 1455a9f..cf19679 100644 if (is_win) { # Favor size over speed, /O1 must be before the common flags. The GYP # build also specifies /Os and /GF but these are implied by /O1. -@@ -2074,7 +2042,8 @@ config("optimize_no_wpo") { +@@ -2042,7 +2021,8 @@ config("optimize_no_wpo") { } # Turn off optimizations. @@ -131,7 +120,7 @@ index 1455a9f..cf19679 100644 if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2108,7 +2077,8 @@ config("no_optimize") { +@@ -2076,7 +2056,8 @@ config("no_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -141,7 +130,7 @@ index 1455a9f..cf19679 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2147,7 +2117,8 @@ config("optimize_max") { +@@ -2115,7 +2096,8 @@ config("optimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -151,7 +140,7 @@ index 1455a9f..cf19679 100644 if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2177,7 +2148,8 @@ config("optimize_speed") { +@@ -2145,7 +2127,8 @@ config("optimize_speed") { } } @@ -161,7 +150,7 @@ index 1455a9f..cf19679 100644 cflags = [ "-O1" ] + common_optimize_on_cflags ldflags = common_optimize_on_ldflags visibility = [ ":default_optimization" ] -@@ -2293,7 +2265,8 @@ config("win_pdbaltpath") { +@@ -2261,7 +2244,8 @@ config("win_pdbaltpath") { } # Full symbols. @@ -171,7 +160,7 @@ index 1455a9f..cf19679 100644 if (is_win) { if (use_goma || is_clang) { # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. -@@ -2403,7 +2376,8 @@ config("symbols") { +@@ -2371,7 +2355,8 @@ config("symbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -181,7 +170,7 @@ index 1455a9f..cf19679 100644 if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2458,7 +2432,8 @@ config("minimal_symbols") { +@@ -2426,7 +2411,8 @@ config("minimal_symbols") { } # No symbols. |