diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-06-16 05:02:38 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-06-16 05:02:38 +0100 |
| commit | f1bc537f089cc8477a9a18db597cb349e1b00e91 (patch) | |
| tree | c48eb730c43e5f35729fabbe5cb4bfbe4a1bc794 /www-client/chromium | |
| parent | cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa (diff) | |
gentoo resync : 16.06.2018
Diffstat (limited to 'www-client/chromium')
18 files changed, 211 insertions, 1358 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 6049948a64f5..1bb99d091d0c 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,33 +1,26 @@ -AUX chromium-FORTIFY_SOURCE-r2.patch 1206 BLAKE2B d712ae12229c5765d28385d0b40c9f32fc3580d30f73c52cb836b29d702c03639e677872c28d836ed0a7c376fb3f305d8e9f70f4c7e3a0d1d7a5e4c629f83b74 SHA512 2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c25eb76e4a02f6d11659489c6e40397a0b2f7bc1fda336fd2c6dd8c863fccc3340719210b41c7fef51927f4 SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca -AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1feace304c6db309460b74f630dd59c424f152ebf6a1d88025c14b7162d14a38afde6e74a87ca04d3424fd9b6 SHA512 f5edc9b573269a7a6944e17019fa858e7162c548400eceabdabe695d7e10d3179b7593415ec3eaef226defdd1628fd8c9cc66c0b46ebe6ac1afe5035a319c379 -AUX chromium-clang-r4.patch 363 BLAKE2B 4c776d4823eef90f69bb42b1fc2ed5c314fcb60cdc2da44d90bd3faf6d9a9d3fdf8367a85f6e735b59fe440f7de5582a974b3e04f4ff46683242f368e68b1503 SHA512 78fa7d69b2b8bdd5a755baff7d5474943ad373d2cc9673db61f501b0f8150bbdf795b3c2afa557d637564276dd5b4edda282daa7cbb7b5ea9366bd81f8989ab0 AUX chromium-compiler-r0.patch 5681 BLAKE2B d56abb6f816cfb530e583b5e59c7719f766ed0ce198f1caf3043cde38115fabb8f776f57946abf57f7430259ac0bb7c7c44602198d9a5e1f3ac942c4f1da366f SHA512 01a799b1ae1dd4042fffb0307207089c99d568289e20677ff7436767da9ee16cc6491f759d0b7447b59b53d44cbd235053078aa7dfdfcbc66eb9cd2d73ab8857 -AUX chromium-compiler-r1.patch 5859 BLAKE2B 6a96e586c0f38e949544d8d5a756b92a08107ea41de3c62d1c8c38173c67ae8c08a2b9207947b78048ca0dd7d731c60c2ac34a7e72facc340ff876cd42f91d0e SHA512 01303f0d134edeb1bac5a1c2e95b7e66997b218fcd8af8aa53860a48d0f4adff000b90a9e12a55eb11dbb163ac4f1926e010b194a6d9b75b62598040c6fcbfb0 AUX chromium-compiler-r2.patch 5649 BLAKE2B 211945cbb207e956517470210d97b2dbbf6c496f71cacda7f2fa288e5ba631a791a0e60214e982d4f91c4db723dd5c4aaa2e9f51423d2e63fce8b334687170f8 SHA512 563017b56d410080ae3bee8053cb65f0308d841b96222cb6ea7e444cfd066dbd8c6161489240c778de63794ada76c90189fd794001d4fe50ab875251c0b7f41f -AUX chromium-ffmpeg-build-r0.patch 8657 BLAKE2B 08bddd7f6ca4379ec2fddeda91a1bb709a4be1c26dd869e1e21ac2576cede1c28531b0ad40bc8a6abb74212fa9cf2dbe1c05bb20cf0b9730918c71bda47c0779 SHA512 5014564446305d9e594de8bf51483a29b25c7e2f8d4bb858419669bdaae5ba60cef55c8e0d2b4236a58b2be0f8762bd588089b6face98e763e6e5f8f78801f17 +AUX chromium-cors-string-r0.patch 1819 BLAKE2B 80f68395eebbc8425dd5d17c46364bc8d3f8cb657c4e4ffe94a221a22f006f15eb6aad68160e0da767a23276ebd6a4efb6fe2d468501c48571b32bf8c17486c9 SHA512 06314e759c7073d19bb18f41713e43ca34e608ebec4d269cecb7d592e84fe7f10e839e1c3824c574e938746b26a6f2f9d6361f7d21b5698b917c7b3e0fe87b94 AUX chromium-ffmpeg-clang.patch 840 BLAKE2B cd0af6414462be4ee0cbb46e0c43b705f6883ed42a536747a5ab5a9a6c52727c521aca92bce61b55cf68be6dbac665a41846fd8907335e1dd34b452f973b624e SHA512 e02bc169ef60af8f48b67ed36a7f0e1232fcfc2c59fd48de5cc6c0a267fe29eccd7971a2692ce07c34cf07d5bf416389e10442bf2658822b3fbd27dd623ea91a AUX chromium-ffmpeg-r1.patch 528 BLAKE2B c6cbbbb13093b10d0d8e95bd382dbc7f9afb6634802f6560a7b5886482c912cb493aed4c231b4c781b89de6dcf4200b17ba9315e337a3f73e8fdca12dceb80fb SHA512 1dc7dd844e8e0aec379ace3a163200735bbab0644f9d02fa0736f91a4156e9cede5b66eb6a015f8679ecd26dab2345b82ed181591bb78a1e88d3cc0174237ea0 -AUX chromium-gn-bootstrap-r23.patch 1943 BLAKE2B ca68059bf799dcc8fdd7ab698008e55a2c5707168c72b463ffd66a73f97df8ff5689fa5d440d60b519ac3ed6739a1b95ce5ed8f294e473d065a7bb2a35bb4267 SHA512 0af208a257ff3ce3f61b242e05ee4988a371c3d9ee5c686fdc15b023283b1914272c4e30562a48c294fa47f665b5082e274f44f871c97afc6c849b6065f9deec -AUX chromium-gn-bootstrap-r24.patch 1206 BLAKE2B 1c7ae7581d8ec37f1e00846a4059018141d58784c5bc41ef5b45924f30ffaeb4911b534c47a437b29818c4908c8b3a9a7ec751515c567d665511ca3f9ecb0115 SHA512 1dbfb22841b201587d0c09a4bccfd390d5383c9183f83078384f1e96267a3e186cbe6285c8ef632c366d110cdd445ad1491d590e9d036c024da57b07ad0259b0 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d +AUX chromium-libjpeg-r0.patch 2734 BLAKE2B b30bdc08c9c2ab84824a963cd0cad6b3c6c1f42b0056ad70a336fcef024ab25ffec9d06330a61fe7869ffe1dab02a71589d46a56ba531aaafe6a3cc4284bc037 SHA512 ccc5887c3c1ef2a84de7db6318bdeab4330a48a83cc4b11b7b4834b5a579f1da9cd8c78bd4b22e4fada41de25651fcf7539be69745c767a4540e69d26096a532 +AUX chromium-libwebp-shim-r0.patch 921 BLAKE2B e273db17653b56f79916ed64d5c612675dad01a8f4b72ed3ce924147e90d458574ecf557e07874ca0547088b211b5e360b0ba421764917557a39c364179d8ad6 SHA512 d2dc9ce579bb900b131061a2f8070bd43c36d61b619b1f3addd460f19bc55236ce1d44ba405f0adb084ddde66e564b94bbd516b80af5c89f778bf2c55354dd78 AUX chromium-math.h-r0.patch 1092 BLAKE2B abdef69cacaa5af0cd84b293b300fa5db631b7df8d4f1237449e858dc3ff56589a3f46d8228fc0c969552f41bd9cf2a0c2cbf4a1936c2729f701aa1d4ad86b94 SHA512 91a0d74ec51a6776bfc4212a132963fbc4688c47ee1da40cfbebf696ef26a766f5189cb0a972ef2cf4338daa5355ce79002d624b5f30a7c2de36e40b07355f8d AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a AUX chromium-stdint.patch 623 BLAKE2B a4bc24a472bef266cc8e67fde8249b17dcd407fd86e6f614f24bb5acb18426b620b7b5e8e4d392940cab3474e8e8ee9633c61a99853f6316c77417ff78f1c034 SHA512 adfd265ecb2326f221eae07f910b7217f5bccf6be4ba750069bc05d7ae458f3b32ae825782d032299330e7c29a93a76fc732c5f5865669ea5eecbe167e04133a AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051 -AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a AUX chromium-widevine-r2.patch 1488 BLAKE2B fc4dc6ce40b2d2a152a0bbc5958d8050d9a7f4176cd0121d81ae1a9e76d361c064f54e034fb9213fc802e0a4b1b8d661788dbe9089daf8b197414724a057d4e4 SHA512 6fe8eb7b0e6c88e00d1b3dadf433b886c71cbf9b3dd4e712845a636a689cad6bc58fa8b20b412a1f7a8a1b649bccc8c961e762fa5f4d4ae092355e70db0a9cfe AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 -DIST chromium-66.0.3359.170.tar.xz 583956312 BLAKE2B 313ac8c785147e940ead222aeb30181af3c5848bdc7e706bf83a42078c63ce71431a7d17ad4937a6a37cc72beb67725ead790f489a1d31c70a9a94a2e73a9c45 SHA512 69c78975c517d6d59225c92968c1be879e3a2ca2a3671f38a5f8b6303719f6bc441b1d1fe0b19818ab7f9a06cd15bf8631d03ad4931da6fdc641ba2894eecad2 -DIST chromium-66.0.3359.181.tar.xz 583985908 BLAKE2B 22794b379591da9e4bfb1ea38aec2f53e88584079ef8d0e56434d65b2f86bddf37ac41a82b9e94ae41700f10ce8b7a8bfe2c794ffe63ce9d04b2704bfe2a209d SHA512 3549cae27ce33a19bab857c91da1ed96c1ae36123b71bdf41a8bbacdc9554d15b4902e835dc4a8ef8016e69344b809aab4e1e3b1b26bd54d5ca651048bcb9886 -DIST chromium-67.0.3396.56.tar.xz 589901992 BLAKE2B e5207de67db589d65dbaf7af493308a60e3951993f439218c025d10fecd331052a3dfd0f196f3c7e078cda79af3d248a94550a6ffb8c0da7842592e48de20313 SHA512 a7397ebcff54e184ad510fcc7d7958a4adafcf53c88a7ad951fc361366439b01c4e1a77dfcfadbf1f96d92e9ea503287862e7cd2521be696919cf3ee0f1d0816 DIST chromium-67.0.3396.62.tar.xz 591452000 BLAKE2B 01d63d21548fcfc707e3ab1d293f24f34237784ec87949e2886a364d7e8f517f82e98803f45b690111a31304d269917442305d04fa13c34180f852007280a78c SHA512 c768701a04600f6dd981ea036a28973df104281dcdadda20d0ae515a0b80112b94840cee36823676c4b4cd71e0e6ef069af801f746fea29d65f978a3666f6cb0 -DIST chromium-68.0.3409.2.tar.xz 595647380 BLAKE2B 3f3ebb7de759ae92b8feca74a931c10c4bdf4f75a0a7aeb2f56b59e635e1f03becccdf2b26d306e5753d9379eadede6ef50ec4e44338a3a6bdfb960b74003770 SHA512 2ce35251392570bcfe0cc02813bf6cee1761b2227888a135491828bfdfa9eafa4538e8fb981165503f901eecbf91cc8ce17cebab1681c63a43f0625dae7a2dd8 -DIST chromium-68.0.3438.3.tar.xz 624448788 BLAKE2B 25e8f6bfc9171f17a634caa8974a01dba8e0b40dba78534f8b04cbced98566ce8addba65907165599587d0120563073f051af2af19601e4556182b9ec5442113 SHA512 2ff17270acee971bf9a2770b826f919979f24ab7be12a00504ad0b16e72f21fd70f7dc543e8823f8c1737ff785ae900e999d2e82153ff84d0b33cf68ad82a2a2 -EBUILD chromium-66.0.3359.170.ebuild 21079 BLAKE2B ad63d299090512b44fe6d1deccb754a9c3471abeb4cdb013c5e2b4743d500cfb3a3434ee842310c5b5e1a3145028b98a112ecbf0f31004cf1966aeb92a1a16a8 SHA512 17d7f7856cfbe4b9006e153d312b43c43ffccb9c1c5f2e9f4f920eefccc83000f29177028319597bae453148a6c8c255695694345b289ef5b6da2842abe4e4c6 -EBUILD chromium-66.0.3359.181.ebuild 21080 BLAKE2B 886abfd8535cf3069938bd5c7e048b0bf27b08c451e9225e514ba63b7d4181a7febbacdcaf8540f8db683aff6903027ca09644de1fba6a4ffc9e0dd70d27d998 SHA512 d054f5fc67cc2e538c7d9136e07214f203d76e88afe23b9defbe269cb17173f6eee5336f7552818221f4c57bf21545c359611156da07df4aa71307db41a4c025 -EBUILD chromium-67.0.3396.56.ebuild 20970 BLAKE2B 7a26f21631d49d99a738775de819c4abb3df639a13a3eebfd5c38780cc94e208a8e1b3dd785c06c0e91b9a1a7ed1c5a0e564fc9392f6e9b031c58c8fa7ac363e SHA512 3a19fd0b2fd59c86a59625097d56e8d16e698df56279327f0c9c929a0654913dca957be153e0f9c6b92e812f7b16118225089af50dc9751f99cbf789a231e4dd -EBUILD chromium-67.0.3396.62.ebuild 20536 BLAKE2B 1f9dfece27663b1f77d043ddd9d73888b367715a6b003930af7556b12634966a0ebf22605576c9449a3f35e676917f69d96dc7b6702ffd593df8cb7ee24c2ca7 SHA512 6d625016a4130502a985659d22577bb3a9411ec8961a5c04b28fc63a77443287fd9af452b802d25653170f43f30246634ad2680d46dae60e07e0b5b79ab61eba -EBUILD chromium-68.0.3409.2.ebuild 21128 BLAKE2B c0b3f816629ad411e9a1173d8613b56b265ac2d64c314d0ffcc146e6692ab3a997cc4390658ed8f8926bad36be480a907ad7c0f455d90be445277c56a28622bf SHA512 619db1868802d4857193c91531539084a40177dabc3b622bdedf35f1b3e5a48c751c8a106d19035dc3d6da86e003a2d9a74d936c30cb5c3225b827c39784018a -EBUILD chromium-68.0.3438.3.ebuild 20521 BLAKE2B 394bd409a05510ab68f7d6fd959d873c9b5c0270f7fa1cd60a5cef4486d5609a5a44eb787806dbefd150d78c358d51c72025d2703094bb84ef7673ab0e9443fe SHA512 d63e83a360ed95917f0f6f5c4c39c25698eaea5c9d832b0bb187e6aaacc5cdd492ad0bc990a29f846f21f3eb93b414417e680ff4e3822bf563249a3e6053da93 +DIST chromium-67.0.3396.79.tar.xz 591459156 BLAKE2B c62a54ceaf240a06ce54ff2e13ea1c22bb89c7d88628ab005230ded307b44836c96f12fc85cef85fe088fbed66e203bc359d2b516347969d733e99b0e6d143b6 SHA512 4b7cd2cdc5a2b784e61498e945dbac0a086f2ff9224e0c050f85ab86183602860b34dc305c99730c31478820e48a1da4570284359f13275ab2b10592190cbca8 +DIST chromium-67.0.3396.87.tar.xz 591491608 BLAKE2B 9069c4b2e000e180a9b21bbdbb67428817073cd662830f7e736073833f2e6ab2f94f3127d15ed521e34c82de727f137e0065fd3aa7fa7312c4940b1bd8959ccc SHA512 6f9c108b70b63cd45e8238c1962ec11d4f2d01e4f2a6b6483bfafc7986ed6001d5f09f9b0b893c864a08bade9d93346395bb2d045dcafb2ef94b0f4e00f2fe0d +DIST chromium-68.0.3440.17.tar.xz 624240248 BLAKE2B 9322f731efbc218dbefec351984f93bac5deedee3cc5ce426a619262d885097f28d8532a3d5b55e8daacd2c28dee2dd85dd4063687cbc7ed7d125d2a2a48f885 SHA512 1a6af7c5f3bfe87b37844c9d863f512aa464de75252487877d7796fa0dc246a533357086c64701f624809493eef97fced23d3eaa449819b38ce6038227015d35 +DIST chromium-68.0.3440.25.tar.xz 624353904 BLAKE2B 8ed052e5ad831499367ef1e6d40d08bb585e49855f4c6b820d5532c96f240ad312e66484b75b5b8398e737e2400b7ff1f9edd944b5f6a16d81ace019f6dd0952 SHA512 c82436dc42dd9ee1b87881d617f6c791a9dc04d85bb1d4588a3cf31009edd8aeb9d89c357581f705e3602580be1d70ab5fd85f629abf7c7f647fa8a5f06f3add +EBUILD chromium-67.0.3396.62.ebuild 20544 BLAKE2B 07e05f7ac23edef490bd16a7936e5ad91878b30a3b49fc88a600bfa8ca8948ad4775ed7568e90a35af7859146f14edb124c56b377e8cfa3ac99039c9e39782cf SHA512 47ab5e077a4690c538643efb7884815368ef074f358f99cb3021b50675a44487abb216d71bbbafc287005d064be3bf4f59dd0596e053bfacb63907f2feed3f11 +EBUILD chromium-67.0.3396.79.ebuild 20545 BLAKE2B 9869b9b00d88e4a1bd5a3d3eb29762e4dfa3100b18d78b6a427b2b5ccf6abc213a6a9dbb10b1a2ee44469f9123ad7592ee5be613a19db8a017bf635ebe00793d SHA512 987ad9083056cb7308d526d609f1d7323208bc096fa5205b946bb5e05a7e0778433d5ac0e6a7de0ceef532f017d2880c7dda49ea2ca7ced1f5c3eb09424f046e +EBUILD chromium-67.0.3396.87.ebuild 20545 BLAKE2B 9869b9b00d88e4a1bd5a3d3eb29762e4dfa3100b18d78b6a427b2b5ccf6abc213a6a9dbb10b1a2ee44469f9123ad7592ee5be613a19db8a017bf635ebe00793d SHA512 987ad9083056cb7308d526d609f1d7323208bc096fa5205b946bb5e05a7e0778433d5ac0e6a7de0ceef532f017d2880c7dda49ea2ca7ced1f5c3eb09424f046e +EBUILD chromium-68.0.3440.17.ebuild 20513 BLAKE2B e7e264516f43d6a6c71058c16986ad83142afde8c51951bbd9e40489bf2330c00dc69a02afaf27bd81e1efb7ba68ebe9dbc09baed79ff2699b57446136734d05 SHA512 a8e6d827d86c26a24df5f8d1962d5085bca931526089277b46b1faac269a460afcad02e34588205a39d84c4ab92cd05d2d2d79660490bd3785adc85d174a1a1a +EBUILD chromium-68.0.3440.25.ebuild 20513 BLAKE2B e7e264516f43d6a6c71058c16986ad83142afde8c51951bbd9e40489bf2330c00dc69a02afaf27bd81e1efb7ba68ebe9dbc09baed79ff2699b57446136734d05 SHA512 a8e6d827d86c26a24df5f8d1962d5085bca931526089277b46b1faac269a460afcad02e34588205a39d84c4ab92cd05d2d2d79660490bd3785adc85d174a1a1a MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039 diff --git a/www-client/chromium/chromium-66.0.3359.170.ebuild b/www-client/chromium/chromium-66.0.3359.170.ebuild deleted file mode 100644 index 068e87e1f027..000000000000 --- a/www-client/chromium/chromium-66.0.3359.170.ebuild +++ /dev/null @@ -1,701 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -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 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="http://chromium.org/" -SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~x86" -IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" - -COMMON_DEPEND=" - app-accessibility/at-spi2-atk:2 - app-arch/bzip2:= - cups? ( >=net-print/cups-1.3.11:= ) - dev-libs/atk - dev-libs/expat:= - dev-libs/glib:2 - system-icu? ( >=dev-libs/icu-59:= ) - >=dev-libs/libxml2-2.9.4-r3:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.26:= - >=dev-libs/re2-0.2016.05.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-1.6.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-3:= - || ( - media-video/ffmpeg[-samba] - >=net-fs/samba-4.5.10-r1[-debug(-)] - ) - !=net-fs/samba-4.5.12 - 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-client/chromium-9999 - !<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 ) - widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] ) -" -# dev-vcs/git - https://bugs.gentoo.org/593476 -# sys-apps/sandbox - https://crbug.com/586444 -DEPEND="${COMMON_DEPEND} - >=app-arch/gzip-1.7 - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - >=dev-util/gperf-3.0.3 - >=dev-util/ninja-1.7.2 - >=net-libs/nodejs-6.9.4 - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - >=sys-devel/clang-5 - virtual/pkgconfig - dev-vcs/git - $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - ') -" - -# Keep this in sync with the python_gen_any_dep call. -python_check_deps() { - has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && - has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" -} - -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. -" - -PATCHES=( - "${FILESDIR}/chromium-widevine-r1.patch" - "${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch" - "${FILESDIR}/chromium-webrtc-r0.patch" - "${FILESDIR}/chromium-memcpy-r0.patch" - "${FILESDIR}/chromium-clang-r2.patch" - "${FILESDIR}/chromium-math.h-r0.patch" - "${FILESDIR}/chromium-stdint.patch" - "${FILESDIR}/chromium-clang-r4.patch" - "${FILESDIR}/chromium-ffmpeg-r1.patch" - "${FILESDIR}/chromium-ffmpeg-clang.patch" -) - -pre_build_checks() { - #if [[ ${MERGE_TYPE} != binary ]]; then - # local -x CPP="$(tc-getCXX) -E" - # if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then - # # bugs: #601654 - # die "At least clang 3.9.1 is required" - # fi - # if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then - # # bugs: #535730, #525374, #518668, #600288, #627356 - # die "At least gcc 5.0 is required" - # fi - #fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - CHECKREQS_DISK_BUILD="5G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - CHECKREQS_DISK_BUILD="25G" - if ! use component-build; then - CHECKREQS_MEMORY="16G" - fi - fi - eshopts_pop - 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/dmg_fp - 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 - third_party/WebKit - third_party/analytics - third_party/angle - third_party/angle/src/common/third_party/base - third_party/angle/src/common/third_party/smhasher - 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-validation-layers - third_party/blink - third_party/boringssl - third_party/boringssl/src/third_party/fiat - 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/polymer - third_party/catapult/tracing/third_party/d3 - third_party/catapult/tracing/third_party/gl-matrix - 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/crc32c - third_party/cros_system_api - third_party/devscripts - third_party/dom_distiller_js - third_party/fips181 - third_party/flatbuffers - third_party/flot - third_party/freetype - third_party/glslang-angle - 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/jstemplate - third_party/khronos - third_party/leveldatabase - third_party/libXNVCtrl - third_party/libaddressinput - third_party/libaom - third_party/libaom/source/libaom/third_party/x86inc - third_party/libjingle - third_party/libphonenumber - third_party/libsecret - third_party/libsrtp - 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/node - third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 - third_party/openmax_dl - 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/ply - third_party/polymer - third_party/protobuf - third_party/protobuf/third_party/six - third_party/qcms - third_party/s2cellid - third_party/sfntly - third_party/skia - third_party/skia/third_party/gif - third_party/skia/third_party/vulkan - third_party/smhasher - third_party/spirv-headers - third_party/spirv-tools-angle - third_party/sqlite - third_party/swiftshader - third_party/swiftshader/third_party/llvm-subzero - third_party/swiftshader/third_party/subzero - third_party/unrar - third_party/usrsctp - third_party/vulkan - third_party/vulkan-validation-layers - third_party/web-animations-js - third_party/webdriver - third_party/webrtc - third_party/widevine - third_party/woff2 - third_party/zlib/google - url/third_party/mozilla - v8/src/third_party/valgrind - v8/src/third_party/utf8-decoder - v8/third_party/inspector_protocol - - # 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 -} - -bootstrap_gn() { - if tc-is-cross-compiler; then - local -x AR=${BUILD_AR} - local -x CC=${BUILD_CC} - local -x CXX=${BUILD_CXX} - local -x NM=${BUILD_NM} - local -x CFLAGS=${BUILD_CFLAGS} - local -x CXXFLAGS=${BUILD_CXXFLAGS} - local -x LDFLAGS=${BUILD_LDFLAGS} - fi - einfo "Building GN..." - set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean - echo "$@" - "$@" || 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 ! tc-is-clang; then - # Force clang since gcc is pretty broken at the moment. - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - strip-unsupported-flags - fi - - if tc-is-clang; then - myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" - else - myconf_gn+=" is_clang=false" - fi - - # Define a custom toolchain for GN - myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" - - if tc-is-cross-compiler; then - tc-export BUILD_{AR,CC,CXX,NM} - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" - myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" - else - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" - fi - - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. - myconf_gn+=" is_debug=false" - - # Component build isn't generally intended for use by end users. It's mostly useful - # for development and debugging. - myconf_gn+=" is_component_build=$(usex component-build true false)" - - # 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+=" 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)" - 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 - 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 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" - - # 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 - - # https://bugs.gentoo.org/588596 - #append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks) - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -p -m 755 "${TMPDIR}" || die - - # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ - - if ! use system-ffmpeg; 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 - - bootstrap_gn - - einfo "Configuring Chromium..." - set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release - echo "$@" - "$@" || die -} - -src_compile() { - # 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 -} - -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 - - if use widevine; then - # These will be provided by chrome-binary-plugins - rm out/Release/libwidevinecdm*.so || die - fi - - 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 22 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 - - readme.gentoo_create_doc -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - readme.gentoo_print_elog -} diff --git a/www-client/chromium/chromium-67.0.3396.62.ebuild b/www-client/chromium/chromium-67.0.3396.62.ebuild index edd4f56ad44a..4a5343767d8f 100644 --- a/www-client/chromium/chromium-67.0.3396.62.ebuild +++ b/www-client/chromium/chromium-67.0.3396.62.ebuild @@ -540,7 +540,7 @@ src_configure() { mkdir -p -m 755 "${TMPDIR}" || die # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ + addpredict /dev/dri/ #nowarn if ! use system-ffmpeg; then local build_ffmpeg_args="" diff --git a/www-client/chromium/chromium-67.0.3396.56.ebuild b/www-client/chromium/chromium-67.0.3396.79.ebuild index 773792ab8f90..48fa2fe9d54d 100644 --- a/www-client/chromium/chromium-67.0.3396.56.ebuild +++ b/www-client/chromium/chromium-67.0.3396.79.ebuild @@ -104,22 +104,8 @@ DEPEND="${COMMON_DEPEND} >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git - $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - ') " -# Keep this in sync with the python_gen_any_dep call. -python_check_deps() { - has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && - has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" -} - if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; fi @@ -239,7 +225,10 @@ src_prepare() { 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/jszip @@ -310,6 +299,7 @@ src_prepare() { third_party/qcms third_party/s2cellid third_party/sfntly + third_party/simplejson third_party/skia third_party/skia/third_party/gif third_party/skia/third_party/vulkan @@ -550,7 +540,7 @@ src_configure() { mkdir -p -m 755 "${TMPDIR}" || die # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ + addpredict /dev/dri/ #nowarn if ! use system-ffmpeg; then local build_ffmpeg_args="" diff --git a/www-client/chromium/chromium-68.0.3409.2.ebuild b/www-client/chromium/chromium-67.0.3396.87.ebuild index 8abff3abbda3..48fa2fe9d54d 100644 --- a/www-client/chromium/chromium-68.0.3409.2.ebuild +++ b/www-client/chromium/chromium-67.0.3396.87.ebuild @@ -104,22 +104,8 @@ DEPEND="${COMMON_DEPEND} >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git - $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - ') " -# Keep this in sync with the python_gen_any_dep call. -python_check_deps() { - has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && - has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" -} - if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; fi @@ -145,14 +131,13 @@ GTK+ icon theme. PATCHES=( "${FILESDIR}/chromium-widevine-r2.patch" - "${FILESDIR}/chromium-compiler-r1.patch" - "${FILESDIR}/chromium-ffmpeg-build-r0.patch" + "${FILESDIR}/chromium-compiler-r0.patch" "${FILESDIR}/chromium-webrtc-r0.patch" "${FILESDIR}/chromium-memcpy-r0.patch" "${FILESDIR}/chromium-math.h-r0.patch" "${FILESDIR}/chromium-stdint.patch" "${FILESDIR}/chromium-ffmpeg-r1.patch" - "${FILESDIR}/chromium-gn-bootstrap-r23.patch" + "${FILESDIR}/chromium-ffmpeg-clang.patch" ) pre_build_checks() { @@ -215,7 +200,6 @@ src_prepare() { buildtools/third_party/libc++abi chrome/third_party/mozilla_security_manager courgette/third_party - net/third_party/http2 net/third_party/mozilla_security_manager net/third_party/nss third_party/WebKit @@ -241,7 +225,10 @@ src_prepare() { 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/jszip @@ -305,7 +292,6 @@ src_prepare() { third_party/pdfium/third_party/libpng16 third_party/pdfium/third_party/libtiff third_party/pdfium/third_party/skia_shared - third_party/perfetto third_party/ply third_party/polymer third_party/protobuf @@ -313,9 +299,9 @@ src_prepare() { third_party/qcms third_party/s2cellid third_party/sfntly + third_party/simplejson third_party/skia 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 @@ -337,7 +323,6 @@ src_prepare() { url/third_party/mozilla v8/src/third_party/valgrind v8/src/third_party/utf8-decoder - v8/third_party/antlr4 v8/third_party/inspector_protocol # gyp -> gn leftovers @@ -555,7 +540,7 @@ src_configure() { mkdir -p -m 755 "${TMPDIR}" || die # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ + addpredict /dev/dri/ #nowarn if ! use system-ffmpeg; then local build_ffmpeg_args="" diff --git a/www-client/chromium/chromium-68.0.3438.3.ebuild b/www-client/chromium/chromium-68.0.3440.17.ebuild index eb64c40b42e9..13d9aa7c022f 100644 --- a/www-client/chromium/chromium-68.0.3438.3.ebuild +++ b/www-client/chromium/chromium-68.0.3440.17.ebuild @@ -132,13 +132,14 @@ GTK+ icon theme. PATCHES=( "${FILESDIR}/chromium-widevine-r2.patch" "${FILESDIR}/chromium-compiler-r2.patch" - #"${FILESDIR}/chromium-ffmpeg-build-r0.patch" "${FILESDIR}/chromium-webrtc-r0.patch" "${FILESDIR}/chromium-memcpy-r0.patch" "${FILESDIR}/chromium-math.h-r0.patch" "${FILESDIR}/chromium-stdint.patch" "${FILESDIR}/chromium-ffmpeg-r1.patch" - "${FILESDIR}/chromium-gn-bootstrap-r24.patch" + "${FILESDIR}/chromium-libjpeg-r0.patch" + "${FILESDIR}/chromium-cors-string-r0.patch" + "${FILESDIR}/chromium-libwebp-shim-r0.patch" ) pre_build_checks() { @@ -266,7 +267,6 @@ src_prepare() { third_party/libXNVCtrl third_party/libaddressinput third_party/libaom - third_party/libaom/source/libaom/third_party/x86inc third_party/libjingle third_party/libphonenumber third_party/libsecret @@ -550,7 +550,7 @@ src_configure() { mkdir -p -m 755 "${TMPDIR}" || die # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ + addpredict /dev/dri/ #nowarn #if ! use system-ffmpeg; then if false; then diff --git a/www-client/chromium/chromium-66.0.3359.181.ebuild b/www-client/chromium/chromium-68.0.3440.25.ebuild index dc900e5faf63..13d9aa7c022f 100644 --- a/www-client/chromium/chromium-66.0.3359.181.ebuild +++ b/www-client/chromium/chromium-68.0.3440.25.ebuild @@ -8,7 +8,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 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils +inherit check-reqs chromium-2 eutils gnome2-utils 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/" @@ -44,7 +44,7 @@ COMMON_DEPEND=" >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( - >=media-video/ffmpeg-3:= + >=media-video/ffmpeg-4:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] @@ -104,22 +104,8 @@ DEPEND="${COMMON_DEPEND} >=sys-devel/clang-5 virtual/pkgconfig dev-vcs/git - $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - >=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] - ') " -# Keep this in sync with the python_gen_any_dep call. -python_check_deps() { - has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && - has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]" -} - if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; fi @@ -144,16 +130,16 @@ GTK+ icon theme. " PATCHES=( - "${FILESDIR}/chromium-widevine-r1.patch" - "${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch" + "${FILESDIR}/chromium-widevine-r2.patch" + "${FILESDIR}/chromium-compiler-r2.patch" "${FILESDIR}/chromium-webrtc-r0.patch" "${FILESDIR}/chromium-memcpy-r0.patch" - "${FILESDIR}/chromium-clang-r2.patch" "${FILESDIR}/chromium-math.h-r0.patch" "${FILESDIR}/chromium-stdint.patch" - "${FILESDIR}/chromium-clang-r4.patch" "${FILESDIR}/chromium-ffmpeg-r1.patch" - "${FILESDIR}/chromium-ffmpeg-clang.patch" + "${FILESDIR}/chromium-libjpeg-r0.patch" + "${FILESDIR}/chromium-cors-string-r0.patch" + "${FILESDIR}/chromium-libwebp-shim-r0.patch" ) pre_build_checks() { @@ -216,8 +202,11 @@ src_prepare() { buildtools/third_party/libc++abi chrome/third_party/mozilla_security_manager courgette/third_party + net/third_party/http2 net/third_party/mozilla_security_manager net/third_party/nss + net/third_party/quic + net/third_party/spdy third_party/WebKit third_party/analytics third_party/angle @@ -230,6 +219,7 @@ src_prepare() { third_party/angle/third_party/spirv-headers third_party/angle/third_party/spirv-tools third_party/angle/third_party/vulkan-validation-layers + third_party/apple_apsl third_party/blink third_party/boringssl third_party/boringssl/src/third_party/fiat @@ -240,7 +230,10 @@ src_prepare() { 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/jszip @@ -249,6 +242,8 @@ src_prepare() { third_party/catapult/tracing/third_party/pako third_party/ced third_party/cld_3 + third_party/crashpad + third_party/crashpad/crashpad/third_party/zlib third_party/crc32c third_party/cros_system_api third_party/devscripts @@ -272,11 +267,11 @@ src_prepare() { third_party/libXNVCtrl third_party/libaddressinput third_party/libaom - 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 @@ -302,15 +297,20 @@ src_prepare() { third_party/pdfium/third_party/libpng16 third_party/pdfium/third_party/libtiff third_party/pdfium/third_party/skia_shared + third_party/perfetto third_party/ply third_party/polymer 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/third_party/gif + third_party/skia/third_party/skcms third_party/skia/third_party/vulkan third_party/smhasher third_party/spirv-headers @@ -332,6 +332,7 @@ src_prepare() { url/third_party/mozilla v8/src/third_party/valgrind v8/src/third_party/utf8-decoder + v8/third_party/antlr4 v8/third_party/inspector_protocol # gyp -> gn leftovers @@ -549,9 +550,10 @@ src_configure() { mkdir -p -m 755 "${TMPDIR}" || die # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ + addpredict /dev/dri/ #nowarn - if ! use system-ffmpeg; then + #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" @@ -581,18 +583,6 @@ src_compile() { #"${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 @@ -633,11 +623,6 @@ src_install() { chromium_remove_language_paks popd - if use widevine; then - # These will be provided by chrome-binary-plugins - rm out/Release/libwidevinecdm*.so || die - fi - insinto "${CHROMIUM_HOME}" doins out/Release/*.bin doins out/Release/*.pak diff --git a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch b/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch deleted file mode 100644 index 8ebf42a46a84..000000000000 --- a/www-client/chromium/files/chromium-FORTIFY_SOURCE-r2.patch +++ /dev/null @@ -1,30 +0,0 @@ -Drop _FORTIFY_SOURCE=2 from defines - -Gentoo toolchains enable this by default. Removing this prevents spammy -warnings about the macro being redefined. - ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -1213,22 +1213,6 @@ - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build) && -- current_cpu != "s390x" && current_cpu != "s390" && -- current_cpu != "ppc64" && current_cpu != "ppc64" && -- current_cpu != "mips" && current_cpu != "mips64") { -- # _FORTIFY_SOURCE isn't really supported by Clang now, see -- # http://llvm.org/bugs/show_bug.cgi?id=16821. -- # It seems to work fine with Ubuntu 12 headers though, so use it in -- # official builds. -- # -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac || is_ios) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] diff --git a/www-client/chromium/files/chromium-clang-r2.patch b/www-client/chromium/files/chromium-clang-r2.patch deleted file mode 100644 index aaee16717643..000000000000 --- a/www-client/chromium/files/chromium-clang-r2.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -422,18 +422,6 @@ - cflags += [ "-fcolor-diagnostics" ] - } - -- # TODO(hans): Remove this once Clang generates better optimized debug info by -- # default. https://crbug.com/765793 -- if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -- cflags += [ -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -- ] -- } -- - # Print absolute paths in diagnostics. There is no precedent for doing this - # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and - # Windows developers rely on it (crbug.com/636109) so only do this on Windows. diff --git a/www-client/chromium/files/chromium-clang-r4.patch b/www-client/chromium/files/chromium-clang-r4.patch deleted file mode 100644 index 8d5122f70c3d..000000000000 --- a/www-client/chromium/files/chromium-clang-r4.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/device/fido/u2f_ble_transaction.cc -+++ b/device/fido/u2f_ble_transaction.cc -@@ -131,7 +131,7 @@ - - void U2fBleTransaction::OnError() { - request_frame_.reset(); -- request_cont_fragments_ = {}; -+ request_cont_fragments_ = base::queue<U2fBleFrameContinuationFragment>(); - response_frame_assembler_.reset(); - std::move(callback_).Run(base::nullopt); - } diff --git a/www-client/chromium/files/chromium-compiler-r1.patch b/www-client/chromium/files/chromium-compiler-r1.patch deleted file mode 100644 index 3c75c1d96dff..000000000000 --- a/www-client/chromium/files/chromium-compiler-r1.patch +++ /dev/null @@ -1,174 +0,0 @@ -From f1e0c5fc3b81053c8851efde9ca77e04c77d4563 Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Wed, 25 Apr 2018 13:22:49 -0400 -Subject: [PATCH] Disable various compiler configs - ---- - build/config/compiler/BUILD.gn | 67 +++++++++------------------------- - 1 file changed, 18 insertions(+), 49 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 3dbf872f7038..f8b2dcc9b026 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -222,8 +222,6 @@ config("compiler") { - - configs += [ - # See the definitions below. -- ":clang_revision", -- ":compiler_cpu_abi", - ":compiler_codegen", - ] - -@@ -474,24 +472,6 @@ config("compiler") { - cflags += [ "-fcolor-diagnostics" ] - } - -- if (is_clang && !is_nacl && current_toolchain == host_toolchain && -- target_os != "chromeos") { -- cflags += [ -- # TODO(hans): Remove this once Clang generates better optimized debug info -- # by default. https://crbug.com/765793 -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-instcombine-lower-dbg-declare=0", -- -- # TODO(rnk): Remove this once it's the default. https://crbug.com/793819 -- "-Xclang", -- "-mllvm", -- "-Xclang", -- "-fast-isel-sink-local-values=1", -- ] -- } -- - # Print absolute paths in diagnostics. There is no precedent for doing this - # on Linux/Mac (GCC doesn't support it), but MSVC does this with /FC and - # Windows developers rely on it (crbug.com/636109) so only do this on Windows. -@@ -1403,10 +1383,6 @@ config("default_warnings") { - - # TODO(hans): https://crbug.com/766891 - "-Wno-null-pointer-arithmetic", -- -- # Ignore warnings about MSVC optimization pragmas. -- # TODO(thakis): Only for no_chromium_code? http://crbug.com/505314 -- "-Wno-ignored-pragma-optimize", - ] - } else if (use_xcode_clang) { - cflags += [ -@@ -1450,22 +1426,6 @@ config("chromium_code") { - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build) && -- current_cpu != "s390x" && current_cpu != "s390" && -- current_cpu != "ppc64" && current_cpu != "ppc64" && -- current_cpu != "mips" && current_cpu != "mips64") { -- # _FORTIFY_SOURCE isn't really supported by Clang now, see -- # http://llvm.org/bugs/show_bug.cgi?id=16821. -- # It seems to work fine with Ubuntu 12 headers though, so use it in -- # official builds. -- # -- # Non-chromium code is not guaranteed to compile cleanly with -- # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are -- # disabled, so only do that for Release build. -- defines += [ "_FORTIFY_SOURCE=2" ] -- } -- - if (is_mac || is_ios) { - cflags_objc = [ "-Wobjc-missing-property-synthesis" ] - cflags_objcc = [ "-Wobjc-missing-property-synthesis" ] -@@ -1799,7 +1759,8 @@ config("default_stack_frames") { - } - - # Default "optimization on" config. --config("optimize") { -+config("optimize") { } -+config("xoptimize") { - if (is_win) { - # TODO(thakis): Remove is_clang here, https://crbug.com/598772 - if (is_official_build && full_wpo_on_official && !is_clang) { -@@ -1833,7 +1794,8 @@ config("optimize") { - } - - # Same config as 'optimize' but without the WPO flag. --config("optimize_no_wpo") { -+config("optimize_no_wpo") { } -+config("xoptimize_no_wpo") { - if (is_win) { - # Favor size over speed, /O1 must be before the common flags. The GYP - # build also specifies /Os and /GF but these are implied by /O1. -@@ -1856,7 +1818,8 @@ config("optimize_no_wpo") { - } - - # Turn off optimizations. --config("no_optimize") { -+config("no_optimize") { } -+config("xno_optimize") { - if (is_win) { - cflags = [ - "/Od", # Disable optimization. -@@ -1880,7 +1843,8 @@ config("no_optimize") { - # Turns up the optimization level. On Windows, this implies whole program - # optimization and link-time code generation which is very expensive and should - # be used sparingly. --config("optimize_max") { -+config("optimize_max") { } -+config("xoptimize_max") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -1927,7 +1891,8 @@ config("optimize_max") { - # - # TODO(crbug.com/621335) - rework how all of these configs are related - # so that we don't need this disclaimer. --config("optimize_speed") { -+config("optimize_speed") { } -+config("xoptimize_speed") { - if (is_nacl && is_nacl_irt) { - # The NaCl IRT is a special case and always wants its own config. - # Various components do: -@@ -1965,7 +1930,8 @@ config("optimize_speed") { - } - } - --config("optimize_fuzzing") { -+config("optimize_fuzzing") { } -+config("xoptimize_fuzzing") { - cflags = [ "-O1" ] + common_optimize_on_cflags - ldflags = common_optimize_on_ldflags - visibility = [ ":default_optimization" ] -@@ -2047,7 +2013,8 @@ config("afdo") { - # configs += [ "//build/config/compiler:symbols" ] - - # Full symbols. --config("symbols") { -+config("symbols") { } -+config("xsymbols") { - if (is_win) { - if (use_goma || is_clang) { - # Note that with VC++ this requires is_win_fastlink, enforced elsewhere. -@@ -2139,7 +2106,8 @@ config("symbols") { - # Minimal symbols. - # This config guarantees to hold symbol for stack trace which are shown to user - # when crash happens in unittests running on buildbot. --config("minimal_symbols") { -+config("minimal_symbols") { } -+config("xminimal_symbols") { - if (is_win) { - # Linker symbols for backtraces only. - cflags = [] -@@ -2170,7 +2138,8 @@ config("minimal_symbols") { - } - - # No symbols. --config("no_symbols") { -+config("no_symbols") { } -+config("xno_symbols") { - if (!is_win) { - cflags = [ "-g0" ] - asmflags = cflags --- -2.17.0 - diff --git a/www-client/chromium/files/chromium-cors-string-r0.patch b/www-client/chromium/files/chromium-cors-string-r0.patch new file mode 100644 index 000000000000..b724cd44df70 --- /dev/null +++ b/www-client/chromium/files/chromium-cors-string-r0.patch @@ -0,0 +1,51 @@ +From 01d891fa0790950549c7bedb34edf869827a372e Mon Sep 17 00:00:00 2001 +From: Jose Dapena Paz <jose.dapena@lge.com> +Date: Thu, 31 May 2018 17:03:37 +0000 +Subject: [PATCH] CORS legacy: add missing string include +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +The cors_legacy.h file includes declarations using std::string, but +it is not declared due to missing #include <string>. + +Also drop unneeded declarations in .cpp file. + +Change-Id: I00df799f84a6c3530c2f12f1e52d24c7d9bd6bfd +Reviewed-on: https://chromium-review.googlesource.com/1080707 +Reviewed-by: Tom Sepez <tsepez@chromium.org> +Commit-Queue: José Dapena Paz <jose.dapena@lge.com> +Cr-Commit-Position: refs/heads/master@{#563282} +--- + services/network/public/cpp/cors/cors_legacy.cc | 2 -- + services/network/public/cpp/cors/cors_legacy.h | 1 + + 2 files changed, 1 insertion(+), 2 deletions(-) + +diff --git a/services/network/public/cpp/cors/cors_legacy.cc b/services/network/public/cpp/cors/cors_legacy.cc +index 8f32ac3be64e..f01af63619b5 100644 +--- a/services/network/public/cpp/cors/cors_legacy.cc ++++ b/services/network/public/cpp/cors/cors_legacy.cc +@@ -5,8 +5,6 @@ + #include "services/network/public/cpp/cors/cors_legacy.h" + + #include <algorithm> +-#include <string> +-#include <vector> + + #include "url/gurl.h" + #include "url/url_util.h" +diff --git a/services/network/public/cpp/cors/cors_legacy.h b/services/network/public/cpp/cors/cors_legacy.h +index d2cdf026ca3a..dc9295a92c47 100644 +--- a/services/network/public/cpp/cors/cors_legacy.h ++++ b/services/network/public/cpp/cors/cors_legacy.h +@@ -5,6 +5,7 @@ + #ifndef SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ + #define SERVICES_NETWORK_PUBLIC_CPP_CORS_CORS_LEGACY_H_ + ++#include <string> + #include <vector> + + #include "base/component_export.h" +-- +2.17.1 + diff --git a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch b/www-client/chromium/files/chromium-ffmpeg-build-r0.patch deleted file mode 100644 index 5d9d0d26ecd5..000000000000 --- a/www-client/chromium/files/chromium-ffmpeg-build-r0.patch +++ /dev/null @@ -1,218 +0,0 @@ -From 92b5903a360931a7ba335fc10ae2e0802652326b Mon Sep 17 00:00:00 2001 -From: Mike Gilbert <floppym@gentoo.org> -Date: Sun, 6 May 2018 13:13:37 -0400 -Subject: [PATCH] Remove arch-specic code from build_ffmpeg.py - ---- - chromium/scripts/build_ffmpeg.py | 185 ------------------------------- - 1 file changed, 185 deletions(-) - -diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py -index aa1fc54755..d7d8878db6 100755 ---- a/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -+++ b/third_party/ffmpeg/chromium/scripts/build_ffmpeg.py -@@ -534,201 +534,16 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, parallel_jobs, - configure_flags['Common'].extend(SetupAndroidToolchain(target_arch)) - else: - configure_flags['Common'].extend([ -- # --optflags doesn't append multiple entries, so set all at once. -- '--optflags="-O2"', - '--enable-decoder=theora,vp8', - '--enable-parser=vp3,vp8', - ]) - -- if target_os in ('linux', 'linux-noasm', 'android'): -- if target_arch == 'x64': -- if target_os == 'android': -- configure_flags['Common'].extend([ -- '--arch=x86_64', -- ]) -- if target_os != 'android': -- configure_flags['Common'].extend(['--enable-lto']) -- pass -- elif target_arch == 'ia32': -- configure_flags['Common'].extend([ -- '--arch=i686', -- '--extra-cflags="-m32"', -- '--extra-ldflags="-m32"', -- ]) -- # Android ia32 can't handle textrels and ffmpeg can't compile without -- # them. http://crbug.com/559379 -- if target_os == 'android': -- configure_flags['Common'].extend([ -- '--disable-x86asm', -- ]) -- elif target_arch == 'arm' or target_arch == 'arm-neon': -- # TODO(ihf): ARM compile flags are tricky. The final options -- # overriding everything live in chroot /build/*/etc/make.conf -- # (some of them coming from src/overlays/overlay-<BOARD>/make.conf). -- # We try to follow these here closely. In particular we need to -- # set ffmpeg internal #defines to conform to make.conf. -- # TODO(ihf): For now it is not clear if thumb or arm settings would be -- # faster. I ran experiments in other contexts and performance seemed -- # to be close and compiler version dependent. In practice thumb builds are -- # much smaller than optimized arm builds, hence we go with the global -- # CrOS settings. -- configure_flags['Common'].extend([ -- '--arch=arm', -- '--enable-armv6', -- '--enable-armv6t2', -- '--enable-vfp', -- '--enable-thumb', -- '--extra-cflags=-march=armv7-a', -- ]) -- -- if target_os == 'android': -- configure_flags['Common'].extend([ -- # Runtime neon detection requires /proc/cpuinfo access, so ensure -- # av_get_cpu_flags() is run outside of the sandbox when enabled. -- '--enable-neon', -- '--extra-cflags=-mtune=generic-armv7-a', -- # Enabling softfp lets us choose either softfp or hardfp when doing -- # the chrome build. -- '--extra-cflags=-mfloat-abi=softfp', -- ]) -- if target_arch == 'arm': -- print('arm-neon is the only supported arm arch for Android.\n') -- return 1 -- -- if target_arch == 'arm-neon': -- configure_flags['Common'].extend([ -- '--extra-cflags=-mfpu=neon', -- ]) -- else: -- configure_flags['Common'].extend([ -- '--extra-cflags=-mfpu=vfpv3-d16', -- ]) -- else: -- if host_arch != 'arm': -- configure_flags['Common'].extend([ -- '--enable-cross-compile', -- '--target-os=linux', -- '--extra-cflags=--target=arm-linux-gnueabihf', -- '--extra-ldflags=--target=arm-linux-gnueabihf', -- '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR, -- 'build/linux/debian_sid_arm-sysroot'), -- '--extra-cflags=-mtune=cortex-a8', -- # NOTE: we don't need softfp for this hardware. -- '--extra-cflags=-mfloat-abi=hard', -- # For some reason configure drops this... -- '--extra-cflags=-O2', -- ]) -- -- if target_arch == 'arm-neon': -- configure_flags['Common'].extend([ -- '--enable-neon', -- '--extra-cflags=-mfpu=neon', -- ]) -- else: -- configure_flags['Common'].extend([ -- '--disable-neon', -- '--extra-cflags=-mfpu=vfpv3-d16', -- ]) -- elif target_arch == 'arm64': -- if target_os != 'android': -- configure_flags['Common'].extend([ -- '--enable-cross-compile', -- '--cross-prefix=/usr/bin/aarch64-linux-gnu-', -- '--target-os=linux', -- '--extra-cflags=--target=aarch64-linux-gnu', -- '--extra-ldflags=--target=aarch64-linux-gnu', -- '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR, -- 'build/linux/debian_sid_arm64-sysroot'), -- ]) -- configure_flags['Common'].extend([ -- '--arch=aarch64', -- '--enable-armv8', -- '--extra-cflags=-march=armv8-a', -- ]) -- elif target_arch == 'mipsel': -- # These flags taken from android chrome build with target_cpu='mipsel' -- configure_flags['Common'].extend([ -- '--arch=mipsel', -- '--disable-mips32r6', -- '--disable-mips32r5', -- '--disable-mips32r2', -- '--disable-mipsdsp', -- '--disable-mipsdspr2', -- '--disable-msa', -- '--enable-mipsfpu', -- '--extra-cflags=-march=mipsel', -- '--extra-cflags=-mcpu=mips32', -- # Required to avoid errors about dynamic relocation w/o -fPIC. -- '--extra-ldflags=-z notext', -- ]) -- if target_os == 'linux': -- configure_flags['Common'].extend([ -- '--enable-cross-compile', -- '--target-os=linux', -- '--sysroot=' + os.path.join(CHROMIUM_ROOT_DIR, -- 'build/linux/debian_sid_mips-sysroot'), -- '--extra-cflags=--target=mipsel-linux-gnu', -- '--extra-ldflags=--target=mipsel-linux-gnu', -- ]) -- elif target_arch == 'mips64el': -- # These flags taken from android chrome build with target_cpu='mips64el' -- configure_flags['Common'].extend([ -- '--arch=mips64el', -- '--enable-mipsfpu', -- '--disable-mipsdsp', -- '--disable-mipsdspr2', -- '--extra-cflags=-march=mips64el', -- # Required to avoid errors about dynamic relocation w/o -fPIC. -- '--extra-ldflags=-z notext', -- ]) -- if target_os == 'android': -- configure_flags['Common'].extend([ -- '--enable-mips64r6', -- '--extra-cflags=-mcpu=mips64r6', -- '--disable-mips64r2', -- '--enable-msa', -- ]) -- if target_os == 'linux': -- configure_flags['Common'].extend([ -- '--enable-cross-compile', -- '--target-os=linux', -- '--sysroot=' + os.path.join( -- CHROMIUM_ROOT_DIR, 'build/linux/debian_sid_mips64el-sysroot'), -- '--enable-mips64r2', -- '--disable-mips64r6', -- '--disable-msa', -- '--extra-cflags=-mcpu=mips64r2', -- '--extra-cflags=--target=mips64el-linux-gnuabi64', -- '--extra-ldflags=--target=mips64el-linux-gnuabi64', -- ]) -- else: -- print( -- 'Error: Unknown target arch %r for target OS %r!' % (target_arch, -- target_os), -- file=sys.stderr) -- return 1 -- - if target_os == 'linux-noasm': - configure_flags['Common'].extend([ - '--disable-asm', - '--disable-inline-asm', - ]) - -- if 'win' not in target_os: -- configure_flags['Common'].extend([ -- '--enable-pic', -- '--cc=clang', -- '--cxx=clang++', -- '--ld=clang', -- ]) -- -- # Clang Linux will use the first 'ld' it finds on the path, which will -- # typically be the system one, so explicitly configure use of Clang's -- # ld.lld, to ensure that things like cross-compilation and LTO work. -- # This does not work for arm64, ia32 and is always used on mac. -- if target_arch not in ['arm64', 'ia32', 'mipsel'] and target_os != 'mac': -- configure_flags['Common'].append('--extra-ldflags=-fuse-ld=lld') -- - # Should be run on Mac. - if target_os == 'mac': - if host_os != 'mac': --- -2.17.0 - diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r23.patch b/www-client/chromium/files/chromium-gn-bootstrap-r23.patch deleted file mode 100644 index e826a4dfc37b..000000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r23.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 0d3bbfb6b8ba05af199b49f5dd71d842f6acffda Mon Sep 17 00:00:00 2001 -From: Tom Anderson <thomasanderson@chromium.org> -Date: Fri, 27 Apr 2018 18:07:35 +0000 -Subject: [PATCH] Fix gn bootstrap - -BUG=837312 -R=dpranke - -Change-Id: Ia5c57f596388a4ba325208c638fac558984202f0 -Reviewed-on: https://chromium-review.googlesource.com/1030895 -Reviewed-by: Dirk Pranke <dpranke@chromium.org> -Commit-Queue: Dirk Pranke <dpranke@chromium.org> -Cr-Commit-Position: refs/heads/master@{#554419} ---- - tools/gn/bootstrap/bootstrap.py | 16 ++++++++++++++++ - 1 file changed, 16 insertions(+) - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 7fa9f0489f5b..ebc32371acc3 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -525,8 +525,11 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): - 'base/location.cc', - 'base/logging.cc', - 'base/md5.cc', -+ 'base/memory/platform_shared_memory_region.cc', -+ 'base/memory/read_only_shared_memory_region.cc', - 'base/memory/ref_counted.cc', - 'base/memory/ref_counted_memory.cc', -+ 'base/memory/shared_memory_mapping.cc', - 'base/memory/shared_memory_handle.cc', - 'base/memory/shared_memory_tracker.cc', - 'base/memory/weak_ptr.cc', -@@ -663,6 +666,19 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): - 'base/vlog.cc', - ]) - -+ if is_win: -+ static_libraries['base']['sources'].extend([ -+ 'base/memory/platform_shared_memory_region_win.cc' -+ ]) -+ elif is_mac: -+ static_libraries['base']['sources'].extend([ -+ 'base/memory/platform_shared_memory_region_mac.cc' -+ ]) -+ elif is_posix: -+ static_libraries['base']['sources'].extend([ -+ 'base/memory/platform_shared_memory_region_posix.cc' -+ ]) -+ - if is_posix: - static_libraries['base']['sources'].extend([ - 'base/base_paths_posix.cc', --- -2.17.0 - diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch b/www-client/chromium/files/chromium-gn-bootstrap-r24.patch deleted file mode 100644 index 0577dd4cf73b..000000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r24.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8aca6d50942218ba7887b8b41a44e4f1b7d6f091 Mon Sep 17 00:00:00 2001 -From: Tom Anderson <thomasanderson@chromium.org> -Date: Thu, 24 May 2018 22:39:20 +0000 -Subject: [PATCH] Fix gn bootstrap - -R=dpranke - -Change-Id: I469e7e478141e7c389f7a16a5e860122785bab44 -Reviewed-on: https://chromium-review.googlesource.com/1072740 -Reviewed-by: Dirk Pranke <dpranke@chromium.org> -Commit-Queue: Thomas Anderson <thomasanderson@chromium.org> -Cr-Commit-Position: refs/heads/master@{#561663} ---- - tools/gn/bootstrap/bootstrap.py | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 0d5f42a1d4a8..300abacdbca0 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -649,7 +649,6 @@ def write_gn_ninja(path, root_gen_dir, options, windows_x64_toolchain): - 'base/trace_event/memory_peak_detector.cc', - 'base/trace_event/memory_usage_estimator.cc', - 'base/trace_event/process_memory_dump.cc', -- 'base/trace_event/sharded_allocation_register.cc', - 'base/trace_event/trace_buffer.cc', - 'base/trace_event/trace_config.cc', - 'base/trace_event/trace_config_category_filter.cc', --- -2.17.0 - diff --git a/www-client/chromium/files/chromium-libjpeg-r0.patch b/www-client/chromium/files/chromium-libjpeg-r0.patch new file mode 100644 index 000000000000..5354281caced --- /dev/null +++ b/www-client/chromium/files/chromium-libjpeg-r0.patch @@ -0,0 +1,62 @@ +From c6b0194f7a4d9f494b2d51f46d2c332e2e5f4050 Mon Sep 17 00:00:00 2001 +From: Daniel Bratell <bratell@opera.com> +Date: Mon, 28 May 2018 13:13:01 +0000 +Subject: [PATCH] Use the same libjpeg in all of blink/platform + +The normal libjpeg renames some symbols with macros so if its +headers are included together with libjpeg-turbo's headers +in the same translation unit, there will be an inconsistent +renaming of libjpeg symbols. This happened in some extreme +jumbo configuration and resulted in confising linker errors. + +This patch changes an include so that jpeglib.h becomes included +the same way everywhere. + +Change-Id: I7f122d0919d58371bb40dc0097a766b857b9815e +Reviewed-on: https://chromium-review.googlesource.com/1073423 +Reviewed-by: Kentaro Hara <haraken@chromium.org> +Commit-Queue: Daniel Bratell <bratell@opera.com> +Cr-Commit-Position: refs/heads/master@{#562243} +--- + .../renderer/platform/image-encoders/image_encoder.cc | 11 +++++++++++ + .../renderer/platform/image-encoders/image_encoder.h | 2 -- + 2 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +index 0c7f14c7c0e4..4c450f5d6783 100644 +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc +@@ -4,6 +4,17 @@ + + #include "third_party/blink/renderer/platform/image-encoders/image_encoder.h" + ++#include "build/build_config.h" ++ ++#if defined(OS_WIN) ++#include <basetsd.h> // Included before jpeglib.h because of INT32 clash ++#endif // OS_WIN ++#include <stdio.h> // Needed by jpeglib.h ++ ++#include "jpeglib.h" // for JPEG_MAX_DIMENSION ++ ++#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION ++ + namespace blink { + + bool ImageEncoder::Encode(Vector<unsigned char>* dst, +diff --git a/third_party/blink/renderer/platform/image-encoders/image_encoder.h b/third_party/blink/renderer/platform/image-encoders/image_encoder.h +index 0d1460f34827..40306097d507 100644 +--- a/third_party/blink/renderer/platform/image-encoders/image_encoder.h ++++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.h +@@ -7,8 +7,6 @@ + + #include "third_party/blink/renderer/platform/platform_export.h" + #include "third_party/blink/renderer/platform/wtf/vector.h" +-#include "third_party/libjpeg/jpeglib.h" // for JPEG_MAX_DIMENSION +-#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION + #include "third_party/skia/include/core/SkStream.h" + #include "third_party/skia/include/encode/SkJpegEncoder.h" + #include "third_party/skia/include/encode/SkPngEncoder.h" +-- +2.17.1 + diff --git a/www-client/chromium/files/chromium-libwebp-shim-r0.patch b/www-client/chromium/files/chromium-libwebp-shim-r0.patch new file mode 100644 index 000000000000..cb387a4a0030 --- /dev/null +++ b/www-client/chromium/files/chromium-libwebp-shim-r0.patch @@ -0,0 +1,43 @@ +diff --git a/build/linux/unbundle/libwebp.gn b/build/linux/unbundle/libwebp.gn +index ab92adecf400..12574d87be58 100644 +--- a/build/linux/unbundle/libwebp.gn ++++ b/build/linux/unbundle/libwebp.gn +@@ -2,12 +2,34 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + ++import("//build/config/linux/pkg_config.gni") ++import("//build/shim_headers.gni") ++ ++pkg_config("system_libwebp") { ++ packages = [ ++ "libwebp", ++ "libwebpdemux", ++ "libwebpmux", ++ ] ++} ++ ++shim_headers("libwebp_shim") { ++ root_path = "src" ++ headers = [ ++ "webp/decode.h", ++ "webp/demux.h", ++ "webp/encode.h", ++ "webp/mux.h", ++ "webp/mux_types.h", ++ "webp/types.h", ++ ] ++} ++ + source_set("libwebp_webp") { +- libs = [ +- "webp", +- "webpdemux", +- "webpmux", ++ deps = [ ++ ":libwebp_shim", + ] ++ public_configs = [ ":system_libwebp" ] + } + + group("libwebp") { diff --git a/www-client/chromium/files/chromium-widevine-r1.patch b/www-client/chromium/files/chromium-widevine-r1.patch deleted file mode 100644 index f206878cf073..000000000000 --- a/www-client/chromium/files/chromium-widevine-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -Minimal patch to get chromium to compile with widevine support - -https://bugs.gentoo.org/show_bug.cgi?id=547630 - ---- a/third_party/widevine/cdm/stub/widevine_cdm_version.h -+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h -@@ -10,6 +10,7 @@ - - #include "third_party/widevine/cdm/widevine_cdm_common.h" - -+#define WIDEVINE_CDM_VERSION_STRING "unknown" - #define WIDEVINE_CDM_AVAILABLE - - #endif // WIDEVINE_CDM_VERSION_H_ |