diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-01-15 15:51:32 +0000 |
| commit | 21435953e16cda318a82334ddbadb3b5c36d9ea7 (patch) | |
| tree | e1810a4b135afce04b34862ef0fab2bfaeb8aeca /www-client/chromium | |
| parent | 7bc9c63c9da678a7e6fceb095d56c634afd22c56 (diff) | |
gentoo resync : 15.01.2020
Diffstat (limited to 'www-client/chromium')
21 files changed, 372 insertions, 1355 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 7eafa4379e4a..b28f17505446 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,13 +1,4 @@ -AUX chromium-77-clang.patch 411 BLAKE2B 95209cbf367f62cd77c7acad3b4a0e55e0f3fd509e58a53cbd3579edf37211f4a55180f77e8b1589fdeb0b6e1d38ca6eada6d67b08c19fe2a1bd019c587afeb2 SHA512 501c33ef25abf8148c4b0ae474cb354c2a32edfb36a4f041a14a5d1a8706a80395a2e2f117bcc31e5671e6e58710faa29f9ac9dcae8b4af8952310f578a572cc -AUX chromium-77-pulseaudio-13.patch 4402 BLAKE2B 967593e1fdf05d9bb1c7a489b9156024cef3fc7c49a1b1bfefbb8438c42b9bfb807422cc67568d425a37f181e6863d12c9629856852d5ba37f93c0c45919a1d9 SHA512 4aee9b0d31a682da2e4362856532965608a5d718f8f74812bb240b03f94620acb502c9f806c788ea26da386eff0b6c5dfba15cd4ce84b11e6381d70bf59bc483 AUX chromium-77-system-icu.patch 649 BLAKE2B 7910fcb64460ef965eafdd05e98d41d14399fd337ac8f79bcb2c7059fccd61d552ab6efa1dbf8bdcce564716b3d12b41a587077034cb72ef610eff76f4e052d6 SHA512 7413e0cca7102008dd5bee443dcde90be69ef1d0973fee576f70544f0d0a66aa8bc7099e619c89160915d6cd6186384be46ffab4a1d747000133dda9a84e15e5 -AUX chromium-78-gcc-alignas.patch 6152 BLAKE2B 88e7c00a8cad7ee14502398fb95a628287ae1aed7e26d1dc2c53cb5ff0ebc8c0e5f0c0f0d729662dd135513c49953e67b1c5969ed599a264c445c64c8379111a SHA512 5a82def438250a1aa432a7fd7d7e3f815d4c47134741cab4ff76c9530ef4e82570788e2e17522dd63154b67c239e9b3966ba39169939f5a52b85f68a1dd84d45 -AUX chromium-78-gcc-enum-range.patch 1854 BLAKE2B 90ce5f4a75528bb66cbdef7c56aa61b210300ee5846e3a3bcfd7a0f0caca70a0891cd097e20314e161b0d1e26339e814f4be89a024fce3401059922cbd060e1b SHA512 0e785ad63f4a623571d489de3f08fd79b768ede4718f0d3a04359f54be7b4f79970b5fa603529b727da5877e7b190a368b01058a996af6236813cee19ab1fe5e -AUX chromium-78-gcc-noexcept.patch 1338 BLAKE2B 47678f67a6757b5686eaaf03a16d62b10696acd7312f26c887d67c1fd61e29a0a19114c1734c0a127a314fd7b617d415761c30eff2868cdcc6d37dd50926106c SHA512 b0c12022593e8ee2f1d6c6e96a3376cd4f068c1fa1413883bd6d58a15aeb2e8a67bbf9296b1ba922c2c5531b84dfe645d1fd47c7e55558bd8ac350b8ea33a827 -AUX chromium-78-gcc-std-vector.patch 4807 BLAKE2B faa58066c146c7b0e871fde394a89153331cb47d1579160968e627df62971e556e2d621e8aabd7001ca6d810386e110adb848cabf4c1b9b4cd272d95fc816713 SHA512 57e5cb77360602272eeb7c6f1b2c229f00074e971ab277798d65c4ea475b7f65faf28ad8fe0ad9c2024af5567eca782c2016ac7469570274036da4a5bc3fa5ca -AUX chromium-78-icon.patch 489 BLAKE2B 5ed54a0e29c9c5e0cd4a52c8dc8da7d73b1211facee496483d3e6ba9c5e54d8c34a909fa7db7fb7ee535a70ce32058eef3dc6f4f3cc73061a03475a21412bc1f SHA512 28a5070b273cf94904fdcad846f9491c1795c2bda3ae28f4c05b18f228902632fdfe4cfddba2d8de40ea3c17d48bd139de4f1ae7590597563c6cd7d43a9a7ddb -AUX chromium-78-include.patch 1774 BLAKE2B 04c9da33a031dc54945c679b4a2f16ee8a759cf13059b97a2887fe86bfbc9606d6ced49a566b4f4ef6f22d862bdafa7ef770324da33c073cda352a06ef3ccc52 SHA512 0d3c990bdf149c5038bdeb11c65d128a15be1d4450951c7d002cb20bdcdfadb01104cd5d9c290f79784f87bf8d6657367586f464e7ea284a56a7d2e4bcf25bd8 -AUX chromium-78-pm-crash.patch 2078 BLAKE2B e81b6e940cd8b86404a3701cf85ea86da83ebf2602b708bcd8692f88400917af3bdada85c49a1502b87ad22d4893c1e59f08101f3e4d599d5a782eae92d56a1c SHA512 e32a9e5d9d746117be0a59ef91b2d01157fb7613b5411a6f7751312ed61b912709769106281ac6359ad78fa2c0da93fce01e2f481296db061828e19ac6efb8c1 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 @@ -16,23 +7,21 @@ AUX chromium-79-gcc-permissive.patch 3014 BLAKE2B 4b717bd5741e72b9fd0a6dc800abfa 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-blink.patch 1302 BLAKE2B 949f7df1ef1c65904bcd0133e84e8eed68495577c393781cf2b1eae8c6d88e3f2b8db06155a2d96cac920e6a5f6be12f40ceabeeaf93efae249b964d7e587e63 SHA512 caebe245bcaa221b962a636dced8500abeac544bb9ed6e7e310e97ac91656c87d1df4df05630dbf4a6673b2f7822018a063080fc430730b9c59c3bf5681fb32e -AUX chromium-80-gcc-noexcept.patch 1790 BLAKE2B 41ac24639a3234280ca4f6a3c2da70995bace3d6facfe21b2553bc6c4135d8179b913f89518e54a776bb95a2bcd3a60d018f237b2e5422277b1e32e2d526f6c1 SHA512 af5c4b1cf9823bca957d4eda0af378e73341f8b996d71b7d62a255a5b41b03c32c3a9c0cf51425a87b36526ecb7ca48783787b0837cb8781499ba45c2b52ba51 +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 +AUX chromium-80-gcc-permissive.patch 1990 BLAKE2B 2aab6ec5beb470a220d53592f6e86b9bea8f950d52ccd670ed451c2df4339eba527feb2af8566b82885414f72bd789aa806695781e77c3d691f7da2d348bebc9 SHA512 06ac6ce01936a6541334579179b6e922573c9d24cf1ba8b5311f5775dc6571d079b9b7530fa8bb633f53bd16f0ccbbaaa11b3f1b8e241c400cefd9960392eaf8 AUX chromium-80-gcc-quiche.patch 1351 BLAKE2B 7bd967a9f3cd544368c623d3612632cd2bade48ac2c099c4570d5ead62ba28487e1fa222ee0bfe108f3d4f853744d799d2860f703eae3b7d6d36af77cd328508 SHA512 2f147e77d0737370c5dea8b575c0e631476bbce54a7b1c46d0bffeb56706d6ab695b8a9a7e61402430c57ec1f28668dd6682aa5d32d32762fc3ba1735f37542b -AUX chromium-80-include.patch 473 BLAKE2B ab949e188b93b076b637fdc7d8bede7094c1e4ada57bd25f80b1b6590792c568f2b3c3e4f2ff49774592699fb0f8505c87b0ea5ef64877d1c6619eca6bb49959 SHA512 90f73d25eafd984d9f63b479bd6f3dbe59cfdcaf61bceee6ed267b1ce2ec1e917d892b89630f7f68ac87b71d37e906bc0b5fd07b919c3ed49fc04777f69bd474 +AUX chromium-80-include.patch 1495 BLAKE2B a5ed4a0df55a24498b3e88c191ecf8f87873b6a8d826f5daa6df3234593d5996257d31c5ce116b078990010633e8e8bbac0e66027329afea3355959d8fae3fa8 SHA512 c73c7af2612b80b110e10fe887cab442aebc1e23bc87cc5819384be9aa0283475fb957e3fd637d6b890411adde38c8206b1f1d998127938808c307bee0636e94 AUX chromium-80-unbundle-libxml.patch 2990 BLAKE2B 63068fef2333d9d111bfe66a78efd71088c76b08b4e5014b244012df682024ceb0db8441254481189fc449f16cbeab7f650c8cab30f9d37dedf89c2dbea1bae9 SHA512 87ef07a35a103c5b4293301705a09a60199d569fceeab1e3188c7b96067d39f237441209f4448a791dc5675321f609ee5c02fdda1081af38e50adcd15de4e0b6 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca AUX chromium-compiler-r10.patch 5917 BLAKE2B a16ea6a1eee56a7de06f82e161536dab19a507f675fe8268b5a455bf36b9f5e6c1df02de73b303ab61e33153f06f118e22623d01f654d4a7c88ca8c3f8326401 SHA512 e64f9f75e685868cb8da8851e84362952a18e5dbca674c853a41feb582bdd4dc59219727f2c77440ec2030e21d7b436f144c552c30b2a4960cbe0da32c6f6c5e 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-widevine-r4.patch 1155 BLAKE2B 7ba02c4b80883fa7ae5c46d95072798683bdc5c9d65b3cab40e6a3c21b29ce7eb9c45493ec10e522341033a80132818f946569ee774c662daafa4e09fbc2a988 SHA512 8f78c0e22f14f81f1903a77b315c7818603caaadbb5d517a3184a11e9553b99fd42d5a1d2ff19b3d79c03352b2e279a5102afa2fa66f276da2d9c42988a94366 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 -DIST chromium-78-revert-noexcept-r1.patch.gz 12094 BLAKE2B 1fd0c939af773ed398c9ab14fa80b042b4237cabdbcb06425e4d1c72200ec49c3c1383cfc95013cce4df411b0a2397b79030d41a0379ae80a0c60bae1fbb5ffa SHA512 dcb62b82b34d5d6982762cacfe3ab7d3538d908b3befe7666f5d70d98ba4f979b5bf056e5c5343ed76aa744a643318fc5a75ddedfcb1b7de3e7c28eb2587439f -DIST chromium-78.0.3904.108.tar.xz 742906260 BLAKE2B 4ec325911d502d0832764a2a70a51c680e3c3828127ae06c2cbc6b5604f25d416b4ed2e070054145d6f63605ba0610e8cca7a4d64ee4674abfbc1e2090999740 SHA512 9801634358974dbe61484963599719b7c5571d32c70d7568287ab6b72054ed82afa146a0470c53129266a9fbc4a24dc50a43d552b8f1756776907c2760f15589 -DIST chromium-79.0.3945.79.tar.xz 778215132 BLAKE2B 6998d8caf1fc7160d59fe894b66b34d40c7889d99ad04b3714a2203d8da395351cb7b5c2d112daad478af34ce377c98198f8a50118ff63cf87cf6678c2f0f738 SHA512 783473ea68f26656a86c6a9e726fcc6331d80860d6bb9e5ece6d71c120c3e80fc97ef867c720fe14121b3ba4599452bc40610e56900b2ffd813b9c4f415d644d -DIST chromium-80.0.3970.5.tar.xz 789810132 BLAKE2B 400fcefeb58cb784412eca7011267c9224786036494337ecb8dbc7f3f483ec05d6e26c424ef55286cbebdbc872e1c15acfb62413264bb8843334a11bbe73ab4d SHA512 398666d81beaeef3eeb3f00a9a512b2d4c4e74bd9f01f20fab06901eadcb6fdbd345c39c54f2af57c4e485f2cd35700cde6f6a3d6301df7ee920bf067bee31d6 -EBUILD chromium-78.0.3904.108.ebuild 22982 BLAKE2B 8e427972b294bbf974b4634b450c1114f7e1dab5559efa8df5ecd6532b41d4c562663c212b032c9eeac4054216dcd5acecff5bfa23a353a59ba4c53c62dacadf SHA512 c6812c14c89182ea0b72aebc21ded27f8b7097d5537db6e33b3a794bc5ebad461c1af2cdf984325bd64a5e52968f66ee3c41041489190b701ebe3d3d22a600b4 -EBUILD chromium-79.0.3945.79.ebuild 22704 BLAKE2B 68f3f881a3ad4c30ee192640008a6b3a72d25bbc079df4da0157aa6c0ccc70830cad5369a51731e19ae4883ca76afe0723b74aba8b280e6be3303084be513ddc SHA512 e112a12655adcae3ce9c448aea260c1f660d6233891bbdd931c3953863b2534e1673d165daeffb0ed39c0bad8688cb335f6f9767a53487853124612f1dca20c3 -EBUILD chromium-80.0.3970.5.ebuild 22747 BLAKE2B b28b4d182fedd2434af3473ca41bf497e07db9a7bffdb8476cf233ab4c47314e536dc014e21c8c3ba8e264ec6d0ca8f88fafc2364d0f9642a3247d734a4e1a13 SHA512 5214dd4b5b83f7aa062e5a70f478b49d07f08975ca073f7d74084f7c8e3a407d424bbbe4565baea7337720bf31b4236a1948538da1579ac5a1431120e21e68e3 -MISC metadata.xml 1538 BLAKE2B 6c68f673e2892063f4b7a5afc8314356e3e8182d8765a193c36be7ed6b61e7680dbd0a58e2386904ff2877c81ad45cdae07754996f706f986f16f3a159500930 SHA512 16e98f9dc01cfdce307dd17fc2ba83ff1eff10eaeb65aaf9154b0dedfc61086334d56f50b6ce1d673715148e29e045eb0eed21495efef942ef56e4ba4e514187 +DIST chromium-79.0.3945.117.tar.xz 778215364 BLAKE2B 0803710f12bbaa65c186927068feffb7a8028203b93c1bc7e77f967fad0ad25188e1b0fd76b2b3adc256bfcd0f838fa79c6a93720b453875ee103b7d544fe684 SHA512 bba4f52eec8011f92e3098d29269d978b6e2571593b66c93bf6767bab00f7984e733e6df5fde883b9f643e86b1ad527c3ec7d43ba381b48935512ad82e931e26 +DIST chromium-80.0.3987.42.tar.xz 798712640 BLAKE2B ab2ec22f38e757b1cdeec1584a68839400433747768d55c871dc925a25574181945650a03510e76320622055c75d6a0567bc19954f1fcaeb11c2d6ca7afe7588 SHA512 9d2d159309b0e93f09e9783f555740fa7ed723eb4484bae8a3e118b74edd6aec6e12b7cd354c80dbfff2515c1a04b8e058f0bc54c839722afb7c44af06f81b2a +EBUILD chromium-79.0.3945.117.ebuild 22703 BLAKE2B c69e08a9bfdd3ec572888a740198cf3a810fa772c024cc42532cfa21ee578d9e28d7bf60b6b092b658663e432cdf355564a57594f50b02f33b8c0398252edccc SHA512 a94ba1b8cff2712134d77f502b9ae33f6125a899e8a894b0bf4141c68f6d12b8ae9cefad38d5056b688079052f021d3a1b71bec6cf89f8eb97ef38ff13d74965 +EBUILD chromium-80.0.3987.42.ebuild 22828 BLAKE2B 902ce746f3cc07107fef5443a7ea600b9f7c5e04415db743846e2dc4247c96340f19973de551e6fd5e5aad00a42c5c5b528b49f6e393d72837561ca704b36bc7 SHA512 36c4baa9b1b31b9d5f38bd8db425d59c018378ca277968f27fb0ab060caf067a05d7b03ba4582eeb039be42590f105e48a7d51352d9ef914ef26fe7adf2528a7 +MISC metadata.xml 1456 BLAKE2B cf9ade50335e564cd481d2a9da288ee97d9fe086a948f3226459acc918e9b25d1f61e8384cb4300f9ae253cdd1ea250cdd308784e7cf8fff4b443193e84906d5 SHA512 b0abba4bb13d33ca955db05411a135a66389099ee623c84dcc2ba6f4cd7fe222d5976adbf297767f4bd1e311b765c4500bf43713e5e6daaf0ef45d4fe8894ca7 diff --git a/www-client/chromium/chromium-78.0.3904.108.ebuild b/www-client/chromium/chromium-78.0.3904.108.ebuild deleted file mode 100644 index de0984e85449..000000000000 --- a/www-client/chromium/chromium-78.0.3904.108.ebuild +++ /dev/null @@ -1,742 +0,0 @@ -# Copyright 2009-2019 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 - https://dev.gentoo.org/~floppym/dist/chromium-78-revert-noexcept-r1.patch.gz -" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="+closure-compile component-build cups cpu_flags_arm_neon gnome-keyring +hangouts jumbo-build 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-64:= ) - >=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-widevine-r4.patch" - "${FILESDIR}/chromium-fix-char_traits.patch" - "${FILESDIR}/chromium-unbundle-zlib-r1.patch" - "${FILESDIR}/chromium-77-system-icu.patch" - "${FILESDIR}/chromium-77-clang.patch" - "${FILESDIR}/chromium-77-pulseaudio-13.patch" - "${FILESDIR}/chromium-78-include.patch" - "${FILESDIR}/chromium-78-icon.patch" - "${FILESDIR}/chromium-78-protobuf-export.patch" - "${FILESDIR}/chromium-78-pm-crash.patch" - "${WORKDIR}/chromium-78-revert-noexcept-r1.patch" - "${FILESDIR}/chromium-78-gcc-enum-range.patch" - "${FILESDIR}/chromium-78-gcc-std-vector.patch" - "${FILESDIR}/chromium-78-gcc-noexcept.patch" - "${FILESDIR}/chromium-78-gcc-alignas.patch" - "${FILESDIR}/chromium-79-icu-65.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/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" - append-cxxflags -fpermissive - 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)" - - # https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md - myconf_gn+=" use_jumbo_build=$(usex jumbo-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 - - 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-79.0.3945.79.ebuild b/www-client/chromium/chromium-79.0.3945.117.ebuild index b9c079e9a87f..76a0f4f0682a 100644 --- a/www-client/chromium/chromium-79.0.3945.79.ebuild +++ b/www-client/chromium/chromium-79.0.3945.117.ebuild @@ -1,4 +1,4 @@ -# Copyright 2009-2019 Gentoo Authors +# Copyright 2009-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -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-80.0.3970.5.ebuild b/www-client/chromium/chromium-80.0.3987.42.ebuild index c6af893cb110..1df1ef1ffe20 100644 --- a/www-client/chromium/chromium-80.0.3970.5.ebuild +++ b/www-client/chromium/chromium-80.0.3987.42.ebuild @@ -1,4 +1,4 @@ -# Copyright 2009-2019 Gentoo Authors +# Copyright 2009-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,7 +33,7 @@ COMMON_DEPEND=" dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= - >=dev-libs/re2-0.2016.11.01:= + >=dev-libs/re2-0.2019.08.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= @@ -51,7 +51,7 @@ COMMON_DEPEND=" >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12-r0 - media-libs/opus:= + >=media-libs/opus-1.3.1:= ) sys-apps/dbus:= sys-apps/pciutils:= @@ -148,9 +148,11 @@ PATCHES=( "${FILESDIR}/chromium-79-gcc-alignas.patch" "${FILESDIR}/chromium-80-unbundle-libxml.patch" "${FILESDIR}/chromium-80-include.patch" - "${FILESDIR}/chromium-80-gcc-noexcept.patch" "${FILESDIR}/chromium-80-gcc-quiche.patch" + "${FILESDIR}/chromium-80-gcc-permissive.patch" "${FILESDIR}/chromium-80-gcc-blink.patch" + "${FILESDIR}/chromium-80-gcc-abstract.patch" + "${FILESDIR}/chromium-80-gcc-incomplete-type.patch" ) pre_build_checks() { @@ -275,8 +277,8 @@ src_prepare() { third_party/dom_distiller_js third_party/emoji-segmenter third_party/flatbuffers - third_party/flot third_party/freetype + third_party/libgifcodec third_party/glslang third_party/google_input_tools third_party/google_input_tools/third_party/closure_library @@ -344,7 +346,6 @@ src_prepare() { 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 diff --git a/www-client/chromium/files/chromium-77-clang.patch b/www-client/chromium/files/chromium-77-clang.patch deleted file mode 100644 index a57b5a458a4d..000000000000 --- a/www-client/chromium/files/chromium-77-clang.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/base/location.h b/base/location.h -index c07e747..924db1c 100644 ---- a/base/location.h -+++ b/base/location.h -@@ -18,7 +18,7 @@ - - namespace base { - --#if defined(__has_builtin) -+#if defined(__clang__) - // Clang allows detection of these builtins. - #define SUPPORTS_LOCATION_BUILTINS \ - (__has_builtin(__builtin_FUNCTION) && __has_builtin(__builtin_FILE) && \ diff --git a/www-client/chromium/files/chromium-77-pulseaudio-13.patch b/www-client/chromium/files/chromium-77-pulseaudio-13.patch deleted file mode 100644 index 892a3183c9da..000000000000 --- a/www-client/chromium/files/chromium-77-pulseaudio-13.patch +++ /dev/null @@ -1,82 +0,0 @@ -From 7ac85fb4cc6f44a21761a591ac497ae3d6bf966d Mon Sep 17 00:00:00 2001 -From: Allan Sandfeld Jensen <allan.jensen@qt.io> -Date: Mon, 23 Sep 2019 13:49:53 +0200 -Subject: [PATCH] Fix building with pulseaudio 13 - -The function signature changed though the ABI stayed the same. - -(Modified to apply on chromium sources too) - -Change-Id: I86ca361b5e4f0c523e1031910df438c23beee876 -Fixes: QTBUG-77037 -Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io> ---- - -diff --git a/media/audio/pulse/pulse.sigs b/media/audio/pulse/pulse.sigs -index 8b58887..daaeb14 100644 ---- a/media/audio/pulse/pulse.sigs -+++ b/media/audio/pulse/pulse.sigs -@@ -24,11 +24,11 @@ - pa_operation* pa_context_get_source_info_by_name(pa_context* c, const char* name, pa_source_info_cb_t cb, void *userdata); - pa_operation* pa_context_get_source_info_list(pa_context* c, pa_source_info_cb_t cb, void* userdata); - pa_operation* pa_context_get_sink_info_list(pa_context* c, pa_sink_info_cb_t cb, void* userdata); --pa_context_state_t pa_context_get_state(pa_context* c); -+pa_context_state_t pa_context_get_state(const_pa_context_ptr c); - pa_context* pa_context_new(pa_mainloop_api* mainloop, const char* name); - pa_operation* pa_context_set_source_volume_by_index(pa_context* c, uint32_t idx, const pa_cvolume* volume, pa_context_success_cb_t cb, void* userdata); - void pa_context_set_state_callback(pa_context* c, pa_context_notify_cb_t cb, void* userdata); --pa_operation_state_t pa_operation_get_state(pa_operation* o); -+pa_operation_state_t pa_operation_get_state(const_pa_operation_ptr o); - void pa_context_unref(pa_context* c); - void pa_operation_unref(pa_operation* o); - int pa_stream_begin_write(pa_stream* p, void** data, size_t* nbytes); -@@ -38,23 +38,23 @@ - int pa_stream_disconnect(pa_stream* s); - int pa_stream_drop(pa_stream *p); - pa_operation* pa_stream_flush(pa_stream* s, pa_stream_success_cb_t cb, void* userdata); --uint32_t pa_stream_get_device_index(pa_stream* s); -+uint32_t pa_stream_get_device_index(const_pa_stream_ptr s); - int pa_stream_get_latency(pa_stream* s, pa_usec_t* r_usec, int* negative); --pa_stream_state_t pa_stream_get_state(pa_stream* p); -+pa_stream_state_t pa_stream_get_state(const_pa_stream_ptr p); - pa_stream* pa_stream_new(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map * map); - pa_stream* pa_stream_new_with_proplist(pa_context* c, const char* name, const pa_sample_spec* ss, const pa_channel_map* map, pa_proplist* p); - pa_proplist* pa_proplist_new(void); --int pa_proplist_contains(pa_proplist* p, const char* key); -+int pa_proplist_contains(const_pa_proplist_ptr p, const char* key); - void pa_proplist_free(pa_proplist* p); --const char* pa_proplist_gets(pa_proplist* p, const char* key); -+const char* pa_proplist_gets(const_pa_proplist_ptr p, const char* key); - int pa_proplist_sets(pa_proplist* p, const char* key, const char* value); --size_t pa_stream_readable_size(pa_stream *p); -+size_t pa_stream_readable_size(const_pa_stream_ptr p); - int pa_stream_peek(pa_stream* p, const void** data, size_t* nbytes); - void pa_stream_set_read_callback(pa_stream* p, pa_stream_request_cb_t cb, void* userdata); - void pa_stream_set_state_callback(pa_stream* s, pa_stream_notify_cb_t cb, void* userdata); - int pa_stream_write(pa_stream* p, const void* data, size_t nbytes, pa_free_cb_t free_cb, int64_t offset, pa_seek_mode_t seek); - void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata); - void pa_stream_unref(pa_stream* s); --int pa_context_errno(pa_context *c); -+int pa_context_errno(const_pa_context_ptr c); - const char* pa_strerror(int error); - pa_cvolume* pa_cvolume_set(pa_cvolume* a, unsigned channels, pa_volume_t v); -diff --git a/chromium/media/audio/pulse/pulse_stub_header.fragment b/chromium/media/audio/pulse/pulse_stub_header.fragment -index 2a2d3e7..cdaa841 100644 ---- a/media/audio/pulse/pulse_stub_header.fragment -+++ b/media/audio/pulse/pulse_stub_header.fragment -@@ -5,4 +5,15 @@ - - #include <pulse/pulseaudio.h> - -+#if PA_MAJOR > 12 -+typedef const pa_context* const_pa_context_ptr; -+typedef const pa_operation* const_pa_operation_ptr; -+typedef const pa_proplist* const_pa_proplist_ptr; -+typedef const pa_stream* const_pa_stream_ptr; -+#else -+typedef pa_context* const_pa_context_ptr; -+typedef pa_operation* const_pa_operation_ptr; -+typedef pa_proplist* const_pa_proplist_ptr; -+typedef pa_stream* const_pa_stream_ptr; -+#endif - } diff --git a/www-client/chromium/files/chromium-78-gcc-alignas.patch b/www-client/chromium/files/chromium-78-gcc-alignas.patch deleted file mode 100644 index 4f6039c2f5a7..000000000000 --- a/www-client/chromium/files/chromium-78-gcc-alignas.patch +++ /dev/null @@ -1,142 +0,0 @@ -From 6b633c4b14850df376d5cec571699018772f358e Mon Sep 17 00:00:00 2001 -From: Tomas Popela <tomas.popela@gmail.com> -Date: Tue, 17 Sep 2019 19:48:48 +0000 -Subject: [PATCH] GCC: Can't use alignas() together with __attribute__() - -It's because GCC has problems when mixing the alignas() together with -__attribute__() (that is used to export the symbols). The best -solution is to use ALIGNAS() macro from //base/compiler_specific.h -together with alignof() to have the equal functionality that compiles on -GCC as well as on clang. - -Bug: 819294 -Change-Id: Ieb169592a2965f17a18bfc88d28418eb723a4e5a -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1806735 -Auto-Submit: Tom Popela <tomas.popela@gmail.com> -Commit-Queue: Alex Clarke <alexclarke@chromium.org> -Reviewed-by: Alex Clarke <alexclarke@chromium.org> -Cr-Commit-Position: refs/heads/master@{#697330} ---- - -diff --git a/base/task/promise/dependent_list.h b/base/task/promise/dependent_list.h -index 020bdbfc..3245c1c 100644 ---- a/base/task/promise/dependent_list.h -+++ b/base/task/promise/dependent_list.h -@@ -59,7 +59,7 @@ - - // Align Node on an 8-byte boundary to ensure the first 3 bits are 0 and can - // be used to store additional state (see static_asserts below). -- class BASE_EXPORT alignas(8) Node { -+ class BASE_EXPORT ALIGNAS(8) Node { - public: - Node(); - explicit Node(Node&& other) noexcept; - -Re-use chromium alignas workaround in protobuf. ---- - -diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc -index f1bd85d..9c204a1 100644 ---- a/third_party/protobuf/src/google/protobuf/port_def.inc -+++ b/third_party/protobuf/src/google/protobuf/port_def.inc -@@ -528,6 +528,35 @@ PROTOBUF_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport)); - #undef IN - #endif // _MSC_VER - -+// Specify memory alignment for structs, classes, etc. -+// Use like: -+// class PROTOBUF_ALIGNAS(16) MyClass { ... } -+// PROTOBUF_ALIGNAS(16) int array[4]; -+// -+// In most places you can use the C++11 keyword "alignas", which is preferred. -+// -+// But compilers have trouble mixing __attribute__((...)) syntax with -+// alignas(...) syntax. -+// -+// Doesn't work in clang or gcc: -+// struct alignas(16) __attribute__((packed)) S { char c; }; -+// Works in clang but not gcc: -+// struct __attribute__((packed)) alignas(16) S2 { char c; }; -+// Works in clang and gcc: -+// struct alignas(16) S3 { char c; } __attribute__((packed)); -+// -+// There are also some attributes that must be specified *before* a class -+// definition: visibility (used for exporting functions/classes) is one of -+// these attributes. This means that it is not possible to use alignas() with a -+// class that is marked as exported. -+#if defined(_MSC_VER) -+#define PROTOBUF_ALIGNAS(byte_alignment) __declspec(align(byte_alignment)) -+#elif defined(__GNUC__) -+#define PROTOBUF_ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment))) -+#else -+#define PROTOBUF_ALIGNAS(byte_alignment) alignas(byte_alignment) -+#endif -+ - #if defined(__clang__) - #pragma clang diagnostic push - // TODO(gerbens) ideally we cleanup the code. But a cursory try shows many -diff --git a/third_party/protobuf/src/google/protobuf/arena.h b/third_party/protobuf/src/google/protobuf/arena.h -index dedc221..a8515ce 100644 ---- a/third_party/protobuf/src/google/protobuf/arena.h -+++ b/third_party/protobuf/src/google/protobuf/arena.h -@@ -245,7 +245,7 @@ struct ArenaOptions { - // well as protobuf container types like RepeatedPtrField and Map. The protocol - // is internal to protobuf and is not guaranteed to be stable. Non-proto types - // should not rely on this protocol. --class PROTOBUF_EXPORT alignas(8) Arena final { -+class PROTOBUF_EXPORT PROTOBUF_ALIGNAS(8) Arena final { - public: - // Arena constructor taking custom options. See ArenaOptions below for - // descriptions of the options available. -diff --git a/third_party/protobuf/src/google/protobuf/port_def.inc b/third_party/protobuf/src/google/protobuf/port_def.inc -index f1bd85d..6d02b53 100644 ---- a/third_party/protobuf/src/google/protobuf/port_def.inc -+++ b/third_party/protobuf/src/google/protobuf/port_def.inc -@@ -528,6 +528,35 @@ PROTOBUF_EXPORT_TEMPLATE_TEST(DEFAULT, __declspec(dllimport)); - #undef IN - #endif // _MSC_VER - -+// Specify memory alignment for structs, classes, etc. -+// Use like: -+// class PROTOBUF_ALIGNAS(16) MyClass { ... } -+// PROTOBUF_ALIGNAS(16) int array[4]; -+// -+// In most places you can use the C++11 keyword "alignas", which is preferred. -+// -+// But compilers have trouble mixing __attribute__((...)) syntax with -+// alignas(...) syntax. -+// -+// Doesn't work in clang or gcc: -+// struct alignas(16) __attribute__((packed)) S { char c; }; -+// Works in clang but not gcc: -+// struct __attribute__((packed)) alignas(16) S2 { char c; }; -+// Works in clang and gcc: -+// struct alignas(16) S3 { char c; } __attribute__((packed)); -+// -+// There are also some attributes that must be specified *before* a class -+// definition: visibility (used for exporting functions/classes) is one of -+// these attributes. This means that it is not possible to use alignas() with a -+// class that is marked as exported. -+#if defined(_MSC_VER) -+#define PROTOBUF_ALIGNAS(byte_alignment) __declspec(align(byte_alignment)) -+#elif defined(__GNUC__) -+#define PROTOBUF_ALIGNAS(byte_alignment) __attribute__((aligned(byte_alignment))) -+#else -+#define PROTOBUF_ALIGNAS(byte_alignment) alignas(byte_alignment) -+#endif -+ - #if defined(__clang__) - #pragma clang diagnostic push - // TODO(gerbens) ideally we cleanup the code. But a cursory try shows many -diff --git a/third_party/protobuf/src/google/protobuf/port_undef.inc b/third_party/protobuf/src/google/protobuf/port_undef.inc -index b7e67fe..ba1fffc 100644 ---- a/third_party/protobuf/src/google/protobuf/port_undef.inc -+++ b/third_party/protobuf/src/google/protobuf/port_undef.inc -@@ -80,6 +80,7 @@ - #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_foj3FJo5StF0OvIzl7oMxA__declspec - #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllexport - #undef PROTOBUF_EXPORT_TEMPLATE_STYLE_MATCH_DECLSPEC_dllimport -+#undef PROTOBUF_ALIGNAS - - - diff --git a/www-client/chromium/files/chromium-78-gcc-enum-range.patch b/www-client/chromium/files/chromium-78-gcc-enum-range.patch deleted file mode 100644 index 9c15e954b4ea..000000000000 --- a/www-client/chromium/files/chromium-78-gcc-enum-range.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 9662ec844017690d5fd56bf0f05ef6a540dd29c1 Mon Sep 17 00:00:00 2001 -From: Tom Anderson <thomasanderson@chromium.org> -Date: Mon, 09 Sep 2019 19:06:01 +0000 -Subject: [PATCH] Fix GCC build error - -Fixes this error: -[ 375s] In file included from ../../base/task/common/intrusive_heap.h:8, -[ 375s] from ../../base/task/thread_pool/task_source.h:17, -[ 375s] from ../../base/task/thread_pool/task_tracker.h:27, -[ 375s] from ./../../base/task/thread_pool/service_thread.cc:14, -[ 375s] from gen/base/base_jumbo_28.cc:5: -[ 375s] ../../base/containers/intrusive_heap.h:152:36: error: enumerator value - '-1' is outside the range of underlying type 'size_t' {aka 'long unsigned int'} -[ 375s] 152 | enum : size_t { kInvalidIndex = -1 }; -[ 375s] | - -Change-Id: I6044fb704931b2f8416f6b19a247ae297cd7b0d6 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1792763 -Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> -Commit-Queue: Lei Zhang <thestig@chromium.org> -Reviewed-by: Lei Zhang <thestig@chromium.org> -Auto-Submit: Thomas Anderson <thomasanderson@chromium.org> -Cr-Commit-Position: refs/heads/master@{#694853} ---- - -diff --git a/base/containers/intrusive_heap.h b/base/containers/intrusive_heap.h -index 53d3909..d7626bb 100644 ---- a/base/containers/intrusive_heap.h -+++ b/base/containers/intrusive_heap.h -@@ -131,6 +131,7 @@ - - #include <algorithm> - #include <functional> -+#include <limits> - #include <type_traits> - #include <utility> - #include <vector> -@@ -149,7 +150,7 @@ - // in place. - class BASE_EXPORT HeapHandle { - public: -- enum : size_t { kInvalidIndex = -1 }; -+ enum : size_t { kInvalidIndex = std::numeric_limits<size_t>::max() }; - - constexpr HeapHandle() = default; - constexpr HeapHandle(const HeapHandle& other) = default; diff --git a/www-client/chromium/files/chromium-78-gcc-noexcept.patch b/www-client/chromium/files/chromium-78-gcc-noexcept.patch deleted file mode 100644 index 8ddb53fe82d2..000000000000 --- a/www-client/chromium/files/chromium-78-gcc-noexcept.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d16cda8fc3476cc534a756873cc8aa2692a57054 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Thu, 22 Aug 2019 13:13:36 +0200 -Subject: [PATCH] GCC: declare noexcept move constructor/assign operators of V8StackTraceId - -blink::BlinkCloneableMessage declares default implementation of -move operator/assign operator that requires v8_inspector::V8StackTraceId -to declare its move constructor/assign operator too. - -Bug: chromium:819294 -Change-Id: Iaf626ee8245efcba372a17cdf2de448e691d41d6 -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1796062 -Commit-Queue: José Dapena Paz <jose.dapena@lge.com> -Reviewed-by: Yang Guo <yangguo@chromium.org> -Cr-Commit-Position: refs/heads/master@{#63799} ---- - -diff --git a/v8/include/v8-inspector.h b/v8/include/v8-inspector.h -index ce5b777..ed4cdec 100644 ---- a/v8/include/v8-inspector.h -+++ b/v8/include/v8-inspector.h -@@ -231,7 +231,10 @@ struct V8_EXPORT V8StackTraceId { - std::pair<int64_t, int64_t> debugger_id; - - V8StackTraceId(); -+ V8StackTraceId(const V8StackTraceId&) = default; - V8StackTraceId(uintptr_t id, const std::pair<int64_t, int64_t> debugger_id); -+ V8StackTraceId& operator=(const V8StackTraceId&) = default; -+ V8StackTraceId& operator=(V8StackTraceId&&) noexcept = default; - ~V8StackTraceId() = default; - - bool IsInvalid() const; diff --git a/www-client/chromium/files/chromium-78-gcc-std-vector.patch b/www-client/chromium/files/chromium-78-gcc-std-vector.patch deleted file mode 100644 index cf1abf06b5a1..000000000000 --- a/www-client/chromium/files/chromium-78-gcc-std-vector.patch +++ /dev/null @@ -1,87 +0,0 @@ -From f4c3c329588b78af63aad8b401da767242b86709 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> -Date: Mon, 16 Sep 2019 17:05:42 +0000 -Subject: [PATCH] dns_util: Make DohUpgradeEntry non-const when used with std::vector<> - -This fixes the build with libstdc++ (with most other standard libraries -other than libc++, in fact) after commit f93a48e3 ("Allow upgrade to DoH -during automatic mode"): - -../../../../../../usr/bin/../lib/gcc/x86_64-redhat-linux/8/../../../../include/c++/8/bits/stl_vector.h:351:7: error: static_assert failed due to requirement 'is_same<typename remove_cv<const DohUpgradeEntry>::type, const DohUpgradeEntry>::value' "std::vector must have a non-const, non-volatile value_type" - static_assert(is_same<typename remove_cv<_Tp>::type, _Tp>::value, - ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -../../base/no_destructor.h:77:28: note: in instantiation of template class 'std::vector<const net::(anonymous namespace)::DohUpgradeEntry, std::allocator<const net::(anonymous namespace)::DohUpgradeEntry> >' requested here - alignas(T) char storage_[sizeof(T)]; - ^ -../../net/dns/dns_util.cc:147:7: note: in instantiation of template class 'base::NoDestructor<std::vector<const net::(anonymous namespace)::DohUpgradeEntry, std::allocator<const net::(anonymous namespace)::DohUpgradeEntry> > >' requested here - upgradable_servers({ - ^ -../../net/dns/dns_util.cc:230:36: error: invalid range expression of type 'const std::vector<const net::(anonymous namespace)::DohUpgradeEntry, std::allocator<const net::(anonymous namespace)::DohUpgradeEntry> >'; no viable 'begin' function available - for (const auto& upgrade_entry : upgradable_servers) { - ^ ~~~~~~~~~~~~~~~~~~ - -The C++ standard forbids containers of const elements. Callers of -GetDohUpgradeList() use it in a safe way anyway, and most of -DohUpgradeEntry's members are const. - -(Added gcc specific workaround) - -Bug: 957519 -Change-Id: I826a51823edb1184c0fae27105101e2894efe568 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1805636 -Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> -Commit-Queue: Eric Orth <ericorth@chromium.org> -Reviewed-by: Eric Orth <ericorth@chromium.org> -Cr-Commit-Position: refs/heads/master@{#696834} ---- - -diff --git a/net/dns/dns_util.cc b/net/dns/dns_util.cc -index d83ff7c..14997c4 100644 ---- a/net/dns/dns_util.cc -+++ b/net/dns/dns_util.cc -@@ -139,12 +139,12 @@ struct DohUpgradeEntry { - const DnsConfig::DnsOverHttpsServerConfig dns_over_https_config; - }; - --const std::vector<const DohUpgradeEntry>& GetDohUpgradeList() { -+const std::vector<DohUpgradeEntry>& GetDohUpgradeList() { - // The provider names in these entries should be kept in sync with the - // DohProviderId histogram suffix list in - // tools/metrics/histograms/histograms.xml. -- static const base::NoDestructor<std::vector<const DohUpgradeEntry>> -- upgradable_servers({ -+ static const base::NoDestructor<std::vector<DohUpgradeEntry>> -+ upgradable_servers(std::initializer_list<DohUpgradeEntry>{ - DohUpgradeEntry( - "CleanBrowsingAdult", - {"185.228.168.10", "185.228.169.11", "2a0d:2a00:1::1", -@@ -222,8 +222,7 @@ const std::vector<const DohUpgradeEntry>& GetDohUpgradeList() { - std::vector<const DohUpgradeEntry*> GetDohUpgradeEntriesFromNameservers( - const std::vector<IPEndPoint>& dns_servers, - const std::vector<std::string>& excluded_providers) { -- const std::vector<const DohUpgradeEntry>& upgradable_servers = -- GetDohUpgradeList(); -+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList(); - std::vector<const DohUpgradeEntry*> entries; - - for (const auto& server : dns_servers) { -@@ -417,8 +416,7 @@ std::vector<DnsConfig::DnsOverHttpsServerConfig> - GetDohUpgradeServersFromDotHostname( - const std::string& dot_server, - const std::vector<std::string>& excluded_providers) { -- const std::vector<const DohUpgradeEntry>& upgradable_servers = -- GetDohUpgradeList(); -+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList(); - std::vector<DnsConfig::DnsOverHttpsServerConfig> doh_servers; - - if (dot_server.empty()) -@@ -451,8 +449,7 @@ GetDohUpgradeServersFromNameservers( - - std::string GetDohProviderIdForHistogramFromDohConfig( - const DnsConfig::DnsOverHttpsServerConfig& doh_server) { -- const std::vector<const DohUpgradeEntry>& upgradable_servers = -- GetDohUpgradeList(); -+ const std::vector<DohUpgradeEntry>& upgradable_servers = GetDohUpgradeList(); - for (const auto& upgrade_entry : upgradable_servers) { - if (doh_server.server_template == - upgrade_entry.dns_over_https_config.server_template) { diff --git a/www-client/chromium/files/chromium-78-icon.patch b/www-client/chromium/files/chromium-78-icon.patch deleted file mode 100644 index 2cca7f10d19c..000000000000 --- a/www-client/chromium/files/chromium-78-icon.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/ui/platform_window/x11/x11_window.cc b/ui/platform_window/x11/x11_window.cc -index 7a3a6eb..7c01534 100644 ---- a/ui/platform_window/x11/x11_window.cc -+++ b/ui/platform_window/x11/x11_window.cc -@@ -67,6 +67,7 @@ ui::XWindow::Configuration ConvertInitPropertiesToXWindowConfig( - config.wm_role_name = properties.wm_role_name; - config.activatable = properties.activatable; - config.visual_id = properties.x_visual_id; -+ config.icon = properties.icon; - return config; - } - diff --git a/www-client/chromium/files/chromium-78-include.patch b/www-client/chromium/files/chromium-78-include.patch deleted file mode 100644 index 3db38eac1c96..000000000000 --- a/www-client/chromium/files/chromium-78-include.patch +++ /dev/null @@ -1,40 +0,0 @@ -From bbfe2665923225b4a7c436ba2b6c7e5f695f2e52 Mon Sep 17 00:00:00 2001 -From: David Landell <landell@vewd.com> -Date: Fri, 13 Sep 2019 12:24:13 +0000 -Subject: [PATCH] Add missing include for unique_ptr - -Change-Id: I614d2f42868d563eb6a92dfb2aae08286e20d687 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1803137 -Reviewed-by: Henrik Boström <hbos@chromium.org> -Commit-Queue: Henrik Boström <hbos@chromium.org> -Cr-Commit-Position: refs/heads/master@{#696355} ---- - -diff --git a/third_party/blink/public/platform/web_rtc_rtp_source.h b/third_party/blink/public/platform/web_rtc_rtp_source.h -index 959440f..c3fd542 100644 ---- a/third_party/blink/public/platform/web_rtc_rtp_source.h -+++ b/third_party/blink/public/platform/web_rtc_rtp_source.h -@@ -5,6 +5,8 @@ - #ifndef THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_ - #define THIRD_PARTY_BLINK_PUBLIC_PLATFORM_WEB_RTC_RTP_SOURCE_H_ - -+#include <memory> -+ - #include "base/optional.h" - #include "third_party/blink/public/platform/web_common.h" - -Missing include due to reverting ProfileManagerObserver ---- - -diff --git a/chrome/browser/web_applications/extensions/bookmark_app_util.cc b/chrome/browser/web_applications/extensions/bookmark_app_util.cc -index ee4b70a..b31e5f5 100644 ---- a/chrome/browser/web_applications/extensions/bookmark_app_util.cc -+++ b/chrome/browser/web_applications/extensions/bookmark_app_util.cc -@@ -7,6 +7,7 @@ - #include "base/strings/string_piece.h" - #include "base/values.h" - #include "chrome/browser/extensions/extension_service.h" -+#include "chrome/browser/profiles/profile.h" - #include "chrome/browser/web_applications/components/app_registrar.h" - #include "chrome/browser/web_applications/components/web_app_provider_base.h" - #include "chrome/common/chrome_features.h" diff --git a/www-client/chromium/files/chromium-78-pm-crash.patch b/www-client/chromium/files/chromium-78-pm-crash.patch deleted file mode 100644 index ada266120dc4..000000000000 --- a/www-client/chromium/files/chromium-78-pm-crash.patch +++ /dev/null @@ -1,43 +0,0 @@ -From e73aed9a5ef15102f29ac31b70290faf5c90f9fe Mon Sep 17 00:00:00 2001 -From: Evan Stade <estade@chromium.org> -Date: Wed, 16 Oct 2019 16:01:32 +0000 -Subject: [PATCH] Fix shutdown crash in ProfileManager. - -OnProfileMarkedForPermanentDeletion should move from -ProfileManagerObserver to ProfileObserver, which would also -fix this bug. However, changing the order of members is the -quickest and most cherry-pick-able way to avoid the crash. - -Bug: 1005244 -Change-Id: If2db68c846dd418cd02864b57b9b543687fa1e03 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1863518 -Auto-Submit: Evan Stade <estade@chromium.org> -Reviewed-by: David Roger <droger@chromium.org> -Commit-Queue: Evan Stade <estade@chromium.org> -Cr-Commit-Position: refs/heads/master@{#706467} ---- - -diff --git a/chrome/browser/profiles/profile_manager.h b/chrome/browser/profiles/profile_manager.h -index b60df76d..7d02af7 100644 ---- a/chrome/browser/profiles/profile_manager.h -+++ b/chrome/browser/profiles/profile_manager.h -@@ -409,6 +409,10 @@ class ProfileManager : public content::NotificationObserver, - const base::FilePath& profile_dir); - #endif // !defined(OS_ANDROID) - -+ // Destroy after |profile_info_cache_| since Profile destruction may trigger -+ // some observers to unregister themselves. -+ base::ObserverList<ProfileManagerObserver> observers_; -+ - // Object to cache various information about profiles. Contains information - // about every profile which has been created for this instance of Chrome, - // if it has not been explicitly deleted. It must be destroyed after -@@ -450,8 +454,6 @@ class ProfileManager : public content::NotificationObserver, - // Controls whether to initialize some services. Only disabled for testing. - bool do_final_services_init_ = true; - -- base::ObserverList<ProfileManagerObserver> observers_; -- - // TODO(chrome/browser/profiles/OWNERS): Usage of this in profile_manager.cc - // should likely be turned into DCHECK_CURRENTLY_ON(BrowserThread::UI) for - // consistency with surrounding code in the same file but that wasn't trivial diff --git a/www-client/chromium/files/chromium-80-gcc-abstract.patch b/www-client/chromium/files/chromium-80-gcc-abstract.patch new file mode 100644 index 000000000000..190a67258e1d --- /dev/null +++ b/www-client/chromium/files/chromium-80-gcc-abstract.patch @@ -0,0 +1,41 @@ +In file included from ../../third_party/blink/renderer/platform/heap/persistent.h:18, + from ../../third_party/blink/public/platform/web_private_ptr.h:40, + from ../../third_party/blink/public/platform/web_media_stream_track.h:33, + from ../../third_party/blink/public/platform/web_media_stream_source.h:37, + from ../../third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h:19, + from ../../third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc:5: +../../third_party/blink/renderer/platform/wtf/cross_thread_copier.h: In instantiation of 'struct WTF::CrossThreadCopierPassThrough<webrtc::VideoTrackInterface>': +../../third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h:169:14: required from here +../../third_party/blink/renderer/platform/wtf/cross_thread_copier.h:80:15: error: invalid abstract return type 'webrtc::VideoTrackInterface' + 80 | static Type Copy(const T& parameter) { return parameter; } + | ^~~~ +In file included from ../../third_party/webrtc/api/peer_connection_interface.h:88, + from ../../third_party/blink/public/platform/web_rtc_peer_connection_handler.h:39, + from ../../third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.h:20, + from ../../third_party/blink/renderer/modules/peerconnection/rtc_peer_connection_handler.cc:5: +../../third_party/webrtc/api/media_stream_interface.h:174:18: note: because the following virtual functions are pure within 'webrtc::VideoTrackInterface': + 174 | class RTC_EXPORT VideoTrackInterface + | ^~~~~~~~~~~~~~~~~~~ +../../third_party/webrtc/api/media_stream_interface.h:48:16: note: 'virtual void webrtc::NotifierInterface::RegisterObserver(webrtc::ObserverInterface*)' + 48 | virtual void RegisterObserver(ObserverInterface* observer) = 0; + | ^~~~~~~~~~~~~~~~ +../../third_party/webrtc/api/media_stream_interface.h:49:16: note: 'virtual void webrtc::NotifierInterface::UnregisterObserver(webrtc::ObserverInterface*)' + 49 | virtual void UnregisterObserver(ObserverInterface* observer) = 0; + | ^~~~~~~~~~~~~~~~~~ + +diff --git a/third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h b/third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h +index 54cb7d1..0d6c40f 100644 +--- a/third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h ++++ b/third_party/blink/renderer/modules/peerconnection/adapters/web_rtc_cross_thread_copier.h +@@ -165,8 +165,9 @@ struct CrossThreadCopier<blink::MediaStreamVideoTrack> + }; + + template <> +-struct CrossThreadCopier<webrtc::VideoTrackInterface> +- : public CrossThreadCopierPassThrough<webrtc::VideoTrackInterface> { ++struct CrossThreadCopier<rtc::scoped_refptr<webrtc::VideoTrackInterface>> ++ : public CrossThreadCopierPassThrough< ++ rtc::scoped_refptr<webrtc::VideoTrackInterface>> { + STATIC_ONLY(CrossThreadCopier); + }; + diff --git a/www-client/chromium/files/chromium-80-gcc-blink.patch b/www-client/chromium/files/chromium-80-gcc-blink.patch index fdc28f324350..2118b46f39a4 100644 --- a/www-client/chromium/files/chromium-80-gcc-blink.patch +++ b/www-client/chromium/files/chromium-80-gcc-blink.patch @@ -1,3 +1,21 @@ +../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc: In member function 'void blink::DeleteSelectionCommand::InitializePositionData(blink::EditingState*)': +../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc:256:59: error: no matching function for call to 'EnclosingNodeOfType(blink::Position&, <unresolved overloaded function type>)' + 256 | EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>)); + | ^ +In file included from ../../third_party/blink/renderer/core/editing/commands/delete_selection_command.cc:34: +../../third_party/blink/renderer/core/editing/editing_utilities.h:112:19: note: candidate: 'blink::Node* blink::EnclosingNodeOfType(const Position&, bool (*)(const blink::Node*), blink::EditingBoundaryCrossingRule)' + 112 | CORE_EXPORT Node* EnclosingNodeOfType( + | ^~~~~~~~~~~~~~~~~~~ +../../third_party/blink/renderer/core/editing/editing_utilities.h:114:12: note: no known conversion for argument 2 from '<unresolved overloaded function type>' to 'bool (*)(const blink::Node*)' + 114 | bool (*node_is_of_type)(const Node*), + | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +../../third_party/blink/renderer/core/editing/editing_utilities.h:116:19: note: candidate: 'blink::Node* blink::EnclosingNodeOfType(const PositionInFlatTree&, bool (*)(const blink::Node*), blink::EditingBoundaryCrossingRule)' + 116 | CORE_EXPORT Node* EnclosingNodeOfType( + | ^~~~~~~~~~~~~~~~~~~ +../../third_party/blink/renderer/core/editing/editing_utilities.h:117:5: note: no known conversion for argument 1 from 'blink::Position' {aka 'blink::PositionTemplate<blink::EditingAlgorithm<blink::NodeTraversal> >'} to 'const PositionInFlatTree&' {aka 'const blink::PositionTemplate<blink::EditingAlgorithm<blink::FlatTreeTraversal> >&'} + 117 | const PositionInFlatTree&, + | ^~~~~~~~~~~~~~~~~~~~~~~~~ + diff --git a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc index 6ff6906..dd531ae 100644 --- a/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc diff --git a/www-client/chromium/files/chromium-80-gcc-incomplete-type.patch b/www-client/chromium/files/chromium-80-gcc-incomplete-type.patch new file mode 100644 index 000000000000..8d10620a7170 --- /dev/null +++ b/www-client/chromium/files/chromium-80-gcc-incomplete-type.patch @@ -0,0 +1,229 @@ +From cdf3e81ff49b200213d67d65558f2919222b60ab Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Date: Mon, 16 Dec 2019 11:39:11 +0000 +Subject: [PATCH] BookmarkModelMerger: Move RemoteTreeNode declaration to header. + +This fixes the build with libstdc++ after commit 8f5dad93e58 ("Fix CHECK +failure due to untracked local nodes"): + +/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/stl_pair.h:215:11: error: field has incomplete type 'sync_bookmarks::BookmarkModelMerger::RemoteTreeNode' + _T2 second; /// @c second is a copy of the second object + ^ +/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/ext/aligned_buffer.h:91:28: note: in instantiation of template class 'std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>' requested here + : std::aligned_storage<sizeof(_Tp), __alignof__(_Tp)> + ^ +/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:233:43: note: in instantiation of template class '__gnu_cxx::__aligned_buffer<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >' requested here + __gnu_cxx::__aligned_buffer<_Value> _M_storage; + ^ +/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:264:39: note: in instantiation of template class 'std::__detail::_Hash_node_value_base<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >' requested here + struct _Hash_node<_Value, true> : _Hash_node_value_base<_Value> + ^ +/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable_policy.h:2028:25: note: in instantiation of template class 'std::__detail::_Hash_node<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, true>' requested here + rebind_traits<typename __node_type::value_type>; + ^ +/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/hashtable.h:184:15: note: in instantiation of template class 'std::__detail::_Hashtable_alloc<std::allocator<std::__detail::_Hash_node<std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, true> > > +' requested here + private __detail::_Hashtable_alloc< + ^ +/usr/lib/gcc/x86_64-redhat-linux/9/../../../../include/c++/9/bits/unordered_map.h:105:18: note: in instantiation of template class 'std::_Hashtable<std::__cxx11::basic_string<char>, std::pair<const std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode>, std::allocator<std::pair<con +st std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> >, std::__detail::_Select1st, std::equal_to<std::__cxx11::basic_string<char> >, std::hash<std::string>, std::__detail::_Mod_range_hashing, std::__detail::_Default_ranged_hash, std::__detail::_Prime_rehash_policy, std::__deta +il::_Hashtable_traits<true, false, true> >' requested here + _Hashtable _M_h; + ^ +../../components/sync_bookmarks/bookmark_model_merger.h:146:22: note: in instantiation of template class 'std::unordered_map<std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode, std::hash<std::string>, std::equal_to<std::__cxx11::basic_string<char> >, std::allocator<std::pair<con +st std::__cxx11::basic_string<char>, sync_bookmarks::BookmarkModelMerger::RemoteTreeNode> > >' requested here + const RemoteForest remote_forest_; + ^ +../../components/sync_bookmarks/bookmark_model_merger.h:53:9: note: forward declaration of 'sync_bookmarks::BookmarkModelMerger::RemoteTreeNode' + class RemoteTreeNode; + ^ + +Essentially, the problem is that libstdc++'s std::unordered_map<T, U> +implementation requires both T and U to be fully declared. I raised the +problem in https://gcc.gnu.org/bugzilla/show_bug.cgi?id=92770, and GCC's +position is that we are relying on undefined behavior according to the C++ +standard (https://eel.is/c++draft/requirements#res.on.functions-2.5). + +Bug: 957519 +Change-Id: Ife7e435e516932a795bfbe05b2c910c3272878f0 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960156 +Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Reviewed-by: Mikel Astiz <mastiz@chromium.org> +Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Cr-Commit-Position: refs/heads/master@{#725070} +--- + +diff --git a/components/sync_bookmarks/bookmark_model_merger.cc b/components/sync_bookmarks/bookmark_model_merger.cc +index eae153ef..579848e 100644 +--- a/components/sync_bookmarks/bookmark_model_merger.cc ++++ b/components/sync_bookmarks/bookmark_model_merger.cc +@@ -5,7 +5,6 @@ + #include "components/sync_bookmarks/bookmark_model_merger.h" + + #include <algorithm> +-#include <memory> + #include <set> + #include <string> + #include <utility> +@@ -205,66 +204,44 @@ + + } // namespace + +-class BookmarkModelMerger::RemoteTreeNode final { +- public: +- // Constructs a tree given |update| as root and recursively all descendants by +- // traversing |*updates_per_parent_id|. |update| and |updates_per_parent_id| +- // must not be null. All updates |*updates_per_parent_id| must represent valid +- // updates. Updates corresponding from descendant nodes are moved away from +- // |*updates_per_parent_id|. +- static RemoteTreeNode BuildTree( +- std::unique_ptr<syncer::UpdateResponseData> update, +- UpdatesPerParentId* updates_per_parent_id); ++BookmarkModelMerger::RemoteTreeNode::RemoteTreeNode() = default; + +- ~RemoteTreeNode() = default; ++BookmarkModelMerger::RemoteTreeNode::~RemoteTreeNode() = default; + +- // Allow moves, useful during construction. +- RemoteTreeNode(RemoteTreeNode&&) = default; +- RemoteTreeNode& operator=(RemoteTreeNode&&) = default; ++BookmarkModelMerger::RemoteTreeNode::RemoteTreeNode( ++ BookmarkModelMerger::RemoteTreeNode&&) = default; ++BookmarkModelMerger::RemoteTreeNode& BookmarkModelMerger::RemoteTreeNode:: ++operator=(BookmarkModelMerger::RemoteTreeNode&&) = default; + +- const syncer::EntityData& entity() const { return *update_->entity; } +- int64_t response_version() const { return update_->response_version; } ++void BookmarkModelMerger::RemoteTreeNode::EmplaceSelfAndDescendantsByGUID( ++ std::unordered_map<std::string, const RemoteTreeNode*>* ++ guid_to_remote_node_map) const { ++ DCHECK(guid_to_remote_node_map); + +- // Direct children nodes, sorted by ascending unique position. These are +- // guaranteed to be valid updates (e.g. IsValidBookmarkSpecifics()). +- const std::vector<RemoteTreeNode>& children() const { return children_; } ++ const std::string& guid = entity().specifics.bookmark().guid(); ++ if (!guid.empty()) { ++ DCHECK(base::IsValidGUID(guid)); + +- // Recursively emplaces all GUIDs (this node and descendants) into +- // |*guid_to_remote_node_map|, which must not be null. +- void EmplaceSelfAndDescendantsByGUID( +- std::unordered_map<std::string, const RemoteTreeNode*>* +- guid_to_remote_node_map) const { +- DCHECK(guid_to_remote_node_map); +- +- const std::string& guid = entity().specifics.bookmark().guid(); +- if (!guid.empty()) { +- DCHECK(base::IsValidGUID(guid)); +- +- // Duplicate GUIDs have been sorted out before. +- bool success = guid_to_remote_node_map->emplace(guid, this).second; +- DCHECK(success); +- } +- +- for (const RemoteTreeNode& child : children_) { +- child.EmplaceSelfAndDescendantsByGUID(guid_to_remote_node_map); +- } ++ // Duplicate GUIDs have been sorted out before. ++ bool success = guid_to_remote_node_map->emplace(guid, this).second; ++ DCHECK(success); + } + +- private: +- static bool UniquePositionLessThan(const RemoteTreeNode& lhs, +- const RemoteTreeNode& rhs) { +- const syncer::UniquePosition a_pos = +- syncer::UniquePosition::FromProto(lhs.entity().unique_position); +- const syncer::UniquePosition b_pos = +- syncer::UniquePosition::FromProto(rhs.entity().unique_position); +- return a_pos.LessThan(b_pos); ++ for (const RemoteTreeNode& child : children_) { ++ child.EmplaceSelfAndDescendantsByGUID(guid_to_remote_node_map); + } ++} + +- RemoteTreeNode() = default; +- +- std::unique_ptr<syncer::UpdateResponseData> update_; +- std::vector<RemoteTreeNode> children_; +-}; ++// static ++bool BookmarkModelMerger::RemoteTreeNode::UniquePositionLessThan( ++ const RemoteTreeNode& lhs, ++ const RemoteTreeNode& rhs) { ++ const syncer::UniquePosition a_pos = ++ syncer::UniquePosition::FromProto(lhs.entity().unique_position); ++ const syncer::UniquePosition b_pos = ++ syncer::UniquePosition::FromProto(rhs.entity().unique_position); ++ return a_pos.LessThan(b_pos); ++} + + // static + BookmarkModelMerger::RemoteTreeNode +diff --git a/components/sync_bookmarks/bookmark_model_merger.h b/components/sync_bookmarks/bookmark_model_merger.h +index 9b59200..bf0783ec 100644 +--- a/components/sync_bookmarks/bookmark_model_merger.h ++++ b/components/sync_bookmarks/bookmark_model_merger.h +@@ -5,6 +5,7 @@ + #ifndef COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_MERGER_H_ + #define COMPONENTS_SYNC_BOOKMARKS_BOOKMARK_MODEL_MERGER_H_ + ++#include <memory> + #include <string> + #include <unordered_map> + #include <vector> +@@ -50,7 +51,52 @@ + + private: + // Internal representation of a remote tree, composed of nodes. +- class RemoteTreeNode; ++ class RemoteTreeNode final { ++ private: ++ using UpdatesPerParentId = ++ std::unordered_map<base::StringPiece, ++ syncer::UpdateResponseDataList, ++ base::StringPieceHash>; ++ ++ public: ++ // Constructs a tree given |update| as root and recursively all descendants ++ // by traversing |*updates_per_parent_id|. |update| and ++ // |updates_per_parent_id| must not be null. All updates ++ // |*updates_per_parent_id| must represent valid updates. Updates ++ // corresponding from descendant nodes are moved away from ++ // |*updates_per_parent_id|. ++ static RemoteTreeNode BuildTree( ++ std::unique_ptr<syncer::UpdateResponseData> update, ++ UpdatesPerParentId* updates_per_parent_id); ++ ++ ~RemoteTreeNode(); ++ ++ // Allow moves, useful during construction. ++ RemoteTreeNode(RemoteTreeNode&&); ++ RemoteTreeNode& operator=(RemoteTreeNode&&); ++ ++ const syncer::EntityData& entity() const { return *update_->entity; } ++ int64_t response_version() const { return update_->response_version; } ++ ++ // Direct children nodes, sorted by ascending unique position. These are ++ // guaranteed to be valid updates (e.g. IsValidBookmarkSpecifics()). ++ const std::vector<RemoteTreeNode>& children() const { return children_; } ++ ++ // Recursively emplaces all GUIDs (this node and descendants) into ++ // |*guid_to_remote_node_map|, which must not be null. ++ void EmplaceSelfAndDescendantsByGUID( ++ std::unordered_map<std::string, const RemoteTreeNode*>* ++ guid_to_remote_node_map) const; ++ ++ private: ++ static bool UniquePositionLessThan(const RemoteTreeNode& lhs, ++ const RemoteTreeNode& rhs); ++ ++ RemoteTreeNode(); ++ ++ std::unique_ptr<syncer::UpdateResponseData> update_; ++ std::vector<RemoteTreeNode> children_; ++ }; + + // A forest composed of multiple trees where the root of each tree represents + // a permanent node, keyed by server-defined unique tag of the root. diff --git a/www-client/chromium/files/chromium-80-gcc-noexcept.patch b/www-client/chromium/files/chromium-80-gcc-noexcept.patch deleted file mode 100644 index 93ac6c409be3..000000000000 --- a/www-client/chromium/files/chromium-80-gcc-noexcept.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a75a2539ca600163f2136776fdc751111e887cd7 Mon Sep 17 00:00:00 2001 -From: Jose Dapena Paz <jose.dapena@lge.com> -Date: Tue, 05 Nov 2019 17:57:52 +0100 -Subject: [PATCH] GCC: do not set noexcept on move assignment operator of ColorSet - -GCC build is broken because ColorSet default move assign operator is -noexcept (because the color flat_map is not noexcept). It does not -break clang because clang does not warn about this situation when -building with -fno-exception. - -../../ui/color/color_set.cc:14:11: error: function ‘ui::ColorSet& ui::ColorSet::operator=(ui::ColorSet&&)’ defaulted on its redeclaration with an exception-specification that differs from the implicit exception-specification ‘’ - ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default; - -Bug: 819294 -Change-Id: I00f4374fbf3d41dced9f9451c90478db528cb986 ---- - -diff --git a/ui/color/color_set.cc b/ui/color/color_set.cc -index 56564d7..0d43b2b 100644 ---- a/ui/color/color_set.cc -+++ b/ui/color/color_set.cc -@@ -9,9 +9,9 @@ - ColorSet::ColorSet(ColorSetId id, ColorMap&& colors) - : id(id), colors(std::move(colors)) {} - --ColorSet::ColorSet(ColorSet&&) noexcept = default; -+ColorSet::ColorSet(ColorSet&&) = default; - --ColorSet& ColorSet::operator=(ColorSet&&) noexcept = default; -+ColorSet& ColorSet::operator=(ColorSet&&) = default; - - ColorSet::~ColorSet() = default; - -diff --git a/ui/color/color_set.h b/ui/color/color_set.h -index b273c48..3eaea42 100644 ---- a/ui/color/color_set.h -+++ b/ui/color/color_set.h -@@ -28,8 +28,8 @@ - using ColorMap = base::flat_map<ColorId, SkColor>; - - ColorSet(ColorSetId id, ColorMap&& colors); -- ColorSet(ColorSet&&) noexcept; -- ColorSet& operator=(ColorSet&&) noexcept; -+ ColorSet(ColorSet&&); -+ ColorSet& operator=(ColorSet&&); - ~ColorSet(); - - ColorSetId id; diff --git a/www-client/chromium/files/chromium-80-gcc-permissive.patch b/www-client/chromium/files/chromium-80-gcc-permissive.patch new file mode 100644 index 000000000000..c7aef49add12 --- /dev/null +++ b/www-client/chromium/files/chromium-80-gcc-permissive.patch @@ -0,0 +1,33 @@ +In file included from ../../media/base/media_log_properties.h:13, + from ../../media/base/media_log.h:23, + from ../../media/filters/frame_processor.h:15, + from ../../media/filters/frame_processor.cc:5: +../../media/base/media_log_properties_helper.h:86:8: error: extra qualification not allowed [-fpermissive] + 86 | struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> { + | ^~~~~~~~ +../../media/base/media_log_properties_helper.h:86:75: error: explicit specialization of non-template 'media::internal::<unnamed struct>' + 86 | struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> { + | ^ + +diff --git a/media/base/media_log_properties_helper.h b/media/base/media_log_properties_helper.h +index 95ff70a..549b003 100644 +--- a/media/base/media_log_properties_helper.h ++++ b/media/base/media_log_properties_helper.h +@@ -83,7 +83,7 @@ struct MediaLogPropertyTypeConverter<std::vector<T>> { + + // Specializer for sending AudioDecoderConfigs to the media tab in devtools. + template <> +-struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> { ++struct MediaLogPropertyTypeConverter<media::AudioDecoderConfig> { + static base::Value Convert(const AudioDecoderConfig& value) { + base::Value result(base::Value::Type::DICTIONARY); + result.SetStringKey("codec", GetCodecName(value.codec())); +@@ -114,7 +114,7 @@ struct internal::MediaLogPropertyTypeConverter<media::AudioDecoderConfig> { + + // Specializer for sending VideoDecoderConfigs to the media tab in devtools. + template <> +-struct internal::MediaLogPropertyTypeConverter<VideoDecoderConfig> { ++struct MediaLogPropertyTypeConverter<VideoDecoderConfig> { + static base::Value Convert(const VideoDecoderConfig& value) { + base::Value result(base::Value::Type::DICTIONARY); + result.SetStringKey("codec", GetCodecName(value.codec())); diff --git a/www-client/chromium/files/chromium-80-include.patch b/www-client/chromium/files/chromium-80-include.patch index a2a00a9d4557..dd85de7249c4 100644 --- a/www-client/chromium/files/chromium-80-include.patch +++ b/www-client/chromium/files/chromium-80-include.patch @@ -1,13 +1,33 @@ -diff --git a/third_party/blink/renderer/core/core_initializer.h b/third_party/blink/renderer/core/core_initializer.h -index 5e67f46..3b750c7 100644 ---- a/third_party/blink/renderer/core/core_initializer.h -+++ b/third_party/blink/renderer/core/core_initializer.h -@@ -36,6 +36,8 @@ - #include "third_party/blink/renderer/core/core_export.h" - #include "third_party/blink/renderer/platform/wtf/allocator/allocator.h" +From 8273f4d3130e06fd8b6bef87b07c936304b971d9 Mon Sep 17 00:00:00 2001 +From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Date: Tue, 10 Dec 2019 20:59:57 +0000 +Subject: [PATCH] [cros search service]: Include <cmath> for std::pow() + +IWYU. Follow up to commit 2b2ea3c09b ("[cros search service] Move shared +string matching functions to //chrome"), which broke the libstdc++ build: + + ../../chrome/common/string_matching/fuzzy_tokenized_string_match.cc:199:14: error: no member named 'pow' in namespace 'std' + std::pow(partial_match_penalty_rate, long_start - current - 1); + ~~~~~^ + +Bug: 957519 +Change-Id: I66f61cb4f93cfa0bfa3d1b00ba391ddd8f31a7fb +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1960310 +Auto-Submit: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Reviewed-by: Jia Meng <jiameng@chromium.org> +Commit-Queue: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com> +Cr-Commit-Position: refs/heads/master@{#723499} +--- + +diff --git a/chrome/common/string_matching/fuzzy_tokenized_string_match.cc b/chrome/common/string_matching/fuzzy_tokenized_string_match.cc +index 8351fa7..884ef63 100644 +--- a/chrome/common/string_matching/fuzzy_tokenized_string_match.cc ++++ b/chrome/common/string_matching/fuzzy_tokenized_string_match.cc +@@ -5,6 +5,7 @@ + #include "chrome/common/string_matching/fuzzy_tokenized_string_match.h" -+#include <memory> -+ - namespace mojo { - class BinderMap; - } + #include <algorithm> ++#include <cmath> + #include <iterator> + + #include "base/i18n/case_conversion.h" diff --git a/www-client/chromium/files/chromium-widevine-r4.patch b/www-client/chromium/files/chromium-widevine-r4.patch deleted file mode 100644 index d5a3be8345a2..000000000000 --- a/www-client/chromium/files/chromium-widevine-r4.patch +++ /dev/null @@ -1,26 +0,0 @@ -Define WIDEVINE_CDM_VERSION_STRING && re-re-re-patch for latest ninja - -Stolen from Arch basically. - -gmt - ---- a/chrome/common/chrome_content_client.cc -+++ b/chrome/common/chrome_content_client.cc -@@ -99,7 +99,7 @@ - // Registers Widevine CDM if Widevine is enabled, the Widevine CDM is - // bundled and not a component. When the Widevine CDM is a component, it is - // registered in widevine_cdm_component_installer.cc. --#if BUILDFLAG(BUNDLE_WIDEVINE_CDM) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) -+#if BUILDFLAG(ENABLE_WIDEVINE) && !BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT) - #define REGISTER_BUNDLED_WIDEVINE_CDM - #include "third_party/widevine/cdm/widevine_cdm_common.h" // nogncheck - // TODO(crbug.com/663554): Needed for WIDEVINE_CDM_VERSION_STRING. Support ---- a/third_party/widevine/cdm/widevine_cdm_version.h -+++ b/third_party/widevine/cdm/widevine_cdm_version.h -@@ -11,5 +11,6 @@ - // If the Widevine CDM is available define the following: - // - WIDEVINE_CDM_VERSION_STRING (with the version of the CDM that's available - // as a string, e.g., "1.0.123.456"). -+#define WIDEVINE_CDM_VERSION_STRING "unknown" - - #endif // WIDEVINE_CDM_VERSION_H_ diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml index 42ec8adf1922..60d720a4ee2c 100644 --- a/www-client/chromium/metadata.xml +++ b/www-client/chromium/metadata.xml @@ -10,7 +10,6 @@ <flag name="closure-compile">Enable closure type-checking for Chrome's web technology-based UI. Requires Java.</flag> <flag name="component-build">Split build into more shared libraries to speed up linking. Mostly intended for debugging and development, NOT RECOMMENDED for general use.</flag> <flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag> - <flag name="jumbo-build">Combine source files to speed up build process.</flag> <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag> <flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag> <flag name="suid">Build the SUID sandbox, which is only needed on CONFIG_USER_NS=n kernels</flag> |