diff options
Diffstat (limited to 'www-client/chromium')
-rw-r--r-- | www-client/chromium/Manifest | 15 | ||||
-rw-r--r-- | www-client/chromium/chromium-78.0.3904.108.ebuild (renamed from www-client/chromium/chromium-78.0.3904.97.ebuild) | 0 | ||||
-rw-r--r-- | www-client/chromium/chromium-79.0.3945.79.ebuild (renamed from www-client/chromium/chromium-79.0.3945.36.ebuild) | 5 | ||||
-rw-r--r-- | www-client/chromium/chromium-80.0.3970.5.ebuild (renamed from www-client/chromium/chromium-80.0.3962.2.ebuild) | 4 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-80-gcc-blink.patch | 27 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-80-gcc-quiche.patch | 30 | ||||
-rw-r--r-- | www-client/chromium/files/chromium-80-include.patch | 13 |
7 files changed, 84 insertions, 10 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 2dcd5108156e..7eafa4379e4a 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -16,7 +16,10 @@ 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-quiche.patch 1351 BLAKE2B 7bd967a9f3cd544368c623d3612632cd2bade48ac2c099c4570d5ead62ba28487e1fa222ee0bfe108f3d4f853744d799d2860f703eae3b7d6d36af77cd328508 SHA512 2f147e77d0737370c5dea8b575c0e631476bbce54a7b1c46d0bffeb56706d6ab695b8a9a7e61402430c57ec1f28668dd6682aa5d32d32762fc3ba1735f37542b +AUX chromium-80-include.patch 473 BLAKE2B ab949e188b93b076b637fdc7d8bede7094c1e4ada57bd25f80b1b6590792c568f2b3c3e4f2ff49774592699fb0f8505c87b0ea5ef64877d1c6619eca6bb49959 SHA512 90f73d25eafd984d9f63b479bd6f3dbe59cfdcaf61bceee6ed267b1ce2ec1e917d892b89630f7f68ac87b71d37e906bc0b5fd07b919c3ed49fc04777f69bd474 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 @@ -26,10 +29,10 @@ AUX chromium-unbundle-zlib-r1.patch 515 BLAKE2B f3263f7450a940449d7edc0aef46a888 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.97.tar.xz 742793812 BLAKE2B e7fada913f5831d805a50445da41ecbca7e27af52574ce242f427c0e4c83a74ae0283eb1667d74d39eb88f05e88e5a389945628666e24e26d635f74c43c8bc55 SHA512 e29312fe5c15eb6888a2e4d7e197c710d53feeecdf4e534c59f3db26973fee13f48880b46a7c3b132bb9989eb617db9c6138b809c3cb762332a9db25ad6d33dc -DIST chromium-79.0.3945.36.tar.xz 778020676 BLAKE2B abf0a15f5bea2af0c2b42a6676f5bb3fb0025c1d2644dfc6c1e47e1d65c61607a46eb09877f36cba3936d5df0f993b8a801f10e3111898f93fd85b270c3a7d99 SHA512 9b534ea0bf39cb5dbf5a16e652fb6f06b3f0fa578ae18c06e947927c50d1e4fa663a8341f9ab6d1f914e4822bfec9ea98c05c376b465d61d49ef91186abcded0 -DIST chromium-80.0.3962.2.tar.xz 788407196 BLAKE2B f7ece5f654f7b479ac4aad42e18dc2454c46b39353bdf6057c30aeb30714f033af21228269510ddd4ebb15b570987cdbe0d0ae67824368f205fbdb9308cbed07 SHA512 29460df7e6b8f4b01fea06faad236690739e250170c190ee991090fc300a3cbea034ebee50731485ac578d5f8c83cfc86e9438bd6ba91c686f17bea78dbf1e86 -EBUILD chromium-78.0.3904.97.ebuild 22982 BLAKE2B 8e427972b294bbf974b4634b450c1114f7e1dab5559efa8df5ecd6532b41d4c562663c212b032c9eeac4054216dcd5acecff5bfa23a353a59ba4c53c62dacadf SHA512 c6812c14c89182ea0b72aebc21ded27f8b7097d5537db6e33b3a794bc5ebad461c1af2cdf984325bd64a5e52968f66ee3c41041489190b701ebe3d3d22a600b4 -EBUILD chromium-79.0.3945.36.ebuild 22850 BLAKE2B 14aa61ffc99e333cf167e2f685e5abb2668fd5814a02fb4117918cdd5131f767bfcb3f2eb62ba9355556d1c59cbcd04cd2492dcfb17b9c718eed1840f5dbe537 SHA512 cf10f2a718598be9558f784719ae66c19cfce63aaf4980f3b786ccba470d63e4a3a3d5cbb8f8adb100f51a9b5774469e8219a947bae6237339bae5301e5928ff -EBUILD chromium-80.0.3962.2.ebuild 22599 BLAKE2B b289ef53c3c9172576503cf8667546e7036de0e5447e01394c37c23fed0358dd92c5a8f7a0777f45fc4af61be8bd2ca4b64de4ba3d9394fb3d415b767d2c2173 SHA512 ba864f1d5c4af3e2bdae5828a037fbc8ffa23b9b9308671b183dae460b8c159861b0a66dc56ee382bee0c9acd118af7cdcf0d1b664a8e3fc1a65b1a97ab96012 +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 diff --git a/www-client/chromium/chromium-78.0.3904.97.ebuild b/www-client/chromium/chromium-78.0.3904.108.ebuild index de0984e85449..de0984e85449 100644 --- a/www-client/chromium/chromium-78.0.3904.97.ebuild +++ b/www-client/chromium/chromium-78.0.3904.108.ebuild diff --git a/www-client/chromium/chromium-79.0.3945.36.ebuild b/www-client/chromium/chromium-79.0.3945.79.ebuild index b15b4e080dc8..b9c079e9a87f 100644 --- a/www-client/chromium/chromium-79.0.3945.36.ebuild +++ b/www-client/chromium/chromium-79.0.3945.79.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} 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" +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 )" @@ -444,9 +444,6 @@ src_configure() { # 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). diff --git a/www-client/chromium/chromium-80.0.3962.2.ebuild b/www-client/chromium/chromium-80.0.3970.5.ebuild index 6f34c5068d50..c6af893cb110 100644 --- a/www-client/chromium/chromium-80.0.3962.2.ebuild +++ b/www-client/chromium/chromium-80.0.3970.5.ebuild @@ -147,7 +147,10 @@ PATCHES=( "${FILESDIR}/chromium-78-protobuf-export.patch" "${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-blink.patch" ) pre_build_checks() { @@ -369,6 +372,7 @@ src_prepare() { third_party/webrtc/rtc_base/third_party/sigslot third_party/widevine third_party/woff2 + third_party/wuffs third_party/zlib/google tools/grit/third_party/six url/third_party/mozilla diff --git a/www-client/chromium/files/chromium-80-gcc-blink.patch b/www-client/chromium/files/chromium-80-gcc-blink.patch new file mode 100644 index 000000000000..fdc28f324350 --- /dev/null +++ b/www-client/chromium/files/chromium-80-gcc-blink.patch @@ -0,0 +1,27 @@ +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 ++++ b/third_party/blink/renderer/core/editing/commands/delete_selection_command.cc +@@ -224,6 +224,10 @@ static Position TrailingWhitespacePosition(const Position& position, + return Position(); + } + ++static bool IsAHTMLTableRowElement(const Node* node) { ++ return IsA<HTMLTableRowElement>(node); ++} ++ + void DeleteSelectionCommand::InitializePositionData( + EditingState* editing_state) { + DCHECK(!GetDocument().NeedsLayoutTreeUpdate()); +@@ -253,9 +257,9 @@ void DeleteSelectionCommand::InitializePositionData( + end_root_ = RootEditableElementOf(end); + + start_table_row_ = To<HTMLTableRowElement>( +- EnclosingNodeOfType(start, &IsA<HTMLTableRowElement>)); ++ EnclosingNodeOfType(start, &IsAHTMLTableRowElement)); + end_table_row_ = To<HTMLTableRowElement>( +- EnclosingNodeOfType(end, &IsA<HTMLTableRowElement>)); ++ EnclosingNodeOfType(end, &IsAHTMLTableRowElement)); + + // Don't move content out of a table cell. + // If the cell is non-editable, enclosingNodeOfType won't return it by diff --git a/www-client/chromium/files/chromium-80-gcc-quiche.patch b/www-client/chromium/files/chromium-80-gcc-quiche.patch new file mode 100644 index 000000000000..aa3d54126cac --- /dev/null +++ b/www-client/chromium/files/chromium-80-gcc-quiche.patch @@ -0,0 +1,30 @@ +From 00f47df999c9b19e80fdc01db0ae9ca1b6a12b3a Mon Sep 17 00:00:00 2001 +From: vasilvv <vasilvv@google.com> +Date: Wed, 03 Apr 2019 13:58:53 -0700 +Subject: [PATCH] GCC: do not delete move constructor of QuicStreamSendBuffer + +QuicStreamSendBuffer constructor is implicitely required in the +initialization of the vector of substreams in QuicCryptoStream. +Though clang apparently ignores that, GCC fails to build. + +BUG=chromium:819294 + +Originally submitted by José Dapena Paz <jose.dapena@lge.com> at https://quiche-review.googlesource.com/c/quiche/+/2420 + +PiperOrigin-RevId: 241800134 +Change-Id: I4e3c97d6e5895d85340e8c1b740e6196d9104066 +--- + +diff --git a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h +index e34514b..74e9d0d 100644 +--- a/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h ++++ b/net/third_party/quiche/src/quic/core/quic_stream_send_buffer.h +@@ -62,7 +62,7 @@ + public: + explicit QuicStreamSendBuffer(QuicBufferAllocator* allocator); + QuicStreamSendBuffer(const QuicStreamSendBuffer& other) = delete; +- QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = delete; ++ QuicStreamSendBuffer(QuicStreamSendBuffer&& other) = default; + ~QuicStreamSendBuffer(); + + // Save |data_length| of data starts at |iov_offset| in |iov| to send buffer. diff --git a/www-client/chromium/files/chromium-80-include.patch b/www-client/chromium/files/chromium-80-include.patch new file mode 100644 index 000000000000..a2a00a9d4557 --- /dev/null +++ b/www-client/chromium/files/chromium-80-include.patch @@ -0,0 +1,13 @@ +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" + ++#include <memory> ++ + namespace mojo { + class BinderMap; + } |