From a5956e0a0daddcad648e0d8d8e5cb3e49e09bda7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 18 Nov 2017 18:38:22 +0000 Subject: gentoo resync : 18.11.2017 --- www-client/chromium/Manifest | 12 +- www-client/chromium/chromium-63.0.3239.30.ebuild | 657 --------------------- www-client/chromium/chromium-63.0.3239.52.ebuild | 657 +++++++++++++++++++++ .../chromium-64.0.3253.3-gpu_lists_version.h.patch | 11 - www-client/chromium/files/chromium-atk-r1.patch | 11 - www-client/chromium/files/chromium-gcc-r1.patch | 14 - www-client/chromium/files/chromium-gcc5-r1.patch | 66 --- .../chromium/files/chromium-gn-bootstrap-r14.patch | 27 - .../chromium/files/chromium-gn-bootstrap-r20.patch | 18 - .../chromium/files/chromium-gn-bootstrap-r21.patch | 28 - www-client/chromium/files/chromium-mojo-dep.patch | 54 -- 11 files changed, 659 insertions(+), 896 deletions(-) delete mode 100644 www-client/chromium/chromium-63.0.3239.30.ebuild create mode 100644 www-client/chromium/chromium-63.0.3239.52.ebuild delete mode 100644 www-client/chromium/files/chromium-64.0.3253.3-gpu_lists_version.h.patch delete mode 100644 www-client/chromium/files/chromium-atk-r1.patch delete mode 100644 www-client/chromium/files/chromium-gcc-r1.patch delete mode 100644 www-client/chromium/files/chromium-gcc5-r1.patch delete mode 100644 www-client/chromium/files/chromium-gn-bootstrap-r14.patch delete mode 100644 www-client/chromium/files/chromium-gn-bootstrap-r20.patch delete mode 100644 www-client/chromium/files/chromium-gn-bootstrap-r21.patch delete mode 100644 www-client/chromium/files/chromium-mojo-dep.patch (limited to 'www-client/chromium') diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 5a961ffd13ec..58a649a77206 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,36 +1,28 @@ -AUX chromium-64.0.3253.3-gpu_lists_version.h.patch 316 SHA256 a7064148a882febd22af5685860065dbefd84a833906b6ba0269e0b5cd306d1c SHA512 1cf0aecc8349c1ce56e409b1958021030c608966280fd693c5bf72063fbd54725e338b68b07f651a286e1cc5b6acce169b58ccf49c5b4e2379f65da8c25d5ecb WHIRLPOOL 6ff5d0356b89dc26619a293cede14536bde960b13f9378440941b430cf008d1361ffd3aa7ed772912de3af189baf727c433b946b4df383bb829a1a4d9b57bd15 AUX chromium-FORTIFY_SOURCE-r2.patch 1206 SHA256 fa3f703d599051135c5be24b81dfcb23190bb282db73121337ac76bc9638e8a5 SHA512 2d78092a700788c74b86db636af303fdb63a28ce5b7b0431dd81f6b7ce501e5d0234a6327a1b49bc23e1c1d00ba98fd5334dd07d9a20bb0d81d1a4ca4487a26c WHIRLPOOL e7e03b5df76a064c369637a470b955d7a31c269982094007e8bf3df1659ab8eb906a8318fbbb0fe10089c6ad8025ad4b1270f724d922d0b61f0d00903793d9cf -AUX chromium-atk-r1.patch 533 SHA256 fc0e9abb77b6f8e21a7601ff53f267a854736d711b530be5bbd80d976678e98d SHA512 5722c571ffc384e0e226342d170e29109bf45761dcd7202b2fe6572795e0a04bd0521b1120eb2247c2a84bed0e63f47a71d25802528992ee4f976b348fb5c8f6 WHIRLPOOL ee0afda2e5d267b39ab298dd5389c51092f6eba2b4e9e0f6b95e4af9ef28d2b680b02049e14957f6d4ce2e91bb63a73dd97b59a2b28ee2d23b68849ff90b26f7 AUX chromium-browser.xml 407 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff SHA512 b767fb4fd1925029d95560fc14cb7ab12ae43b2fe923e92d75e733b9723cbe1dcdf6df041a2b62554e98b79b47ef3f6028c773e72e6fd53166a021d49657aeca WHIRLPOOL be37cd2e7d02c510e84c484f32ab6ab2e1f38a2a03c0cdbc9b6b485d64feaf79944d8ce097f0838ae9bc71c42401b633350b847ad316b8e23cf5614e3913e7ec AUX chromium-clang-r1.patch 808 SHA256 ab5368a3e3a67fa63b33fefc6788ad5b4a79089ef4db1011a14c3bee9fdf70c6 SHA512 dfb81895fb78983e5adba54351d94e9174aa6a523c5a78738aad8223330cde6739dea6d82328d603f693a2d5810df890eccc4bed202d73875c9c97be506936e5 WHIRLPOOL b270233ba8b61b3117c572e82b59f19f3a9a3c1d2b4beb54f9152a7b36c39669f944b9905844ce64c5f70cdabfd9a5f1598f9ca61db4f924ae0c0d13177830bc -AUX chromium-gcc-r1.patch 689 SHA256 11cffe305dd49027c91638261463871e9ecb0ecc6ecc02bfa37b203c5960ab58 SHA512 0e3459e58a32e6eee83673e688a75e19a0e6925f5f34c860d60c37b05a7816bbe1fd29712c1259611b856ae6576cbef8fa71425b7acc39f51ded706534c72281 WHIRLPOOL 98435687f2198973d2069fde8e366dae4d2c19d39875aeaa75595223a75c9dcad9ee03fc865926ee069936a179945aabe2c72025745cda0cffdb35edc7dd6bbb -AUX chromium-gcc5-r1.patch 2658 SHA256 1bc9733d916bbd60e5819c65ad7260c2e971adf775b0a1b562357e4fc4d3e94b SHA512 11fcfa704c05dbced579329b02844c6dd2c9ff7df59e95499f6778074d24d2b4e6903a53dd12833c322c50873f7aa5bae0d103bf0a1a977868f8cce67b53f15c WHIRLPOOL 20c0f8b573191fc0404f7f5f3500eebf9600b219a473ba14a64571cf38cff7adf837b09ac901b7ff1bdb52a8474e12971f2b37abd4896e79c1d33d9c23bcac60 AUX chromium-gcc5-r3.patch 3563 SHA256 a05b69be47182e5d4a5bd6f05103b72e2708591066e0703827cc2ec14d1a9463 SHA512 dcf1f085ea634267448cb35869744df047d4851de906096bf7dfd2287de8ea027e9cffa9f0253de3353961c8d9a516d2064fe77ab987862ac76764e934c61a04 WHIRLPOOL a65b802ccaacc7d7fb827d4de40f219cebb2991478b18f895f397d91354a55f8cfeba5afe15f722064920ef62961f84c85e474bea057d7254173f3f189ee5b48 AUX chromium-gcc5-r4.patch 3648 SHA256 6f525ea6b22a432b1c2cdc2bff8482a30b76c7ada606d9f333fc7f3caf2841a3 SHA512 6b6d80c8adfbb317003712b94cfdf733af48ee5f32d10b6f6e8599cd08b7a9d8b73e6cec2902ed55eb0a962ba9c9cf14a70299e132ec7bfec29806ed23836791 WHIRLPOOL 9153feaf61d3ce2f5542c6bab55035af2ca5be5c476090536f55a9a067c7f705fe546ba19cf71fc50930c98f96e3f6cfaa20274d0f9d33fcf4dda28988ca8b67 AUX chromium-gcc5-r5.patch 568 SHA256 7c72ce8cb9ffc934923e495c3fa0a6c9e0d1b8f380c38fb2e305bdffe37bf97c SHA512 f1878f6960f0f6cad723e2f26ffeed7fc6c2c0e468098d5f08d7e305d644375436c5d7c1698d79bc9f3625fd5736793132d088e68f543838a073c2be68fe5882 WHIRLPOOL 645e9f016a4e116a8e9d40aa0d1ed7bd93c7ecc107b4dc86353f4a14085ca2d77071c36e3eb015bb5c7fee7ae5ed725fdd07b70d5290ebf07b002423f22fad92 AUX chromium-glibc2.26-r1.patch 10243 SHA256 ca58ebc6d37f73090fa6b697e1a394aa8b434e773c86703a9d5ddfdab39fc308 SHA512 9905438a85d1fd8f16d189737d4fa27c8968f2ef94f10209ebc1971aa4f0e9b5d84548ea48a4f69cc8a3dd23f3caa130909a4fadf250a537b8cf26db3c682262 WHIRLPOOL c9c4a654460222626f9a054bb46963bb513a3c7b62569dabb530cd590255cef38dc8cdeda00732023d92b7cbbc48bf4cb609f8dbbac00336c4f0df800ec714a2 -AUX chromium-gn-bootstrap-r14.patch 1327 SHA256 98784c4a0a793ecf34987bc8f91ae360d78596a4a59dd47651411381f752a080 SHA512 d297728681538fd6d6d48da4477e6e42b0ac1585a243dca60c0d9896387a1bf17770aa70966344c8d3551b774cbea6d6acbeaa0dbbfc3c17367dda5daa912297 WHIRLPOOL 54392bb999d0c56d769fbefb5a782f24b693d391130bb4208aa71ccf26987e3f974d5fbaacc00de030806a4078aa22e2c3978d88d8d24c2408576a609b2fb258 AUX chromium-gn-bootstrap-r17.patch 2896 SHA256 d81319f168dad0e411c8e810f73daa2f56ff579578771bd9c9bb1aa2d7c09a8b SHA512 28812a8bd6d591831a3bbd749f1d7c6dd434eb0237970d4e8ea8cfd48fa8efb4d98906eca3d175218fe62c50bcb0b6472b2d7dfdde73d5641cd3fde1d9dc5f3b WHIRLPOOL 0e8fa15f2108a01d9495d007b92e1c1b0d22ebbf016363bdf0b03e756c7bc41bb7eef2e8088e4b879c9dede74df5aba1f0d2166efbedbeda368b2f476d9677de -AUX chromium-gn-bootstrap-r20.patch 947 SHA256 39b7a0a3eb805d7e025d05d4cb78123076393561d429b27987255c4fb3ffc464 SHA512 b333dc44cd1511f74ae474becc4a1758011a7ae94f0fd6b0bec2b2c018fa8b785276374f23cbe2a3ac670bc1d2af30fd894daef86ed202dac689ec3dcd267aac WHIRLPOOL 0b045bfc372d69fb5ac12f35b79d55fbda961fda3af16b34d107d59a880596f1ba212ac378f30f9d3afa29f37c42126dae6c49d77f3a5b5a50ba12145bf248d2 -AUX chromium-gn-bootstrap-r21.patch 1421 SHA256 01f0bca7338cd983e8dfe6026d9401fbbcf1270e539597a0de8216f524027753 SHA512 b90520e4c97f709058d00e6f4f0067d6d8df0cbed13e078a38d0c5d8e38dee2a51bf73f4f5c2fed7f3b7a1dccc35af6a6c7f40e4e845582e243a27464c801844 WHIRLPOOL 3b513bfeb02fa76336ccac91362ca985ce248c85ea11f6eab0eb9afdb0ea8204349a0dd0f6cc50fa54854f69e3505894a35a8b7a9cc7e061c700c0596f74d25f AUX chromium-gn-bootstrap-r22.patch 355 SHA256 3a1198ceceaac43a55b033c2075d6ac7f2e5b7d4dd9403a8117586cc88e64d09 SHA512 617b5009f30c7da7a5523cd0be3c1e8c4d8c396401191e0b7dd46126a352a0318ce64947f05557cc94e8a7b5a8cffb3b11265ac1961650f8a3e8541fce2969fd WHIRLPOOL c938ef9565d9470af1de3a92ec76916766700483a651582bce52cd1f5de145f5db0540a5224dea823b4094f6d6e7539b5fcd77385918f0ea1046a191b734070d AUX chromium-launcher-r3.sh 1199 SHA256 9bceb14a6c171754b77bcc7e6095285fcb58a9ca10e2e4a9c9e13dc561fc0c01 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d WHIRLPOOL faa7eb72a4a5902299925ab4c13308299fccfbdf34a417ce89fa800cfcd6ebf0a3a456db1e8625e205be445d4ad2718db6cf6d581b266bb9227fb03506a67220 AUX chromium-math-includes-r0.patch 1206 SHA256 64225e1a8389d867314c280412074457710fa5680cdc2a7654d75b96c2486f78 SHA512 4a14315fd87ba269e59dda83c9cdf760cff27934974db13bb40f31c8750f4ea6b4b325c7950469278ac82bd67fa770e58a39d712d0b6a75d2befde90b2a267b7 WHIRLPOOL 895d673c0ff5a36b7ee46029110e9d844acdcfda17bad119c24850044b25749c360c3fcaf543f4d11c7f93077dcda3539f3d9d8555e9f714bedafde1ee152631 -AUX chromium-mojo-dep.patch 2170 SHA256 fe298059b6937b2816beba8660d42f8584bdc56c12849ac55d32e4cd6d8c4518 SHA512 1068c130eb1a679ecb225caf2b430003c5485dfa12d465fa7b42f2c127d8113a1f4557be20ce93f4921ca52e50d90e04d5cb9a6a4b6115c32488936aa51cdf56 WHIRLPOOL 483024165231e1c7c4e551c92d2230c49f6f1b2b85c9213b510a6ae8f5367a7c2f72594d8840856924ae538697b16dc8e11c5c506b3da2fcc87729c5f74e0a8f AUX chromium-webrtc-r0.patch 972 SHA256 bcb2f4588cf5dcf75cde855c7431e94fdcc34bdd68b876a90f65ab9938594562 SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051 WHIRLPOOL 58cfed41cb5c4291647de8bef8b2e3555256681fb709185e34f9394c42f79ee81ac7b0f55b489196a7510f092f603705ba4e78801b2792451d722459218b5dc1 AUX chromium-widevine-r1.patch 428 SHA256 c05800f823b3e9522be70645de6a9b482856030f43fd56273bb4f0bbc319d158 SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a WHIRLPOOL 2d2ff0b11c3062ef4c4873221d986dcd6018130d687d487cd32e4912e957332e12165114a69e8e86919338cfac2ad61dd521637fe4be6d7b3b3deed21b008365 AUX chromium.default 148 SHA256 bdac1d32025d53158f96c8ad5bd71a58abdcf02f3a8759a43154e97e812fcdd1 SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739 WHIRLPOOL 2e51e864134426668cc73fc5081c35288677d8ce855b07dfbd3413397f9c43148a6d6096a9b7a617511388f87623a3ce7f3387103202db53876a74bccb9dbe6c AUX toolchain/BUILD.gn 799 SHA256 7b42f63ac928b7d1ff8e4d91cc620e944d581beb26c64fe7e1560f10a9c5ad94 SHA512 8da134d99f050ecdecb06d4ec34287747cd9ee57ccbf6fe334b034812fb95fdee3af8421b10be3ee4f71020ca4029de626cd2770865b1e527bfac966d6d8ea2d WHIRLPOOL 7d9b145da023b223eaf0a9c6907a42ece9f880b83abcc4ef45624436901bc21fefe5f4823e67350a07b60e2ea4718ee4bf21542264fd2c7d1f6ba6b8cbc3daa0 DIST chromium-62.0.3202.89.tar.xz 517100784 SHA256 9f79760dc22f7183602a07af3d37d2226bd63ab0ca7163d88ac0d81982de9469 SHA512 11ed71d2c9ebf82c9b704111d85d01c5600fc1caeb66e0dfaca172b20bb357817d717b3bcc13f704072b77550fa7fa74f990725b1d7d85d4d2b82cc1baec9578 WHIRLPOOL f1a5acf70285df4082cb1527751c65b02b6019b3c5c4c2384f8cdbd50e3255bc66bd8a1080b2e662facbcc111b10089743819a4ea2b88a862d4429cc624b0963 DIST chromium-62.0.3202.94.tar.xz 517173548 SHA256 cabc4d267bf08aabe11c5739048c43dde18c61acf595223a1c3aa1d3499558d4 SHA512 09e05aec663de94633fb7b658154a5b0146159dea0f434ef412405530274daefc5e554be8120653b840d2b55f5e35202be1a653ece7796d00956df58bc7608ad WHIRLPOOL dcdbadba2f603bc277ad1998e3248d8fcafa9e81a07273dc404ace183f572a23fcbd89cb198ea3b3fd029e74164458b0ce238ad247ffb3ead483b82ab3a1731b -DIST chromium-63.0.3239.30.tar.xz 561111084 SHA256 ab210326029213eda0290db71f6ddbdf5c42e2d94c3461dee094637a34571219 SHA512 b6b89e3464b4dbef54cfe5971255bf4cf96b8c984a2a82d7f4f66e3aecaf5a0a3c72ad827127223b3448c2c2ffad3fe1b1546266ec9544838b758ac3d9b454c8 WHIRLPOOL 1a673b4060cc757e190ea376bb0cff2e8222c91f30a3627ba39b3fed0c534bced213fa3bba06614aacf2814996fb949bb55bd06d549e74f70af7002aa5796ee7 DIST chromium-63.0.3239.40.tar.xz 561115132 SHA256 d1063027ff1d2e17f3076fe00abebad4a3e43d5fd3291a8c9bace298b7d666de SHA512 a6a2db0d472df0cbe54ead3f3da2b3fd0608ee3099f46772561146a5ac19ef2702800ac4a601228ae90431dce1e1021707ad397339f6cad99c0f38d667816de7 WHIRLPOOL de5cd4ebaaaa509a370ffb4967bc74c616ea5f195277c5079b6d1e22f1252679c417d6f52959a745b4c3881d6dff1fd44079eda1bc04580a3696445f99e128aa +DIST chromium-63.0.3239.52.tar.xz 561145768 SHA256 b663a43b8361906dbf9ec328299d5160ded96d4dbdc9891d97a918bf4ef79ae1 SHA512 5d0cccf89dc5555f9c966315d3927bd107605cc6b72e808c498b054eee66ae9966aa640d8c19728f9988590ff2deabacbbba04333a83794c4f4812ef28945a66 WHIRLPOOL f3f76fc6f34e82936db9e7463aa8ba49209d7547c8a49595ed2c5909299a00657e03e23549a9a1e0fcbe5e3a19e7e60403145aba902929012498291e213c5830 DIST chromium-64.0.3253.3.tar.xz 567976356 SHA256 6abe5b8ea147953c9d8bae72e52b4984f1a0f718e97bc578f0250055815ec4cd SHA512 fd0307337eec5513d73c14a0d8bf494d87e1a658c48585afbf7d0c08314297bf28825ee99bbeab95ccaae8a0e5b1536794c3b4c94f996ba0a4a217cdbc224267 WHIRLPOOL 78a44979475fda90087a164a5fa7e082576d344a103536c4c62cc4f1e4d3b6a4681005b9165ff020aff179bd3b58195c518c1fa32fb5f1e7b95548c5ae28e9cb DIST chromium-64.0.3260.2.tar.xz 568772508 SHA256 1d54669f1ff0ea37d1095e8934d307f1dc5e93119f1ea621ee93ca8d032ff64e SHA512 f7003976c8c5449569e0017fae5e1f2f7150a297a4bb4ad2a9bafe69e9fb4e931c76efeecbe07cc11a00af5a49591655734f21892e69e3ac523fc4d3faa2795f WHIRLPOOL b6c3538d06d8df9b97eed57b11e1c6129d4663e607ccc82e17270a1bcd249a73ecc2436c1e0728f1fc90579b30b5946f8b88a98566e231761b90f2c4c9c751c5 EBUILD chromium-62.0.3202.89.ebuild 19510 SHA256 e93b97ee0a97a458be80297ebe6729063603803119235cfa6234a27a27215f48 SHA512 71fb4be5db3cc217630bf2f82ba458038d693981822fef22f104e9f534b332bfea35e2bd72d245c46bb6ce76f816fc13ca8e7cc0426bb1f03d4fa74565b02090 WHIRLPOOL 63f54dbb654b1e3c58eb40029df5e735d94d1472799e959d65ce5fa89fded35fc874312d67207bc3310e9ce11002549e3d69d49fa9ae1af7af9c2727e3f2cd7a EBUILD chromium-62.0.3202.94.ebuild 19511 SHA256 d6588c19ba5d5bc0b82cb5cb790d5f8187b1650c335225306f4a926563c28ef8 SHA512 142e54ae52d5b616e4323bf9871b658ced23bd9159300462161b88d8237c17f7daee70998e6c85b6e01a5cc55d570677fcfd1b0583504c466fbad6052b3f3c8b WHIRLPOOL 562aaf6b284bca1a2b38b3561e707d38ac55502e3096e6c91f437aaa2c0e156040bf6b649488a7b236f64a24967b9658960ca9604a58b96995cf21ad046e64b0 -EBUILD chromium-63.0.3239.30.ebuild 19628 SHA256 aa7445eb9143ca9177ffc1af315f79c7ff0c6dbb6b92c4d09cf678d6172db9c8 SHA512 9b46c1eb55f552ab3a1bc108b39daa580123320ebfba3b485c739c6b7409a43553c97b59c15452da59431699c170810aacb0b2e70ae77c0a345fc64e80419e9c WHIRLPOOL aabfccf706364fed38365fab4d6978b03e3c1077e105f977f69fb4d7860c4e758489b2c416c4e996d0eeb124434c46577c939c0544932aa636ff4d509662940d EBUILD chromium-63.0.3239.40.ebuild 19628 SHA256 aa7445eb9143ca9177ffc1af315f79c7ff0c6dbb6b92c4d09cf678d6172db9c8 SHA512 9b46c1eb55f552ab3a1bc108b39daa580123320ebfba3b485c739c6b7409a43553c97b59c15452da59431699c170810aacb0b2e70ae77c0a345fc64e80419e9c WHIRLPOOL aabfccf706364fed38365fab4d6978b03e3c1077e105f977f69fb4d7860c4e758489b2c416c4e996d0eeb124434c46577c939c0544932aa636ff4d509662940d +EBUILD chromium-63.0.3239.52.ebuild 19628 SHA256 aa7445eb9143ca9177ffc1af315f79c7ff0c6dbb6b92c4d09cf678d6172db9c8 SHA512 9b46c1eb55f552ab3a1bc108b39daa580123320ebfba3b485c739c6b7409a43553c97b59c15452da59431699c170810aacb0b2e70ae77c0a345fc64e80419e9c WHIRLPOOL aabfccf706364fed38365fab4d6978b03e3c1077e105f977f69fb4d7860c4e758489b2c416c4e996d0eeb124434c46577c939c0544932aa636ff4d509662940d EBUILD chromium-64.0.3253.3.ebuild 19700 SHA256 6eb331bad7358cbe9b7c91a4d371cc186b5b0b50e834f5cd781b0e6fd2df78f7 SHA512 a3f47e18189e30a7c01a3a6208e3f980ef574a23b11c0003054a1a293e720ca135180f4fe4bea826bbfbf2f628042b17be0d0221cd0ac80706d31ba5a94ab26a WHIRLPOOL e4f829354e67bc82cf4e764d31a48001c7857ab8480e879da580acf2b5ee603b6407d8d2e1ae81b45ca84950d7762b255c01b9c7b35bc0c139d053dcfe433fea EBUILD chromium-64.0.3260.2.ebuild 19829 SHA256 41755bf1490d25c8e017b03fcccd96c8011a3a375d46913c0ed5d60ce679379f SHA512 525faa08400e3849ac733de0e9d84b85044130e7ad042c483253aca60304db2c6a1019de5c1d403af233aaa6007aef6a43801a2a20c6c305ccf0c60b4cd87ecd WHIRLPOOL 5f285b0428d654ab7a302ab598768d6fda97d37af89abe012b324d0812cba1ef7c9151fb49b509e106e04da636aa8e653774562523b6466d3130725bda8203a9 MISC ChangeLog 61379 SHA256 6089c72a9ad011b043f45bf3057c79f999d2aad5f4ecf0f9f45f9ced5156a18c SHA512 05868a71dfe2cbabb32b664968939704ada3c56bdd70aee289dbc60c5708e07df8496090687bf9b4659810872f629d53530990820e0da57b792a31add93d1f19 WHIRLPOOL fb91699e99261a3128ac7d931cfa5ec34a8884682935cc0740a129119f0b8d18a2aa83652ee06e0e6900371007cffbaea46f4e5d450ff2817d12e96cc819cca9 diff --git a/www-client/chromium/chromium-63.0.3239.30.ebuild b/www-client/chromium/chromium-63.0.3239.30.ebuild deleted file mode 100644 index 82207820db52..000000000000 --- a/www-client/chromium/chromium-63.0.3239.30.ebuild +++ /dev/null @@ -1,657 +0,0 @@ -# Copyright 1999-2017 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 ~arm ~arm64 ~x86" -IUSE="component-build cups gnome-keyring +hangouts 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-arch/bzip2:= - cups? ( >=net-print/cups-1.3.11:= ) - 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.14.3:= - >=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.5.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 - !=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/bitstream-cyberbit -- 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}/${PN}-widevine-r1.patch" - "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" - "${FILESDIR}/${PN}-gcc5-r4.patch" - "${FILESDIR}/${PN}-clang-r1.patch" - "${FILESDIR}/${PN}-webrtc-r0.patch" - "${FILESDIR}/${PN}-gcc5-r5.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 - - # Make sure the build system will use the right python, bug #344367. - python-any-r1_pkg_setup - - chromium_suid_sandbox_check_kernel_config -} - -src_prepare() { - 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 - 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/blink - third_party/boringssl - 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_2 - 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/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/lss - third_party/lzma_sdk - third_party/markupsafe - third_party/mesa - third_party/modp_b64 - third_party/mt19937ar - 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/build - 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/ply - third_party/polymer - third_party/protobuf - third_party/protobuf/third_party/six - third_party/qcms - 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/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/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() { - local myconf_gn="" - - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. - myconf_gn+=" is_debug=false" - - # Component build isn't generally intended for use by end users. It's mostly useful - # for development and debugging. - myconf_gn+=" is_component_build=$(usex component-build true false)" - - myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf_gn+=" enable_nacl=false" - - # Use system-provided libraries. - # TODO: freetype (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 - # 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_gconf=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" - - if tc-is-clang; then - myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" - else - myconf_gn+=" is_clang=false" - fi - - # 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" - - 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 - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - # 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 - - # 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 - - 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}" out/Release - echo "$@" - "$@" || die -} - -src_compile() { - local ninja_targets="chrome chromedriver" - if use suid; then - ninja_targets+=" chrome_sandbox" - fi - - # Build mksnapshot and pax-mark it. - if tc-is-cross-compiler; then - eninja -C out/Release host/mksnapshot || die - pax-mark m out/Release/host/mksnapshot - else - eninja -C out/Release mksnapshot || die - pax-mark m out/Release/mksnapshot - fi - - # 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 ${ninja_targets} || die - - 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 - - insinto "${CHROMIUM_HOME}/swiftshader" - doins out/Release/swiftshader/*.so - - # 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-63.0.3239.52.ebuild b/www-client/chromium/chromium-63.0.3239.52.ebuild new file mode 100644 index 000000000000..82207820db52 --- /dev/null +++ b/www-client/chromium/chromium-63.0.3239.52.ebuild @@ -0,0 +1,657 @@ +# Copyright 1999-2017 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 ~arm ~arm64 ~x86" +IUSE="component-build cups gnome-keyring +hangouts 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-arch/bzip2:= + cups? ( >=net-print/cups-1.3.11:= ) + 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.14.3:= + >=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.5.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 + !=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/bitstream-cyberbit +- 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}/${PN}-widevine-r1.patch" + "${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch" + "${FILESDIR}/${PN}-gcc5-r4.patch" + "${FILESDIR}/${PN}-clang-r1.patch" + "${FILESDIR}/${PN}-webrtc-r0.patch" + "${FILESDIR}/${PN}-gcc5-r5.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 + + # Make sure the build system will use the right python, bug #344367. + python-any-r1_pkg_setup + + chromium_suid_sandbox_check_kernel_config +} + +src_prepare() { + 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 + 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/blink + third_party/boringssl + 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_2 + 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/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/lss + third_party/lzma_sdk + third_party/markupsafe + third_party/mesa + third_party/modp_b64 + third_party/mt19937ar + 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/build + 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/ply + third_party/polymer + third_party/protobuf + third_party/protobuf/third_party/six + third_party/qcms + 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/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/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() { + local myconf_gn="" + + # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. + myconf_gn+=" is_debug=false" + + # Component build isn't generally intended for use by end users. It's mostly useful + # for development and debugging. + myconf_gn+=" is_component_build=$(usex component-build true false)" + + myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")" + + # Disable nacl, we can't build without pnacl (http://crbug.com/269560). + myconf_gn+=" enable_nacl=false" + + # Use system-provided libraries. + # TODO: freetype (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 + # 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_gconf=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" + + if tc-is-clang; then + myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" + else + myconf_gn+=" is_clang=false" + fi + + # 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" + + 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 + + # Make sure the build system will use the right tools, bug #340795. + tc-export AR CC CXX NM + + # 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 + + # 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 + + 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}" out/Release + echo "$@" + "$@" || die +} + +src_compile() { + local ninja_targets="chrome chromedriver" + if use suid; then + ninja_targets+=" chrome_sandbox" + fi + + # Build mksnapshot and pax-mark it. + if tc-is-cross-compiler; then + eninja -C out/Release host/mksnapshot || die + pax-mark m out/Release/host/mksnapshot + else + eninja -C out/Release mksnapshot || die + pax-mark m out/Release/mksnapshot + fi + + # 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 ${ninja_targets} || die + + 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 + + insinto "${CHROMIUM_HOME}/swiftshader" + doins out/Release/swiftshader/*.so + + # 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/files/chromium-64.0.3253.3-gpu_lists_version.h.patch b/www-client/chromium/files/chromium-64.0.3253.3-gpu_lists_version.h.patch deleted file mode 100644 index c961cb6eaf5a..000000000000 --- a/www-client/chromium/files/chromium-64.0.3253.3-gpu_lists_version.h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- /dev/null -+++ a/gpu/config/gpu_lists_version.h -@@ -0,0 +1,8 @@ -+/* Generated by lastchange.py, do not edit.*/ -+ -+#ifndef GPU_CONFIG_GPU_LISTS_VERSION_H_ -+#define GPU_CONFIG_GPU_LISTS_VERSION_H_ -+ -+#define GPU_LISTS_VERSION "0a025c20792ce26a88112a00c936f463f190d394" -+ -+#endif // GPU_CONFIG_GPU_LISTS_VERSION_H_ diff --git a/www-client/chromium/files/chromium-atk-r1.patch b/www-client/chromium/files/chromium-atk-r1.patch deleted file mode 100644 index 32fa29975b3e..000000000000 --- a/www-client/chromium/files/chromium-atk-r1.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/content/browser/accessibility/browser_accessibility_auralinux.cc.orig 2017-07-27 06:28:01.090257874 +0000 -+++ b/content/browser/accessibility/browser_accessibility_auralinux.cc 2017-07-27 06:28:21.174653680 +0000 -@@ -571,7 +571,7 @@ - // it's best to leave this out rather than break people's builds: - #if defined(ATK_CHECK_VERSION) - #if ATK_CHECK_VERSION(2, 16, 0) -- atk_state_set_add_state(atk_state_set, ATK_STATE_READ_ONLY); -+ atk_state_set_add_state(state_set, ATK_STATE_READ_ONLY); - #endif - #endif - break; diff --git a/www-client/chromium/files/chromium-gcc-r1.patch b/www-client/chromium/files/chromium-gcc-r1.patch deleted file mode 100644 index 2acd11ed5b08..000000000000 --- a/www-client/chromium/files/chromium-gcc-r1.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/base/numerics/safe_math_shared_impl.h b/base/numerics/safe_math_shared_impl.h -index 99f230ce7e9a..de2415d402f5 100644 ---- a/base/numerics/safe_math_shared_impl.h -+++ b/base/numerics/safe_math_shared_impl.h -@@ -21,8 +21,7 @@ - #if !defined(__native_client__) && \ - ((defined(__clang__) && \ - ((__clang_major__ > 3) || \ -- (__clang_major__ == 3 && __clang_minor__ >= 4))) || \ -- (defined(__GNUC__) && __GNUC__ >= 5)) -+ (__clang_major__ == 3 && __clang_minor__ >= 4)))) - #include "base/numerics/safe_math_clang_gcc_impl.h" - #define BASE_HAS_OPTIMIZED_SAFE_MATH (1) - #else diff --git a/www-client/chromium/files/chromium-gcc5-r1.patch b/www-client/chromium/files/chromium-gcc5-r1.patch deleted file mode 100644 index ec3e3e663436..000000000000 --- a/www-client/chromium/files/chromium-gcc5-r1.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/chrome/browser/devtools/devtools_file_system_indexer.cc -+++ b/chrome/browser/devtools/devtools_file_system_indexer.cc -@@ -34,7 +34,6 @@ using base::TimeDelta; - using base::TimeTicks; - using content::BrowserThread; - using std::map; --using std::set; - using std::string; - using std::vector; - -@@ -191,7 +190,7 @@ vector Index::Search(const string& query) { - if (trigram != kUndefinedTrigram) - trigrams.push_back(trigram); - } -- set file_ids; -+ std::set file_ids; - bool first = true; - vector::const_iterator it = trigrams.begin(); - for (; it != trigrams.end(); ++it) { -@@ -203,7 +202,7 @@ vector Index::Search(const string& query) { - first = false; - continue; - } -- set intersection = base::STLSetIntersection >( -+ std::set intersection = base::STLSetIntersection >( - file_ids, index_[trigram]); - file_ids.swap(intersection); - } -diff --git a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -index 94bb9161ec85..e40c6387f72e 100644 ---- a/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -+++ b/third_party/WebKit/Source/platform/wtf/typed_arrays/ArrayBufferContents.h -@@ -63,7 +63,7 @@ class WTF_EXPORT ArrayBufferContents { - allocation_length_(0), - data_(data), - data_length_(0), -- kind_(AllocationKind::kNormal), -+ kind_(WTF::ArrayBufferContents::AllocationKind::kNormal), - deleter_(deleter) {} - DataHandle(void* allocation_base, - size_t allocation_length, -@@ -94,11 +94,11 @@ class WTF_EXPORT ArrayBufferContents { - reinterpret_cast(allocation_base_) + - allocation_length_); - switch (kind_) { -- case AllocationKind::kNormal: -+ case WTF::ArrayBufferContents::AllocationKind::kNormal: - DCHECK(deleter_); - deleter_(data_); - return; -- case AllocationKind::kReservation: -+ case WTF::ArrayBufferContents::AllocationKind::kReservation: - ReleaseReservedMemory(allocation_base_, allocation_length_); - return; - } ---- a/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc.orig 2017-08-15 12:45:59.433532111 +0000 -+++ b/third_party/webrtc/modules/audio_processing/aec3/aec_state.cc 2017-08-15 17:52:59.691328825 +0000 -@@ -10,7 +10,7 @@ - - #include "webrtc/modules/audio_processing/aec3/aec_state.h" - --#include -+#include - #include - #include - diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r14.patch b/www-client/chromium/files/chromium-gn-bootstrap-r14.patch deleted file mode 100644 index 3c44c858f78d..000000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r14.patch +++ /dev/null @@ -1,27 +0,0 @@ -commit 96c271f8ab2be7ea4199078ea65ac50c6ada4685 -Author: Pawel Hajdan, Jr -Date: Wed Jul 26 21:51:54 2017 +0000 - - wip - -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 1390560f8e37..ff2ae57c46b0 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -449,6 +449,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/metrics/histogram_base.cc', - 'base/metrics/histogram_functions.cc', - 'base/metrics/histogram_samples.cc', -+ 'base/metrics/histogram_snapshot_manager.cc', - 'base/metrics/metrics_hashes.cc', - 'base/metrics/persistent_histogram_allocator.cc', - 'base/metrics/persistent_memory_allocator.cc', -@@ -534,7 +535,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/trace_event/heap_profiler_allocation_context_tracker.cc', - 'base/trace_event/heap_profiler_allocation_register.cc', - 'base/trace_event/heap_profiler_event_filter.cc', -- 'base/trace_event/heap_profiler_event_writer.cc', -+ 'base/trace_event/heap_profiler_heap_dump_writer.cc', - 'base/trace_event/heap_profiler_serialization_state.cc', - 'base/trace_event/heap_profiler_stack_frame_deduplicator.cc', - 'base/trace_event/heap_profiler_type_name_deduplicator.cc', diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r20.patch b/www-client/chromium/files/chromium-gn-bootstrap-r20.patch deleted file mode 100644 index 4b339e035459..000000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r20.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -546,6 +546,7 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/timer/timer.cc', - 'base/trace_event/category_registry.cc', - 'base/trace_event/event_name_filter.cc', -+ 'base/trace_event/freed_object_tracker.cc', - 'base/trace_event/heap_profiler_allocation_context.cc', - 'base/trace_event/heap_profiler_allocation_context_tracker.cc', - 'base/trace_event/heap_profiler_allocation_register.cc', -@@ -605,7 +606,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/strings/string16.cc', - 'base/synchronization/condition_variable_posix.cc', - 'base/synchronization/lock_impl_posix.cc', -- 'base/synchronization/read_write_lock_posix.cc', - 'base/sys_info_posix.cc', - 'base/task_scheduler/task_tracker_posix.cc', - 'base/threading/platform_thread_internal_posix.cc', diff --git a/www-client/chromium/files/chromium-gn-bootstrap-r21.patch b/www-client/chromium/files/chromium-gn-bootstrap-r21.patch deleted file mode 100644 index f3127af09ec0..000000000000 --- a/www-client/chromium/files/chromium-gn-bootstrap-r21.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py -index 601d5331698e..f154ed2ef3e6 100755 ---- a/tools/gn/bootstrap/bootstrap.py -+++ b/tools/gn/bootstrap/bootstrap.py -@@ -536,7 +536,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/threading/thread_local_storage.cc', - 'base/threading/thread_restrictions.cc', - 'base/threading/thread_task_runner_handle.cc', -- 'base/threading/worker_pool.cc', - 'base/time/clock.cc', - 'base/time/default_clock.cc', - 'base/time/default_tick_clock.cc', -@@ -546,7 +545,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/timer/timer.cc', - 'base/trace_event/category_registry.cc', - 'base/trace_event/event_name_filter.cc', -- 'base/trace_event/freed_object_tracker.cc', - 'base/trace_event/heap_profiler_allocation_context.cc', - 'base/trace_event/heap_profiler_allocation_context_tracker.cc', - 'base/trace_event/heap_profiler_allocation_register.cc', -@@ -611,7 +609,6 @@ def write_gn_ninja(path, root_gen_dir, options): - 'base/threading/platform_thread_internal_posix.cc', - 'base/threading/platform_thread_posix.cc', - 'base/threading/thread_local_storage_posix.cc', -- 'base/threading/worker_pool_posix.cc', - 'base/time/time_conversion_posix.cc', - 'base/trace_event/heap_profiler_allocation_register_posix.cc', - ]) diff --git a/www-client/chromium/files/chromium-mojo-dep.patch b/www-client/chromium/files/chromium-mojo-dep.patch deleted file mode 100644 index bf618540d174..000000000000 --- a/www-client/chromium/files/chromium-mojo-dep.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f8e2c057ec6123b0a1d08294f41e78c427636b49 Mon Sep 17 00:00:00 2001 -From: Mike Bjorge -Date: Mon, 7 Aug 2017 18:41:58 +0000 -Subject: [PATCH] Add mojo_blink dep from WebKit loader/. - -Now that loader has a direct dependency on the generated mojom-blink -headers (https://chromium-review.googlesource.com/c/577488), the loader/ -target should have a dep on the mojo target that generates the headers, -otherwise the build may fail depending on build order. - -All the other platform/ targets that depend on the mojom-blink headers -are directly included in the platform target, which has the necessary -dependency already. - -Bug: 746197 -Bug: 750883 -Change-Id: Ife1429ec649605aae3f7920560cec37f3a218154 -Reviewed-on: https://chromium-review.googlesource.com/602869 -Reviewed-by: Yutaka Hirano -Reviewed-by: Matt Falkenhagen -Commit-Queue: Mike Bjorge -Cr-Commit-Position: refs/heads/master@{#492369} ---- - third_party/WebKit/Source/platform/loader/BUILD.gn | 1 + - third_party/WebKit/public/BUILD.gn | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/third_party/WebKit/Source/platform/loader/BUILD.gn b/third_party/WebKit/Source/platform/loader/BUILD.gn -index d483734b21cf..409befe884a8 100644 ---- a/third_party/WebKit/Source/platform/loader/BUILD.gn -+++ b/third_party/WebKit/Source/platform/loader/BUILD.gn -@@ -99,6 +99,7 @@ source_set("loader") { - "//components/link_header_util:link_header_util", - "//mojo/public/cpp/system:system", - "//storage/public/interfaces:interfaces_blink__generator", -+ "//third_party/WebKit/public:mojo_bindings_blink", - ] - - public_deps = [ -diff --git a/third_party/WebKit/public/BUILD.gn b/third_party/WebKit/public/BUILD.gn -index 84ee3ca9136d..cc847663efc6 100644 ---- a/third_party/WebKit/public/BUILD.gn -+++ b/third_party/WebKit/public/BUILD.gn -@@ -755,6 +755,7 @@ mojom("mojo_bindings") { - visibility_blink = [ - "//content/common:mojo_bindings_blink", - "//third_party/WebKit/Source/platform", -+ "//third_party/WebKit/Source/platform/loader", - ] - sources = [ - "platform/display_mode.mojom", --- -2.14.0 - -- cgit v1.2.3