diff options
Diffstat (limited to 'www-client/chromium')
| -rw-r--r-- | www-client/chromium/Manifest | 5 | ||||
| -rw-r--r-- | www-client/chromium/chromium-89.0.4389.47.ebuild (renamed from www-client/chromium/chromium-89.0.4389.40.ebuild) | 1 | ||||
| -rw-r--r-- | www-client/chromium/files/chromium-89-EnumTable-crash.patch | 71 |
3 files changed, 75 insertions, 2 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 59b5f670b8f5..e0a2ffb45226 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,5 +1,6 @@ AUX chromium-87-webcodecs-deps.patch 1011 BLAKE2B 45caba9cb8c65c0f72844f441ee0f0333bc7172ed26e40b1af43190a9aefdc4d7e1d8ad807cd3e45f890edeb4be88555d0ef61cb6d6f359956eb02765861e1e3 SHA512 26831bbf4b6d9b7227fcd179641faa9e14a23995bd1d99cf1ae7eb1170d42eae883ef27a88bd23e8dddfb1b043704e0acc3b2de421d4ef9b9c986495cec75d8f AUX chromium-88-ozone-deps.patch 1548 BLAKE2B 6a9b2b19b1563503d749394921a43c53c33be7e9b88572c7e2e95affccc5e79737c28b9c1c6ae7c4a139e05a802052b4375d51264492f78dde5717f760368d8a SHA512 e2e8304efa772c2cdc2a891335f9d2e914885d563967fef71d7e2f443eadbfc502480cbd1fdbc1b32a59cd17684d3044d2ee0c4ad5dac5a4402c1667e13d66e5 +AUX chromium-89-EnumTable-crash.patch 2712 BLAKE2B 6715f98a5cd2c9886050f9d360938e261308a3def252e25642a473e86626594fa6c06cb3231dd57dc5428db8ee118848a0a085abf741c9555778f3ae3d9d374f SHA512 07ecb68d5ca2d732c9ca58b4dc007eb2f4b842bdf6ba46cca9050bf1c582439ebb23db1149c76d5a27f4d8de548de946e80eff0c5b1759e4b6714e0c6a7b26c9 AUX chromium-89-webcodecs-deps.patch 976 BLAKE2B 5a5a397c4cbc5c6e16cd95364ceadfea342ea2d1acabd7640c0bb6e65218dc4e5783a743912c352b3f9422b2f9e067db9109c64e117f82673659c2c5338b1353 SHA512 1585d2d9258bcfd5d78956ff3b7c8d61997a65133e86a2878c9e7bdf68ad9c3a6c24f20f02f10388b7dae02f7ad82c7533687ff13918f75e5ceeb112926fc4e0 AUX chromium-90-unbundle-zlib.patch 1055 BLAKE2B 4b1be3246801cbca244649c42d512148d4023990e53d8b3504d155a4088a9ae8738d0010fd2dda0c6d40c9fc8cfc696a013aa6b88fc34518a5cfa89dc11ece5b SHA512 893b8e37bec131713d93500263f175714532caa2572e18faafec142058fa417b0824e6acfd6de13f645f6c3dd29d8d4758f9b1b39e355eb04aac55e5d92d1bb9 AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca @@ -9,11 +10,11 @@ AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9 DIST chromium-88-patchset-3.tar.xz 8396 BLAKE2B 4c978f1a6efef3f71e3dd6340c392b74bc6a734b49a9ca43343d03903159dafc66159939f9a6c4b55665ddbe7bd97a26d8d86c285ec02cf76cad5f5cc7410570 SHA512 c39afa26f5b0b9930f6f67ce0c42eefd74c09d528b26bc0db57129b150f75ff83c8b1cb97bd9c5d75f288fb4767cc68c9c5ce89231b4a59f8ca02493e4dd281a DIST chromium-88.0.4324.150.tar.xz 857377456 BLAKE2B 65f3d4a0f930743d04786a21c10561a93a2eb27c2c06d260495ead6ebf9344b2938f28c083a4077c9d2413f47cb083a83633b571ab1f54b25823fc8db18f504b SHA512 5e0419ce26e58b6ba30586c806fa3001f6c3c094e09c82fb08ed828a199c582308ce9bc0ea445aa0214d29710a586bf5a972553fbef5eab574fb0dc3ebe6280b DIST chromium-89-patchset-6.tar.xz 4308 BLAKE2B 22e2db8b5e287925f8b550075e48ad381ccf7ef54e23d8f4e4aedff7fd6cfee8f9e70eff1edb8c867c256ee5ec881ef9379e18278b84b47ff08dcc00f5801667 SHA512 aa5d902c1959f50eb9a0d773a77bf12e5a955d796ee8b18f6e2143573dd73beec62109940e55a858fd9927753dba1d3bf9c1bd940b18a616e7b70b801e93f041 -DIST chromium-89.0.4389.40.tar.xz 890752920 BLAKE2B a4db55ac0621ad2e59c51b80c557c601c48bfd8b4d126195d61c650b8cf3204ed21b5fc65b11708b95d95cfabf48b29e2d5403316bc0523e3355f60e384b251f SHA512 9c31ea969d23197dd4a749648ca404293ee12d14e025c103db8df9e826b7661902ea8edb8a07a8d216026597b058b4efaf4b73afa032a41ad82b8c108dd44c11 +DIST chromium-89.0.4389.47.tar.xz 890733548 BLAKE2B 55482566fce0d30abed7fe88514314f14860ba2f876af532c7b566c9b32d1caf79ecccd8cc03af7b9cac4457038abf4e5006c8bfb75fd308200f7290f3431d39 SHA512 f6828d3d9a346e508511eee8cef63ad6ae4327adb90a6bcb392e862e8406b50798f0d73306794283aaab84550547b31c2b9e90e2068740b9123115796f9a082f DIST chromium-90-patchset-3.tar.xz 5344 BLAKE2B 19b9d69d5d4aecc18e1a3867fd0c53d01dd873fd533b83fbd8c25d435976dd2176975ccf5d4ebb04f84b6c1c0a009315ef4344fbf575b8ae6942ddfb12d1e1e1 SHA512 97d756b4b4270c7631ca42792e869815c22a786ebba36c2668b99298bcd60f24fd89b52d2491ade07341c20f2bdac933b46b299e52bfe9e45cb57bf056ee050c DIST chromium-90.0.4412.3.tar.xz 920864492 BLAKE2B a0d5e6ddc552611231c7ba8fd81da4d2e01e59695eccce33c040ffdd37fa360008cf8c8095f10622902a5e25297db4c10b5c463fdca5e5c46d390db4268f3d17 SHA512 bf168dd2a817823bd9ec7b7c925cddd783366460011782884f02ef15952546d6edef6bb2f08813bfd8be2e64c787e80c2cd449032b9eaf19d2ea7a6eb2294da8 DIST setuptools-44.1.0.zip 858569 BLAKE2B f59f154e121502a731e51294ccd293d60ffccadacf51e23b53bf7ceba38858948b86783238061136c827ac3373ea7ea8e6253d4bb53f3f1dd69284568ec65a68 SHA512 4dfb0f42d334b835758e865a26ecd1e725711fa2b9c38ddc273b8b3849fba04527bc97436d11ba1e98f1a42922aa0f0b9032e32998273c705fac6e10735eacbf EBUILD chromium-88.0.4324.150.ebuild 28537 BLAKE2B 949c867f5c43e121c7f2b66496f6bc41a1c59278551f38194cc61ab4d6982df9813d062075a5bb1b4739bd1312ddd2642ef6c37cf1e01d49774ff437a88d38c7 SHA512 4c44e9f8fca5487550be400b13ac0cdbae6d6265a27ba9199be3d4a63f2adb84d01809feb5b04cd77fab29cc14ee04e96ebc5043a1812c569a2a5688e9b1fc3a -EBUILD chromium-89.0.4389.40.ebuild 28534 BLAKE2B 8a65e3d5d2cd4d5853b6c7ef7e6dea4153ec5fa7e341032ad7341dadddea7902fd3cbfc9be013a83133b193e07c1bb3d501f2ae0bcd1de6e755a0a397acb4e3e SHA512 12ee9615772ae76957d1d122229fc70c1beb89072c3ba9cfed17ccf40aee589187eb1dcf806285dc1d16b59af6125696982cecbc4b82a39e6b1f07a209c8c698 +EBUILD chromium-89.0.4389.47.ebuild 28584 BLAKE2B bf2a5d113077e672d7ea440ebacba66703102f7a6ef1359d9abca93e4e2de6f6c8e9da77a313ee83c4e85d8554a94941d1339d180dbc298fb81afe35895756eb SHA512 39d15678479247adabf29b900ce4f10a11b4adc6366b2958d0aaf9076c527fa2103ba14624f1fc4e7e004fdadb6d5a6947e66fbd3610f426acabd8c0112f0f3d EBUILD chromium-90.0.4412.3.ebuild 28721 BLAKE2B 2f491c801c69c5d319c7f8c488201c00257651fb2e7a51bab59ab8f92dc0ae66323d7cd37428e286d16887a5aaa7013bdcc8fe2659b7dd14f296ee038fe93c28 SHA512 1733b169bef9e242db6a0bd0cb4e335120beee7faaf9dc2b6e34012aace1d3411a46ce9d5c021a5b5af9273d175fffc96549f713eeef0d14182bb291032de4ac MISC metadata.xml 1596 BLAKE2B e15a05a13e8200be6a946ba0b2631a014b83a66267a9ce956245d28312403b3229ef6a961830bd69535bc4286912fdf8d5f3a6cb0d0f8aff29936ceaf7113e8f SHA512 204d0b04307b2fc2188c64f290c0e3a0a0b14f3ac0f35deaffdaac1b30addd4df1f2eef2eae19a674f07123dc44a6ba4a0b5e2419a898bfaac61579603ceb0ee diff --git a/www-client/chromium/chromium-89.0.4389.40.ebuild b/www-client/chromium/chromium-89.0.4389.47.ebuild index 32462fb8427c..dca398dbb76d 100644 --- a/www-client/chromium/chromium-89.0.4389.40.ebuild +++ b/www-client/chromium/chromium-89.0.4389.47.ebuild @@ -232,6 +232,7 @@ src_prepare() { local PATCHES=( "${WORKDIR}/patches" "${FILESDIR}/chromium-89-webcodecs-deps.patch" + "${FILESDIR}/chromium-89-EnumTable-crash.patch" "${FILESDIR}/chromium-shim_headers.patch" ) diff --git a/www-client/chromium/files/chromium-89-EnumTable-crash.patch b/www-client/chromium/files/chromium-89-EnumTable-crash.patch new file mode 100644 index 000000000000..89a50702dfae --- /dev/null +++ b/www-client/chromium/files/chromium-89-EnumTable-crash.patch @@ -0,0 +1,71 @@ +diff --git a/components/cast_channel/enum_table.h b/components/cast_channel/enum_table.h +index e3130c7..2ad16ea 100644 +--- a/components/cast_channel/enum_table.h ++++ b/components/cast_channel/enum_table.h +@@ -212,7 +212,7 @@ class + + template <typename E> + friend class EnumTable; +- DISALLOW_COPY_AND_ASSIGN(GenericEnumTableEntry); ++ DISALLOW_ASSIGN(GenericEnumTableEntry); + }; + + // Yes, these constructors really needs to be inlined. Even though they look +@@ -250,8 +250,7 @@ class EnumTable { + // Constructor for regular entries. + constexpr Entry(E value, base::StringPiece str) + : GenericEnumTableEntry(static_cast<int32_t>(value), str) {} +- +- DISALLOW_COPY_AND_ASSIGN(Entry); ++ DISALLOW_ASSIGN(Entry); + }; + + static_assert(sizeof(E) <= sizeof(int32_t), +@@ -306,15 +305,14 @@ class EnumTable { + if (is_sorted_) { + const std::size_t index = static_cast<std::size_t>(value); + if (ANALYZER_ASSUME_TRUE(index < data_.size())) { +- const auto& entry = data_.begin()[index]; ++ const auto& entry = data_[index]; + if (ANALYZER_ASSUME_TRUE(entry.has_str())) + return entry.str(); + } + return base::nullopt; + } + return GenericEnumTableEntry::FindByValue( +- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()), +- data_.size(), static_cast<int32_t>(value)); ++ &data_[0], data_.size(), static_cast<int32_t>(value)); + } + + // This overload of GetString is designed for cases where the argument is a +@@ -342,8 +340,7 @@ class EnumTable { + // enum value directly. + base::Optional<E> GetEnum(base::StringPiece str) const { + auto* entry = GenericEnumTableEntry::FindByString( +- reinterpret_cast<const GenericEnumTableEntry*>(data_.begin()), +- data_.size(), str); ++ &data_[0], data_.size(), str); + return entry ? static_cast<E>(entry->value) : base::Optional<E>(); + } + +@@ -358,7 +355,7 @@ class EnumTable { + // Align the data on a cache line boundary. + alignas(64) + #endif +- std::initializer_list<Entry> data_; ++ const std::vector<Entry> data_; + bool is_sorted_; + + constexpr EnumTable(std::initializer_list<Entry> data, bool is_sorted) +@@ -370,8 +367,8 @@ class EnumTable { + + for (std::size_t i = 0; i < data.size(); i++) { + for (std::size_t j = i + 1; j < data.size(); j++) { +- const Entry& ei = data.begin()[i]; +- const Entry& ej = data.begin()[j]; ++ const Entry& ei = data[i]; ++ const Entry& ej = data[j]; + DCHECK(ei.value != ej.value) + << "Found duplicate enum values at indices " << i << " and " << j; + DCHECK(!(ei.has_str() && ej.has_str() && ei.str() == ej.str())) |