diff options
Diffstat (limited to 'dev-util/electron')
57 files changed, 20 insertions, 7823 deletions
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest index b564ab792069..651428f64cbe 100644 --- a/dev-util/electron/Manifest +++ b/dev-util/electron/Manifest @@ -1,68 +1,7 @@ -AUX chromium-56-gcc4.patch 1933 BLAKE2B 4ab481f20b4a07d38572e37d08a7f33e6ec44861117639223cce32a9cd89df3baccb8681e73cff3bce32b68d9b72929f4b2410851372fb97befcaf2e7674a3c9 SHA512 85b59daa229da2619f7869e600bfc15962c4fdc15c30cf3d314852a8a1138fcc3765e65f0e450c6976b82559ffa43d0f3b5c006ecf36a7585e344e4c0994f999 -AUX chromium-FORTIFY_SOURCE.patch 1050 BLAKE2B 9c0f59aa04e3d59f31895798dd6a78bd1973ee9caa58c1b524fa46a19f7c5f52a461d81ea2681319e65a178086205edc0b58f253998291dc2350bfda61bd0228 SHA512 d404976ebeca7ffe4e07770055aa9ec8db8761fcbbbf1e463523232a135e11d201c6263d468124190372b3178fda4ea36bdf9be34c50183b7ca93f14ab9d83b0 -AUX chromium-cups-fix.patch 276 BLAKE2B d1e570736d098093406a81c94a0e6a4f276caab542383d17e556fa9f96d8caa302c357fa7fb47b2ed8f314b4ef54f1d1001acb164bc10212ca5008500c9906a3 SHA512 20fef0212bd51a358149c8b6d17060707f290b502b2ea7f5561882444465d2e3c1c0baf8c91071ad80ec16622725b5dd4bda8df15c321541caeeeaa6453cb606 -AUX chromium-disable-widevine.patch 266 BLAKE2B 29db602dfab2b7114b814f17a8b6736399d102576d6e662d40f52da88e5d953bd555cade1421943efd4f8ae8761276ad440024c90d4cd7d82d8b57d2964c58ec SHA512 51d53ef41fa52314c02fbd4dd3b521b7ab317f51a0ca487973b6a864a129659ecc43d50ff436e78ef582c2edab504c457d1b74313002c28ac0b7864c43c14275 -AUX chromium-ffmpeg-license-r0.patch 1855 BLAKE2B 6969e1f2c5775ac02b5f50c76e0d20c1fe68d3a89ed7b27f3ad229ee03996738baf2774c648acf4c3e17e572ca8ecb39278d12d64464a097225cb728f4d27512 SHA512 4b8c2beb79ee80efed32fa69ee3790fb058b0747c61b1f8ff0584d08d3db25e0216613808a16c4c8012e3c747f8936a8d548d7157fcd26ad0be1d45f7ae65b31 -AUX chromium-gcc-7-r0.patch 4000 BLAKE2B 96830e147e9b568802867cd736cd94327efd7b0ae7767e659dcd55ea29a44ee15a5f88f6e8ab3c6816a7a87682b29670a507bce1fd88afc842ea5d1962a015b2 SHA512 7d9337db5d0dc146964a3b9419694cffa363ae7f9bf30a5ac6a2eafc18aa5ad638211cb44824f8492755d85d60135a84bc7bfe6edb816c39f1d38c1cc60cc93d -AUX chromium-glibc-2.24.patch 685 BLAKE2B 27909b6949da72d39734b891de3e3cea166dda43b29c4d43234d4cc8454b2c5376cccb703306d68f92384fa6584920bc0d12845f50595d7d025fe18c24b9e5c6 SHA512 73a1f271e227f3a906d1a9e8f5e84327e976e3d2ecd3c4543b4136bd78f89d4dfa31374b1a30dc1e6fa0b16bd4a174cc7e77d22ce4fdef85533611ed73a37905 -AUX chromium-icu-58-r0.patch 2772 BLAKE2B 4562c9ca05a205a0df090678e8987faf617e21a4eb89836f3999e9a1d6547d8363b16b2ccf77af8b80a2f90bb4f967c2ab47c361af0558468646b28a79451f27 SHA512 c8d4072411a878f501f737d48d6117f36616d08b336676b958823d723a9a88bd762b82b0bb97f49f6ca245e53c57bf69ebfc14361ddcb8aff81d7ab5309a68de -AUX chromium-icu-58-r1.patch 5543 BLAKE2B c35148b63fb3682ecfbbc32b254597bc6ead10393c2bec6d880aec3af46194f711d889aef4381806689dc4fd8af60901ee56e0273fe0ed4e46a14bbf69f6e588 SHA512 bbf2d8015cb7dd1178ad8392d5bcbdc9e63a1db628098a35b1a362625b18c1752c7832b8bce43349abf423cde57ad51ecabfebefe062766a39d66540669b08b7 -AUX chromium-icu-59-r0.patch 23384 BLAKE2B a15f0cc4672dc277e74c5fb96276527fb7705b82f90c034e8a807f0628fc824e246c77e8fa22a3c8eb18364f32a02b6075a6153fd33064d4341801ef229667d3 SHA512 1dbf04417e3d9ece8a8ab3f8274c53b0234e6c5887ddc0b655e5a25d4de4fe037ecf3bf236fee0bc32538dfddfa695da461114140d163794dcf7568954a9e0f6 -AUX chromium-icu-60-r0.patch 2824 BLAKE2B e19435e707d128aec19858e60a77c3a928dbfb21e7750ec629c48b556d64939cdb84c5b62bcd07d2fc99bc27976d6d832354dfbeec50a5466639889de806039a SHA512 13bed0bc9c90b2ecc12c0b2839ddeb688cb7d74197d38f018fd604425b06f7dce3d18cd3e48fe208c833dbb00b5404145a94cb87b132d2a768bac59d44edaf50 -AUX chromium-last-commit-position-r0.patch 732 BLAKE2B 2c9c309dc2f8495f758e66fe1a8e36f4135e1ba7be2f8fc3d1f61ce9fb5970f4b6f350449d88015e789e2da678778fa216a1bab97aaf1c5505cb7a0f580130a3 SHA512 303fff289b1b7af6d42bccad65e45395017b0e3694c352a1121b0374a3c9b1ff81baec31306e7773b5160b83c9f88b3fb9717c0e6c183508abf0716757ef523f -AUX chromium-linker-warnings-r0.patch 650 BLAKE2B 1f836aab62e511a5d1149d65f0baefb82bf29173088f38723feb1482b87c20f9aee9e6a534f267f86d61f5c0e26f7082c2e7a8ce3d72c9b5c502d620ba557c85 SHA512 566fe00fa7c31d6552df1dfb55280c08c72c76e459ba30acf5b980349dc91204e521787230eec546bc8d3414be8f0b666d9925f6645e5f527a6e1ce2a8198f72 -AUX chromium-lto-fixes-r1.patch 1188 BLAKE2B fd3e8fa2b03abb55720af598f279b2674406e9d409ce722eb7205ca8fefad3ebafb7a06f8f4adf563679e443c5223264cfcb13e68b9bc7263a37b042e2a1cbc7 SHA512 684c2a95a46bc4c5cd5b3f6d1b7b7b8c91cb1bb3eda32e49d82697668b35aaa20b54d92b7b3fefae095ce1db91b4ca61eba008e2345941a109a7601456158147 -AUX chromium-lto-fixes-r3.patch 3426 BLAKE2B 6d5955591831970a9524525080c1232b2fad6021ec5ff98aebe6f4e7f3cec139515709efe287d5fa9ae81a244631c0fe80e2bebaded261d2030e2029e3f6b60a SHA512 4222712141637e620b43bc7c19d87a1eb48d19eaa4bd924156cf2e15bf4165faa03e1a664b06e8bd897f56fc7d4ccfce5014af1a17f45fc1544d2338e59895ef -AUX chromium-lto-fixes.patch 901 BLAKE2B 0b4b499d3cb99f9ff906b0cb2e7e002a9545b971d66bf6f5a3e7306fd5361e9dd2666962f7f61d07aae7a2f5952c51676013c069333b3d40f5ad27f8863262f5 SHA512 07c324db940c72807d9ffb16ea41e67c0dc4bfdb676a8d98bbe5d5d0919bd4fa686bb1b4c16627c8516e82a7646383a76a99f96a471f923544cb86389fbb6c24 -AUX chromium-pdfium-r0.patch 774 BLAKE2B 26e3ecc45f90261dc2c0b1939ea4b69ad4f06438d673603ebd6ad9cae9926d1d791595b990b8c9dbf6e20770c37e64fc0eab470c8d4bd65f322ad6fa4b615830 SHA512 ec45fb601d079f3e3f2c4fc4ca5df0873ff985793cf6e2982db3842d4eb86c8846d6c90c6b9fc3b86da8939acfd74db5a285fa26383d11b7b7b59ef3e782f0ba -AUX chromium-python3-compat-r0.patch 1033 BLAKE2B 980ec629e7a13cfc9fd554c9347720a4fd35441a3b04e6d128883cd9bc21f576bb0e21f59eaac8c9ad17e9bd723861316603b33972a0fecd46cd972016274d89 SHA512 9d0633f1aadc65be9a9660e577bc7a3cacd3c1608e4d975453ca8ae2bda1f0d513d3546fed2e3db1e52572d6f46b8d9a75e83a7e480ca84df31229da08f5baf4 -AUX chromium-remove-gardiner-mod-font-r1.patch 467 BLAKE2B f2e42a4b54870de74064e0c0de8363482deeab57d1b1dae9650804220e54cbc167075c461f1d1e3d783cc88d267ef46cf10ff2cc2e86e5611745e3a4fc05adc2 SHA512 7574734e4e5573811a3f9f4e26a2dbe2cb749df3f5d1f1308d5ec8e25820d8ccaa63df8bbbcd7ba01221c85a0480709fd99a2f224238ceada36ee9ff6d53f478 -AUX chromium-remove-gardiner-mod-font.patch 482 BLAKE2B 429e00a5fe39f8d1825122e7be3753d533ee997fab3740ffe2f2d61262d2c99401263c371637cae907a262d4c390c606fb18a2ebeffe70eb1a8ca14e8be8b5f7 SHA512 49b5d3787acba86958766ad34a5ceb3d9c95a5d743a569de9fdd08c437f79ff45a37dada6e5d82aed51b75ba104be3be74a89e6e480f0964c537a02f8745c6e7 -AUX chromium-shared-v8-r1.patch 523 BLAKE2B c6f1e11c71729904e29d58b56baa35e5430df6ea62cbc698d7fc0d8aff24baeb3208306e0be0524581199fb869953300dace3e972c4857cb8b81abc2bfd1fc39 SHA512 3c0d397015424b93e0f3ce71418a71645a3c5d790ee8c2cad1ad5bf833da9e6fa95a3cee1195b212ba9eb5ec875ac007b93faeecabe55e825fb0078154d1fe6e -AUX chromium-shared-v8-r2.patch 610 BLAKE2B 451041fa8a843874ed5b59f7e8e5cc6274214e726e1156c2431b5e20503e534ea69ad2cae0148e5de2a2cc0a719b988e06d3fd7b8c37e97ac7f067b7f21eb33c SHA512 8186f4c3f3438282fbe52de980aa2ce4a573091d8a9cd0fe2c8a15e17b5ba442b9cccce1c25149d761079eb9d07864bd2e53e0e6b5a751b10e05fecb643a569f -AUX chromium-shared-v8.patch 547 BLAKE2B 582507e498c90233b97060898b9c1677c11dcf2478504a11b9aac1d6072fee99d4ed5ad051b88cad52fb743a8f0558840dfd02ecf1cbf9d71ed99b7dea30e8fb SHA512 eb1a4329856f29e8c1443da7fa7dd9e5bb384c60212619227b8c4cd5b6b45c541c3d364e358fca07c3443bfc92ff873cf66ba1c3711b586eba0efcc1bbfb4f92 -AUX chromium-snapshot-toolchain-r1.patch 990 BLAKE2B 4acf3cfd8fdff408b68085e4a2f07504727a1cda5a77d20b968f442ac41ea0540c4533c5fc62ccf00bc8991a8fcd812587aee5a5aa3c96284ad4a7b1cdf85a67 SHA512 ea0a9ffc5aad07bb44dea617c1c3fae04b1c8b83a4671fdbb098986dbfcbe9af3785ebee444e0afefe6ccf05eb6f1cb5f688d22e4bd8a925fa50e32c93738196 -AUX chromium-system-ffmpeg-r0.patch 2449 BLAKE2B 8a38e2beacf74d418f9b87e11b41bbae5fcfc90b484404d5a803a67a56271ecfd4912d6c4b4ba729028f9d9f9929b5e0fdcc677e17b6cf01f1c70f3ee8c10445 SHA512 35097cba0ba5afdf20bb3899d588396a1c8ab287a5928104efb0506559bcf84e1029fd19788326b7affd71daad2e897bf2af32b4a388a03a3e222f19cab23011 -AUX chromium-system-ffmpeg-r2.patch 2350 BLAKE2B 8fbde754411f2ba8b5bb6615eb6dc7803be524c04521fb353b78028d0ca21d81cbdb4798c1ec8f725fd3e5ee8895433e6334bbabf804261dcdb113c34556fdf3 SHA512 bd662718e65d72854018d7d9e20be0196057de69be87e2ef18e1a8c98b2ddaccbdb074377820b31e6797d9370aa68724fabf26d826a402595390730857cc3956 -AUX chromium-system-ffmpeg-r4.patch 2307 BLAKE2B 17624dcf28eeb0125fe440cce1ffa564f730fb2133bf1b16b807aea1e997279d20de8fb2d2259ddd5800ad76a8a9e03f429a8d03ca964c06459e7d4070620f71 SHA512 e99601fdd199cc95cbc6bb6b03283380f65cc835fbe62555ab97ceafca1e00d7c257a6b6f2f6da999c497f3128098e631989ad7cf7840b160b0dda982fb843cd -AUX chromium-system-icu-r0.patch 4480 BLAKE2B ee86562e12d67acada5ab222493b99ef92451c7a2e6c5f7ff71f69356c1086c5576c91ca308bb98139717bc6d0af34fb6e7d997f57c08fc7e70757da5d720686 SHA512 fe8c978f6ae3242d3c4fec853b8985af18014863d50c44654826b47d4151e5cc34c51b2a45c8a607a1e92bc62bf55293f39994aba2b96c3f498453d352073226 -AUX chromium-system-jinja-r7.patch 1611 BLAKE2B aa2745af2c68b4299b513f7f92ebc8e52b0f569cefe45f04b59f441d44acc246e53b006463f7ab46a5c65a0d94d665162948cc96b79fba5b0539fcd88a725a79 SHA512 689cee917bd8a81edb4e640d551eca8bbbca9fa7c8d0afbca513cd911880773e7bfa0e3d558ca770afb418c6e0b42c28edb08b4792de900df1fb0b58afba22ee -AUX chromium-system-zlib-r0.patch 411 BLAKE2B 9bd5189d73ac27e399892d12378a6bc3653ed51db32e65d19ca1d24641f6d9e65209b4fff0687f041eb347a3f2a133ff391bf669a0f6acbd784c46ccffd45b09 SHA512 ea7b9da8bf504583e0753ed2d69e95e6d2579bb9640b52b9d575966f495bd4dc15ec94fb35ad9877a736dceed946a38dccac028a4130326fda3f7ad7dfb3b07c -AUX chromium-v8-icu-59-r0.patch 3022 BLAKE2B 3e326c5a38adb849bac7f81b3ee3b649fedd73330a21d80d70c687517637dd34d431db02a53ef2a1488c63593de79eebcb1185a828914ca7cf4a5ee904e69a8d SHA512 cd09e3503c815348d2221cca17f40b4380e5ae4168b3edce97d5cb7b0a92d90eeb0eaf02dd38fd54780251541e43ebc8630c3c8680268d8eb6b2976bc230c0f3 -AUX electron-0.36.12-vendor-brightray.patch 4561 BLAKE2B 3b34ba6c23dd4126d59572676d2a5a1fff9b8d6df68d5c12a4321b90446e6906bb9bea4e81c765dbaea911e8f040353551760da7d584e07041b4d8433a36da00 SHA512 d96922be1a82c66f26fd433671f709277f21ea20a45425ec4f20bfb011ae6da9feb7fb9f45bb0369c9c83df07050edf31f9b9c22e804f8f77c249d6aaeeea2d1 -AUX electron-0.36.12-vendor-libchromiumcontent.patch 2939 BLAKE2B 0820d932c85888c99e30941acfac2f579e7702925f9ec0f46254f2bfdbf3cf9c0b3a2c48110abadd53023f0ce7158ec1b5d3fdc7ab9e7b831446c80b72842ad5 SHA512 2ee97d7fe5c5abbbf76983f3fc36213844adf48d48ddc9f7962b1b66d14809aaf8a5c5a9911411d369a5772093c2d655e827160cfd1a72c2f620e4f5775819f3 -AUX electron-0.36.12-vendor-node.patch 2818 BLAKE2B 0cb49b7a9a07a9b95a77744b5ec4dc6eded278f288fc5f5823e38a4b7879ca387d4595e721b75a58dcbde4daedae2a417d062ae350dc776b548be4c1271c8cc7 SHA512 068115d33de795200ac59797da3b1f4a1f509f4018e0e6442ffcc2fc423a7db969672636db8c2fad95a5d2fca330d58f563de48cc91dda1553a0bb6c4618f648 -AUX electron-0.36.12.patch 8307 BLAKE2B 82598fdeb4d118368a35805742645a8fdb093c31017d585deca25d26f035a606b609a5af55d22427e35bd8361beae06c4620a13d76cda0baba4a4b4226421e46 SHA512 844d7ed9de911f7c8627869299f3c97a8df01b0c210ca85de0bc6f7df004f3ee27b5784b6b0cb89f34d8a74b5e2321c5349f283f08f49371294ad3fffc8f894c -AUX electron-0.37.8-vendor-brightray.patch 4518 BLAKE2B d44aa77deb6be408da0c2b8d227d645c618f851c5021d25c516f2d99228ad91e51561865d070d29183b606601f621b562f312db3ab60c03cd65336bbfcb764c2 SHA512 551708a0cc880143ec40e5d029e20edf868336e99e2c46326dbb053209bccea3bf64516ce4a7adf39cc8f9d54b455d62f998685379f361964e8645d71b43368d -AUX electron-0.37.8-vendor-libchromiumcontent.patch 2661 BLAKE2B 6ba2ed4084676324dac0d082a6f93e37a63ecdc7e14a5413163c14c48952753d2c4e4ffd56a4af675f58a3b0c18c7a7dae1ba980fb70a5416c6cfe265c3d033f SHA512 b0b7df79e510ad42e8cc0599c358e3e1ae3bd99ee5d91bd683a47ef6d23b7cd41d9ef4ef90970a9a80d03d77e46561df363cb0916926219de293813b04f0a4f8 -AUX electron-0.37.8-vendor-node.patch 2828 BLAKE2B 4d845bec8145e0cf70b9fb343128dfc1e43ca93fcb7fce3c7146c9ecab861655bbe269d4efb5cd2cf81780d8d559489e4c3efe098487c21e34b313695dfd5738 SHA512 df0b01481a1920d9f7afa87a6a84bdeb7dfda0041d2d47e8bcf33e1e06711f9be14f7453d75cff45692ac186969e4668356b167fffc46acb8e737fa5e837b5f4 -AUX electron-0.37.8.patch 12649 BLAKE2B 7e35eb5e817e31fd4b24ed39fcdb6f04682d4f056981ca135c16d45de0abcba4b393fc9d4603383e714ab4502dff013b8d86584f70c7cb11d30f6125c1465b88 SHA512 57b51dd5d8a76e0f880563fb8c9fb89c26f21be227fdc9b446f26b7a066ffcd19564ad56e74a65c63386b71feb70a5578865f131be76c33921e7f13619b56ef3 -AUX electron-1.3.13-vendor-node.patch 2733 BLAKE2B ca3575e0da0dff76b2f0ff8b1ee30389f1ac4c917ecde0719479f361f3ace44c21321c631539b1439d5d499b5dd611289930627b98f96872cf3f03da3b37f148 SHA512 0cce18ac0716d62c1e66fa9e24def3196c2a83f83acb0b43fff931673a359e1f84cbb017bbd12f3a4c280293e7fb2e55dc712214fb490384e802f5696b9dd46d -AUX electron-1.3.6-vendor-brightray.patch 4520 BLAKE2B 40cb72e2458f53695bbdb60cdd7525f25b7377f51d41c57ef374f469db3727e1c2012d71aa2bba4edd3013c92c5060b26f360113ff8999e53f9c04b932c53822 SHA512 d61bc76c3c2d6258923c08f269d931ef7100548488cf74850525affce62583d968f5bab520f559505a8ac1bf485933b4b38ee91205205e365108146ff66f8e1b -AUX electron-1.3.6-vendor-libchromiumcontent.patch 3129 BLAKE2B 8e3a802be2ce5993631e913b723bfee8067953c32c2a173cad5a662de40ad8ce165e4f9933c5bde06762fb1bd3b7824db9ccd2af898ad032875674bbc84ec1d7 SHA512 4bb3a80391b485b210b1b2f2005c7f9ed7dfa67c19931286bb93b69eabe0b3d54cfed55afe044d35a6af17e7f50cc4dce3910b9c11f6165c4008f6e976fe2658 -AUX electron-1.3.6.patch 13898 BLAKE2B 635f06fafe8e840e8deb6b1c9c9c95c2de0d87f21f76c9dbb84f2942b5040e13d35bd073216e76a01de3a47c9d64f95e83f93b229e4df358ae8db839a9bc4b7e SHA512 600126f0ca1a0f0553cd07278d129c52137b792f84b33ec814734e73011aacd9dd42ad2bf489c4c2a01117f9af019c514ed423294c6619c0f11e76aa8fa19a06 -AUX electron-1.6.15-vendor-breakpad.patch 10087 BLAKE2B 1e6ac7076b58bc2f60fac52696aed9c23ab5e4d4d202546e20eb535d55940fd25e80684001b1a019e3facfec217172f3a82f0309ce52c287fb2a8288829b7adb SHA512 9b86e0d2a3e6d1deaff227240e6ecbfab8c27e8838fc01dcc26039cef193f6546eb622e9e35e768b0469253ea2e7c4bd6f6b8a83e10a0acaf949cf2c73d73d73 -AUX electron-1.6.15-vendor-brightray.patch 5552 BLAKE2B a554d6554efcc7ffbfa715b3f32d208fca156ab7da3c0675f7c14edcf1f3be169dff8a51e2b1161dc896022c8ac8f64ab0e7391dbb1a98385576700c4aaf3707 SHA512 75d3b1637fe45c7da6ccf24754983f2e7828de6d2703b72d3693298dd16414d22387f1379318e4811d19e94987e09b34e2a0ef21f799d2bc2d02fff448ff6c30 -AUX electron-1.6.15-vendor-libchromiumcontent.patch 6978 BLAKE2B b23bed202cc3c8a36ce7d3bea68e804610eee73a1090f29c62013d1cad73a7d9923a177f62e62682e50da0848617768762559eae845ccb0f8360025e4a054673 SHA512 acd6e796e42dfa4e14fb3d04896b7a9d291123819a8d02b14bba0d1821c49ba1fe9367fdcf2f77f400d220c4ff61a841c53951daf75297fb59a1289022f1b2dd -AUX electron-1.6.15-vendor-node.patch 2570 BLAKE2B 3a7c15a0bb7cc537923aedf28b9d939ecac58eb329d3bbc376bda92f9ad011d75c4edd3e179b77fc1aa950db185be7eb14cc296583261fd14e1ef5542b5df57d SHA512 a3ed850a5c919640a206368c28f778db1a05d65a8b566ffb33b8a69d81a255d4aa30f9e1d3f663db7d9a1351c6750ccf2061fed5c19a09f0d640667f5df0b172 -AUX electron-1.6.15.patch 17285 BLAKE2B 1f748b3d4cf83ae1844abddcae5e234a54d084feb54c7cfeea917a2a745f656f1e645047e7ff140df765de8f7df1d1264bf2049deaff2fbea219bb0ad35be896 SHA512 15a67c7ff4036074864b2952c2582a2214de956a80c52769fa7dd21690eff2c1b9b1c9a71e21851647d98f598e4dd22a3cce8fee0e6319f921d4126aaaf87878 -AUX electron-system-icu-r0.patch 1192 BLAKE2B 235629152a829710aa828c290001f5891911f48de2bab4e1f6fd40fabc1c05122ba43ac464d9642979dfad6279e8bf1c17ab5808f829bce84cbf085d5b42d609 SHA512 e5fdebe98fffc069af9c8c41ece4c60e78aa8ba749f91ac80cdabe4944a1433162e0542cfb01b827cfcfa8e74068d77038b383f696de82c25610469eaf2cfa51 -AUX electron-vendor-node-external-snapshots-r0.patch 3003 BLAKE2B 510a3524769ac8a7065668a132efcde72c7ba82f96ccde5cd4b1b8d0a116ad4e2acfbe81179a2109daabdd8d709c6bd573bbcbb817b453fdea2241360e30c7a9 SHA512 ad51509b75ed5a3bb31be19ca4e3f7b44007fe9cde5de7521d381406b13ee651f4716566c0483ae2eee05836e3fa51a107fbda3f1ca400c64f4aecfe165becfe -AUX electron-vendor-node-external-snapshots-r2.patch 3119 BLAKE2B 31bda0f7ea1f9a872c6576e18b453212f680a97c518af6857ed8da60340165f0a919cd660495eab529082338526b97cbefecb18f6fc8b554a8bd7d8685badfeb SHA512 25d563dac3819c41edc5609acea572b8f71abbbda77d6b79fe379118fe37b5948aa29b39546c9aca70ddb47cf6ef2eb57cc15970e8afcd989d94868f18c6f731 AUX toolchain/BUILD.gn 400 BLAKE2B 5237bf9cdb5be027aa8dff5b854297f51fa5f8a09f5b24a1b5c6c4494126e16573f2bafe503389566507d60818880286efca8ccc9ce8f5cc560faf76f2df6c42 SHA512 cc36ab3406dcaedfd9472e94c53d3f25c4f5e25e2d1275e2bc99b8e18ffdf6de1583f7e0ceadfb8a8d10ab3e5d7018b84ec506e3b31a0a55cfb9453fb19ad3d0 -DIST asar-0.12.1.tar.gz 1016626 BLAKE2B f3e2bee6e844fffcc19150f96cf4b20b5f6bf398d9c4c89f0527ded20478ad100e9fd1eadb3685ad05853b07b0e084c8cdcf99bb0d646e7f7acdcd9e3e9ec3cf SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee -DIST brightray-8dbaeed37b9c4fb8ae985670b142f659bb265fb4.tar.gz 76965 BLAKE2B 1705aecfbfa19f20136133f4ed35d0d2a4c6e8157591440954274202110ae73fac67047c9e432f81ec9572b1cc8fc9bacfa4c3251385e46d743ed326156a77fd SHA512 eb0ad05107ebfb4151fb0f26f7dbea58c353cde0407c13ea00c7b98487fb29582d5f3e334900749dc43c8aeca828d8885c4d77dff6739de97ec19b33017a6e93 -DIST brightray-9bc1d21b69ac99bed546d42035dc1205ea6b04af.tar.gz 74416 BLAKE2B 2c72c8fc77f607f6b0ae2c34ac273d9209cfbed9dc6d71bd0ab87291f843518024eb89cec2a54e0c1f53da5eb41c02a1c4a4ead6d471c946660ac0691be7e785 SHA512 c7a16f3634111a43d45959e0406488dc7417848403a6261204b58f67d62688f888f733ca23f3eac3a2dc76955c185ce845d63a6dc1e5a0fba54fb115202414d0 -DIST brightray-ee26c5218eeec199c54c92a7517a72d2dbd0adbf.tar.gz 82375 BLAKE2B 5677ea1c8f3be4bd656bfe0ec4995c903df1fab1a0bc9d5b8a80e83e82713dd2b528adcf7bd1b33ca76104bc340fe48a2ae01a36bd8e204fd12240b8d7116b3e SHA512 7595f5a168d40c42687b8013b588e9c74d6f0047e71549a32d892fa3ca9de9d467303e635364bd779e94094aa9772b705ac027aad481b40d42c0c039ce8f3709 DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7 -DIST chromium-47.0.2526.110.tar.xz 394673276 BLAKE2B 62a4ef2d74be9b566c59c13aede42d92afe443b155c9a7b793c78e9618a82868d7bdcaad8edbd6662792c6c73292167cc5dfda4825b0fc3ff6b282ad20e53340 SHA512 d1655e822776567101632696c7817067e9a85c0f74df22ea40b8fcb45b9571471d8bb1291bae4dd879d746ddb57206276db8df92ccb546bb00129bc26bb33bb8 -DIST chromium-49.0.2623.75.tar.xz 452264916 BLAKE2B 723dd3bc09184690724a7380f2f6e98f9e64b9d77bace85dca49d80734cc63952c3fe80446bd6bc4daf743e9f16f4390884b2d556aaaf355f17637bbedc5d73a SHA512 694f0ccd0a4ff10d8b19e52defb48f6d47daeaa47013f01c2924251f3c6ebaccb20813379c3b7dd6fd939138f25122ed7d1a56e1a6b80309aca65b6c854768fa -DIST chromium-52.0.2743.82.tar.xz 458110272 BLAKE2B bd255c6f4924cdcd2c17ea5d3c8fc14be95d6f49555c98164a5bfe6f76a9cca2dc49e32ef64f1b8c503092fcfd1c1bf231aabab946eb5a5149c57ca33e5e3be8 SHA512 9bba841cb726bfa06888deefacfcee628e36d25de47dd0303d3fd1ce2f07922148d60befe934f44c33fcdfed6ce3dadfb9e3ee0828b66994807178a488051806 DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9 -DIST electron-0.36.12.tar.gz 3068567 BLAKE2B 8bec70aeb2fbf551bd2dfcc45b7ce18c19c1b7474b2c4d9d39fae765736e1e3a55371c7b9f2b1a31316f302b926c5c88cc0d9293ba62d3ddbfdb615dd2c15e27 SHA512 37d016768e57f81b01338cea6d0d5eaa6ea72d83a2122b54c9c73e37b0afc7fb8351b0cb846afda29206379d5625657b815b002c2eb3c31babcd0cffa47ae3de -DIST electron-0.37.8.tar.gz 3154625 BLAKE2B 3f1359560d555951b0f0f4d481449ec2676d53db2d135017bb6d57a6595a6b41eab3307fbca91106dc53bec463153205aa4495f092a10b16f27105beb2f1b512 SHA512 1469129cc6e07da2540ab67d2bb9e2dec4055da77b35bf0abf86a70e82e3ccf443e75edb25feac6c8855c5e841592738319e1a81a52d504e90a5ce9197153754 -DIST electron-1.3.13.tar.gz 4560040 BLAKE2B 1ef5a52547828427eba6ed8b85e50ba2405658ccfce6bb27af32f380c8122e12c7f69115321f961948cf9f4ba8af6a4f04945a2c45d4dd82169f876d06a9d3e9 SHA512 c15b8303e1a18674fd828991a118bf670ccd052b35cac7d476b06e7903055fa905a93a79dced4186c70d30c7d220a3b7daa2a4f490b70c87134fbc393d54d94d DIST electron-1.6.15.tar.gz 4943663 BLAKE2B 867964e23bea77b0892febcc47198bf783f0021df842c40c94c2159abca75ca45cac345323bb2735a9ddc935bedba62126d5afe9ad9e0fc031abefbaf444d441 SHA512 e6e7519db6d272d151e5618976a69feb11c35f1845561d152c64b474696f3835644b232b020df00166f80913b2c492e6e8cefce1a96494a2bb92096936e18958 DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333 DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127 @@ -70,19 +9,8 @@ DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2B cb194cca884419f1c85524740860db244b06a237428add2cd9afaae8e0fe63ccb266b8e5e44f2125da57d263f167aec6c46c9c3451c5217100d58825f4322ecd SHA512 515797740421d5f80912b33dab2039c35b2ae432a0c4351aa031461ef6c82b7a1775c3d4d41ba6c646f81ba3ddf3bbfcb35b81da1ef88b486a2a67d15f09ec86 DIST electron-libchromiumcontent-a9b88fab38a8162bb485cc5854973f71ea0bc7a6.tar.gz 427806 BLAKE2B 21274045953499b7656366520d93acb63515995e7d6614afa5bba097e80bf833611fd715f0a8782dbdcb3c7c11ce2c4f5c2789483d4847e5bd73567123022dfd SHA512 da23b6119aa39d2ebc39b20280e2b6c0c26eba3e45271a3b8b196149ae8fb17f7ae63b97821ecdbc74c8d28617e361a3570e89c716d560a3b0caa7fa1f673f09 DIST electron-native-mate-fd0e7dc4ab778f0d1ccda6c9640464ea06ee771e.tar.gz 23926 BLAKE2B 72ec5ee020ac18c5b3a8b6552698ed845cb0c401c0b02a4627479c98c581018658471df95de9d242db85ac9a4588b5f80b488180049271322545d69ecbf01123 SHA512 8715c417473340163ca3db2754ab10619679ac72378ff5c7f63899fe891d5c83e7b3db6832af885de63eb5a732ed54f393bcc3aeb8ddd38569e74023c46f72ac -DIST electron-node-6bcd8af891a991f8aa196e49e6bf908ebbe24cae.tar.gz 36600837 BLAKE2B afe210292b84c71b0859c790cadc60e894e8a2531d0fcea8ba60a70c7a2a937d09056647a0e6862eb710a7196f2eb9fd8d7a9be01b4b6eba4c5388aad687afe2 SHA512 7fcafa01027bd68794a7cd2f049a7bdf45e1dd56622583bd5d53d662328e64619dd5dbeec295ff559b1b268e90bf6abf3d76cd6d00f055602bbaa7443e3a3450 DIST electron-node-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4 -DIST electron-node-a507a3c3816d6ac085ed46250c489a3d76ab8b3c.tar.gz 36578658 BLAKE2B 26d803a0e3e392a626d871af0cd2928b1ddc2a20e963c872e6b83c13222512ee455a91a0c2e1541aa21235681bb53ec874c5e05f5577cb07b7e15092ff5d72b3 SHA512 a5b62c05ec7300a26b3feab3c1e796a87691d41fa7c039541574878491df51e9075685abc5d630fc62bca95bf821eeede041d4ab36caedaf76156844f1095ea6 -DIST electron-node-c47e9bf9011de682d07c82f7f610a467f30cca60.tar.gz 44172045 BLAKE2B 4c9bb3df3366e01347e527df9aba1fe57bfcda1fb0542e5c0a84c924094965a05d7cfa1be336a29ac6562e9a1eaafce3df015ee27a3df7f032bb2c2a20a6aa78 SHA512 830cb5e4aa1956d0f67b0c5ad44241254596791b3bbc533a170b1b7bcb7a45137ff62b885a65a78a64323ad94f660c6b75142109d79256420b8d20a7d26acff7 +DIST electron-patches-1.6.15.tar.gz 28591 BLAKE2B 98654829e882874f4470d7bdb906f7cebde6c61c28568c06650464ecd8779cafd028b03711c063445387dd158804a7b9bac5aca836f56f2285b50fcaf3ee56b0 SHA512 c18e53bdf86246376fdac505481e4aa364438b703a47fb82b695d874dabf9a945df5381042b1a0cef102142f0482db51017a031647f8f8ffde3e8d1f629e2f9f DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e -DIST libchromiumcontent-27add4cfef98f21d5910539bebb47ae175f024c2.tar.gz 403724 BLAKE2B 126cd5ae76be99268a8f4c765a2efae325a56e43c8d6ae171e8d1a4f1f872358bcbc3004e8abf77826cd6cc15dd3e3bf212b2300d9247fe6fc724f21de193db0 SHA512 7995fe40100b91f57ccc8fde445f136fda62d2c88a8a06d1b07aa588bcdb27905a542d62ec9cdf567b626439d8648fc749b73d7e9f52deaa94ead27e191a732f -DIST libchromiumcontent-60c7ec9f9bf465a8c9c7ccc3fcd2aa1cdf644bac.tar.gz 402072 BLAKE2B 908a54450a4a39b37be08e5926b808f29111214a36bb8d91c8c24d31e53cac7ac38b19508e942586e9338267096ab7e1395de2773e46721029dc6ba004ac9875 SHA512 ddd52e58df1848edab6c514e0ef8e4155eccec6bec9d4e557dc0ee7d5c2cc4036f25d1786376b5b47a5122a266f00cd589ce665b8463549e9383d60292d180dc -DIST libchromiumcontent-ad63d8ba890bcaad2f1b7e6de148b7992f4d3af7.tar.gz 400648 BLAKE2B a0a1d0335bb0155d1c531d5949d96776e954e52ff57086a79ed46e93912748e1d51fd806f7cb3115c65bccb15ed7602dac2b63d11e9daba762f08af47eea3c6e SHA512 5fcb5e3dd98d5875ff7aa9f9f4d02af45487534d0301ca7a0a7adde934f528fedc3dfaf886b9031027e41309eb8ba658b72a56af4ad8dc44cce458b9c04a0e47 -DIST native-mate-0df2d882ea2286e6335f206b7002037fce66c4a5.tar.gz 23738 BLAKE2B f0408715bf85dd087278cd04860ab3f377f5008ff28b05831c960c9cc3a345125639fa0593fd27a02fe3fde217ae3a4f5d0c22a02625f512ff9b62121c581aac SHA512 fdd928a4b170636320e6cfd65753aec47c38380ef6f1b6dde255fbdcf3756abe8568e689e1214d768056187b243f979f16d4289ce8429a5ddd17b07f806ef731 -DIST native-mate-b5e5de626c6a57e44c7e6448d8bbaaac475d493c.tar.gz 23465 BLAKE2B 2d4e5ab06c8fe49188db2b339a5a5a102043fe2a7f21930e2eca5504a159192fdf2ca90fdf5c895ed9a942e512684f20112d26ed7bbc4a7e16d694632482413b SHA512 d004f4ec3ca77d98b2b2bc271c830b769bb6396e70d8dbf25ede87c509ce95dea083d6e5b3d050647cdf3d0a6a21c6da91176eba90d7256ab80f5d23248a6bb1 -DIST native-mate-e719eab878c264bb03188d0cd6eb9ad6882bc13a.tar.gz 23818 BLAKE2B 325a37525d9eefe739a93c8fb051f369ff73e1f8aecf0996683ff5276508535e96b551a1a595f47bf71911068f9fe3baaed38aa48853ae52671d9af1e2f5be4b SHA512 4272648127fb0bf90b36d2c090bea718d560737c1c7443a5b3c0de12999ffe607429b2112ecee36ece5d26cde54e78964303250ffd350a19c132c9733b72c523 -EBUILD electron-0.36.12-r5.ebuild 23379 BLAKE2B 1ada1d6651086826d77aab93f4dc572662513627bbe1c04e2cd77b3a0b9a2f778b4c5c3bd9397a5177564a3472c8361868737d3049d546ed62dccc50911c8c0a SHA512 32408c39d7242a434c3bed28a95abea6acd450c1e494e88d835825a51a45d4a445a189eb0e5f09b7da7cf3a127dffd6856d8165196580f449a5cda39421d25f0 -EBUILD electron-0.37.8-r2.ebuild 23755 BLAKE2B 9a6fb027719a68a7072c6d2ccd642bc11a45a291e77723791da8901574678666b371cc1f9e6e0a9bf3d53623060907c5458ae42017511cb4005e6061396fcfa0 SHA512 4253f2b81deda03c2fd425ad115f0a73da2c0aee2a200c8ec9e0a57e087962e56e1f72153022f44e3866a3c35047b8a57af381449af044446ee43dbcfbafa7af -EBUILD electron-1.3.13-r1.ebuild 24394 BLAKE2B 288211704d0a25993294885028374dd1599650adfbd38a48f99c29ed60284d6a727d1a0fb4075123a1a06331ecdfa6a5a21a980be4b41944c34b9aac00eabf59 SHA512 60264761aedfeb4669f89e01ea526ddeb08e2547f5bd510e7767f6398a6e8419bc4d8a52452139df79bd09265dde14a50bb52bb5d3917ee187b4c1741d6fb050 -EBUILD electron-1.6.15.ebuild 29041 BLAKE2B b027042bf748d1682856eb9063e8d2da6da6a749862db30e0e05a5b708d741779b29cf26e637fc1116d72a8654a4bf71ac6f338a39ad1df75979a4bb11b62f90 SHA512 1089f086bcc2415df0132996fb83b1d915d4a4e6d2bda7d2afcdc44a4282e9c15db4d9369b7156a715adb2595deba832273884da485f56317c8836f83b00a05e -MISC metadata.xml 1200 BLAKE2B 96a7ded82781b614429d3ad8c34970dd5ec6b9fc72955cb135d5e8b82e090a7ff70cefde445bd92b74c011b1433a3e40117ffd83b5580b64ffa2e63236cfbb35 SHA512 a37063e88ba9dac58cc18c88e8b510e0d1d1ddd4e53017a6c92a73e281c0bdb3e87636136c52bc309a81a5c1df02079994409aaa70dce5e0130654d952cd744c +EBUILD electron-1.6.15.ebuild 28334 BLAKE2B d522d9db81c453a9ec775d9e8a414654e9eef804bc26a5e903d01ccdb31ab3a05f5e93b3f3608f29dccf4d66d92bc982b8b2439147588519f272ee9fa52d8691 SHA512 7f291863bbd72226582bc10e48dc68b1c19b5b4b730be0c5a7cc27a7ff5faca25fcffb2067a5ed71d0acb95a76d2e4afc3d293682f0379c81186aa949154f7c5 +MISC metadata.xml 1179 BLAKE2B f233c35ac72f6b375d7f036671f0a21b6a5b72453713c6cae6b13b8b7d2c5d8b71682799124f121f6fafe115aea6de05f44b440054ccbad4af86b2c03e0833e4 SHA512 3f9a3dba4cad2d4eebd2d90eb5b1d078df6c59f5eda52fbc148b23b999a9ec4318b87e1ab8bbcdd6ec353bf274ed65ae3a19cae7df07465cd86f64abd85018a0 diff --git a/dev-util/electron/electron-0.36.12-r5.ebuild b/dev-util/electron/electron-0.36.12-r5.ebuild deleted file mode 100644 index 8dfee5f2d5e4..000000000000 --- a/dev-util/electron/electron-0.36.12-r5.ebuild +++ /dev/null @@ -1,740 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -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 flag-o-matic multilib multiprocessing pax-utils \ - portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator virtualx - -# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION -CHROMIUM_VERSION="47.0.2526.110" -# Keep this in sync with vendor/brightray -BRIGHTRAY_COMMIT="9bc1d21b69ac99bed546d42035dc1205ea6b04af" -# Keep this in sync with vendor/node -NODE_COMMIT="a507a3c3816d6ac085ed46250c489a3d76ab8b3c" -# Keep this in sync with vendor/native_mate -NATIVE_MATE_COMMIT="e719eab878c264bb03188d0cd6eb9ad6882bc13a" -# Keep this in sync with vendor/brightray/vendor/libchromiumcontent -LIBCHROMIUMCONTENT_COMMIT="ad63d8ba890bcaad2f1b7e6de148b7992f4d3af7" -# Keep this in sync with package.json#devDependencies -ASAR_VERSION="0.12.1" - -CHROMIUM_P="chromium-${CHROMIUM_VERSION}" -BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}" -NODE_P="node-${NODE_COMMIT}" -NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}" -LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}" -ASAR_P="asar-${ASAR_VERSION}" - -DESCRIPTION="Cross platform application development framework based on web technologies" -HOMEPAGE="https://electron.atom.io/" -SRC_URI=" - https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz - https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> ${BRIGHTRAY_P}.tar.gz - https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz - https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> ${NATIVE_MATE_P}.tar.gz - https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> ${LIBCHROMIUMCONTENT_P}.tar.gz - https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz -" - -S="${WORKDIR}/${CHROMIUM_P}" -ELECTRON_S="${WORKDIR}/${P}" -NODE_S="${S}/vendor/node" -BRIGHTRAY_S="${S}/vendor/brightray" -NATIVE_MATE_S="${S}/vendor/native_mate" -LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent" - -LICENSE="BSD" -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~amd64" -IUSE="custom-cflags cups gnome gnome-keyring hidpi kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" - -# Native Client binaries are compiled with different set of flags, bug #452066. -QA_FLAGS_IGNORED=".*\.nexe" - -# Native Client binaries may be stripped by the build system, which uses the -# right tools for it, bug #469144 . -QA_PRESTRIPPED=".*\.nexe" - -RDEPEND="!<dev-util/electron-0.36.12-r4 - >=app-accessibility/speech-dispatcher-0.8:= - app-arch/bzip2:= - app-arch/snappy:= - >=app-eselect/eselect-electron-1.0.0 - cups? ( >=net-print/cups-1.3.11:= ) - >=dev-libs/elfutils-0.149 - dev-libs/expat:= - dev-libs/glib:= - >=dev-libs/icu-55.1:= - >=dev-libs/jsoncpp-0.5.0-r1:= - >=dev-libs/libevent-1.4.13:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= - dev-libs/re2:= - gnome? ( >=gnome-base/gconf-2.24.0:= ) - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/flac:= - media-libs/fontconfig:= - media-libs/freetype:= - >=media-libs/harfbuzz-0.9.41:=[icu(+)] - media-libs/libexif:= - >=media-libs/libjpeg-turbo-1.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.4.0:= - media-libs/speex:= - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) - sys-apps/dbus:= - sys-apps/pciutils:= - >=sys-libs/libcap-2.22:= - sys-libs/zlib:=[minizip] - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:= - x11-libs/gtk+:2= - x11-libs/libdrm - x11-libs/libnotify:= - 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/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - kerberos? ( virtual/krb5 ) - >=net-libs/http-parser-2.6.2:= - >=dev-libs/libuv-1.8.0:= - >=dev-libs/openssl-1.0.2g:0=[-bindist]" -DEPEND="${RDEPEND} - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - dev-perl/JSON - >=dev-util/gperf-3.0.3 - dev-util/ninja - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig" - -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND+=" - x11-misc/xdg-utils - virtual/opengl - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )" - -# Python dependencies. The DEPEND part needs to be kept in sync -# with python_check_deps. -DEPEND+=" $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/jsmin[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] -')" -python_check_deps() { - has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/jsmin[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/ply[${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 - -pkg_pretend() { - if [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then - die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' - fi - - # LTO pass requires more file descriptors - if use lto; then - local lto_n_rlimit_min="16384" - local maxfiles=$(ulimit -n -H) - if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then - eerror "" - eerror "Building with USE=\"lto\" requires file descriptor" \ - "limit to be no less than ${lto_n_rlimit_min}." - eerror "The current limit for portage is ${maxfiles}." - eerror "Please add the following to /etc/security/limits.conf:" - eerror "" - eerror " root hard nofile ${lto_n_rlimit_min}" - eerror " root soft nofile ${lto_n_rlimit_min}" - eerror "" - die - fi - fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - use lto && CHECKREQS_MEMORY="5G" - CHECKREQS_DISK_BUILD="10G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - CHECKREQS_DISK_BUILD="25G" - fi - eshopts_pop - check-reqs_pkg_pretend -} - -pkg_setup() { - # Make sure the build system will use the right python, bug #344367. - python-any-r1_pkg_setup - - chromium_suid_sandbox_check_kernel_config -} - -_unnest_patches() { - local _s="${1%/}/" relpath out - - for f in $(find "${_s}" -mindepth 2 -name *.patch -printf \"%P\"\\n); do - relpath="$(dirname ${f})" - out="${_s}/${relpath////_}_$(basename ${f})" - sed -r -e "s|^([-+]{3}) (.*)$|\1 ${relpath}/\2 ${f}|g" > "${out}" - done -} - -_get_install_suffix() { - local c=(${SLOT//\// }) - local slot=${c[0]} - local suffix - - if [[ "${slot}" == "0" ]]; then - suffix="" - else - suffix="-${slot}" - fi - - echo -n "${suffix}" -} - -_get_install_dir() { - echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)" -} - -src_prepare() { - # Merge Electron code and its submodules into the Chromium source tree - # so that everything can be configured and built in a single pass. - # - rsync -a --ignore-existing "${ELECTRON_S}/" "${S}/" || die - rm -r "${NODE_S}" && - mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die - rm -r "${BRIGHTRAY_S}" && - mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die - rm -r "${NATIVE_MATE_S}" && - mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die - rm -r "${LIBCC_S}" && - mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die - rm -r "${S}/vendor/breakpad" && - ln -s "../breakpad" "${S}/vendor/breakpad" || die - ln -s "${WORKDIR}/${ASAR_P}/node_modules" "${S}/node_modules" || die - - # electron patches - epatch "${FILESDIR}/${P}.patch" - - # node patches - cd "${NODE_S}" || die - epatch "${FILESDIR}/${P}-vendor-node.patch" - epatch "${FILESDIR}/electron-vendor-node-external-snapshots-r0.patch" - # make sure node uses the correct version of v8 - rm -r deps/v8 || die - ln -s ../../../v8 deps/ || die - - # make sure we use python2.* while using gyp - sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die - sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die - sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die - - # brightray patches - cd "${BRIGHTRAY_S}" || die - epatch "${FILESDIR}/${P}-vendor-brightray.patch" - - # libcc patches - cd "${LIBCC_S}" || die - epatch "${FILESDIR}/${P}-vendor-libchromiumcontent.patch" - - # chromium patches - cd "${S}" || die - epatch "${FILESDIR}/chromium-system-ffmpeg-r0.patch" - epatch "${FILESDIR}/chromium-system-jinja-r7.patch" - epatch "${FILESDIR}/chromium-disable-widevine.patch" - epatch "${FILESDIR}/chromium-remove-gardiner-mod-font.patch" - epatch "${FILESDIR}/chromium-shared-v8.patch" - epatch "${FILESDIR}/chromium-lto-fixes.patch" - epatch "${FILESDIR}/chromium-cups-fix.patch" - - # libcc chromium patches - _unnest_patches "${LIBCC_S}/patches" - - EPATCH_SOURCE="${LIBCC_S}/patches" \ - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_EXCLUDE="third_party_icu*" \ - EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \ - epatch - - # build scripts - mkdir -p "${S}/chromiumcontent" || die - cp -a "${LIBCC_S}/chromiumcontent" "${S}/" || die - cp -a "${LIBCC_S}/tools/linux/" "${S}/tools/" || die - - local conditional_bundled_libraries="" - if ! use system-ffmpeg; then - conditional_bundled_libraries+=" third_party/ffmpeg" - fi - - # Remove most bundled libraries. Some are still needed. - build/linux/unbundle/remove_bundled_libraries.py \ - ${conditional_bundled_libraries} \ - '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' \ - 'breakpad/src/third_party/curl' \ - 'chrome/third_party/mozilla_security_manager' \ - 'courgette/third_party' \ - 'crypto/third_party/nss' \ - 'net/third_party/mozilla_security_manager' \ - 'net/third_party/nss' \ - 'third_party/WebKit' \ - 'third_party/analytics' \ - 'third_party/angle' \ - 'third_party/angle/src/third_party/compiler' \ - 'third_party/boringssl' \ - 'third_party/brotli' \ - 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - 'third_party/catapult/tracing/third_party/components/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/tvcm' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party/rcssmin' \ - 'third_party/catapult/tracing/third_party/tvcm/third_party/rjsmin' \ - 'third_party/cld_2' \ - 'third_party/cros_system_api' \ - 'third_party/cython/python_flags.py' \ - 'third_party/devscripts' \ - 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ - 'third_party/fips181' \ - 'third_party/flot' \ - '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/hunspell' \ - 'third_party/iccjpeg' \ - '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/libusb' \ - 'third_party/libvpx_new' \ - 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ - 'third_party/libxml/chromium' \ - 'third_party/libwebm' \ - 'third_party/libyuv' \ - 'third_party/lss' \ - 'third_party/lzma_sdk' \ - 'third_party/mesa' \ - 'third_party/modp_b64' \ - 'third_party/mojo' \ - 'third_party/mt19937ar' \ - 'third_party/npapi' \ - 'third_party/openmax_dl' \ - 'third_party/opus' \ - '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/lcms2-2.6' \ - 'third_party/pdfium/third_party/libjpeg' \ - 'third_party/pdfium/third_party/libopenjpeg20' \ - 'third_party/pdfium/third_party/zlib_v128' \ - 'third_party/polymer' \ - 'third_party/protobuf' \ - 'third_party/qcms' \ - 'third_party/readability' \ - 'third_party/sfntly' \ - 'third_party/skia' \ - 'third_party/smhasher' \ - 'third_party/sqlite' \ - 'third_party/tcmalloc' \ - 'third_party/usrsctp' \ - 'third_party/web-animations-js' \ - 'third_party/webdriver' \ - 'third_party/webrtc' \ - 'third_party/widevine' \ - 'third_party/x86inc' \ - 'third_party/zlib/google' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/fdlibm' \ - 'v8/src/third_party/valgrind' \ - --do-remove || die - - epatch_user -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf+=" -Ddisable_nacl=1" - - # Disable glibc Native Client toolchain, we don't need it (bug #417019). - # myconf+=" -Ddisable_glibc=1" - - # TODO: also build with pnacl - # myconf+=" -Ddisable_pnacl=1" - - # It would be awkward for us to tar the toolchain and get it untarred again - # during the build. - # myconf+=" -Ddisable_newlib_untar=1" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #459932). - # TODO: use_system_libusb (http://crbug.com/266149). - # TODO: use_system_libvpx (http://crbug.com/494939). - # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) - -Duse_system_flac=1 - -Duse_system_harfbuzz=1 - -Duse_system_icu=1 - -Duse_system_jsoncpp=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_libxslt=1 - -Duse_system_minizip=1 - -Duse_system_nspr=1 - -Duse_system_re2=1 - -Duse_system_snappy=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Needed for system icu - we don't need additional data files. - myconf+=" -Dicu_use_data_file_flag=0" - - # TODO: patch gyp so that this arm conditional is not needed. - if ! use arm; then - myconf+=" - -Duse_system_yasm=1" - fi - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use hidpi enable_hidpi) - $(gyp_use kerberos) - $(gyp_use lto) - $(gyp_use pulseaudio) - $(gyp_use tcmalloc use_allocator tcmalloc none)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1 - -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlibspeechd_h_prefix=speech-dispatcher/" - - # TODO: use the file at run time instead of effectively compiling it in. - myconf+=" - -Dusb_ids_path=/usr/share/misc/usb.ids" - - # Save space by removing DLOG and DCHECK messages (about 6% reduction). - myconf+=" - -Dlogging_like_official_build=1" - - if [[ $(tc-getCC) == *clang* ]]; then - myconf+=" -Dclang=1" - else - myconf+=" -Dclang=0" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - myconf+=" - -Dclang_use_chrome_plugins=0 - -Dhost_clang=0 - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0" - - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_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. - myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com - -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - target_arch=x64 - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - target_arch=ia32 - ffmpeg_target_arch=ia32 - elif [[ $myarch = arm ]] ; then - target_arch=arm - ffmpeg_target_arch=$(usex neon arm-neon arm) - # TODO: re-enable NaCl (NativeClient). - local CTARGET=${CTARGET:-${CHOST}} - if [[ $(tc-is-softfloat) == "no" ]]; then - - myconf+=" -Darm_float_abi=hard" - fi - filter-flags "-mfpu=*" - use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" - - if [[ ${CTARGET} == armv[78]* ]]; then - myconf+=" -Darmv7=1" - else - myconf+=" -Darmv7=0" - fi - myconf+=" -Dsysroot= - $(gyp_use neon arm_neon) - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - myconf+=" -Dtarget_arch=${target_arch}" - - # 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+=" -Dwerror=" - - # Disable fatal linker warnings, bug 506268. - myconf+=" -Ddisable_fatal_linker_warnings=1" - - # 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 - - # Tools for building programs to be executed on the build system, bug #410883. - if tc-is-cross-compiler; then - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export NM_host=$(tc-getBUILD_NM) - fi - - # 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_gyp.py || die - popd > /dev/null || die - fi - - third_party/libaddressinput/chromium/tools/update-strings.py || die - - einfo "Configuring bundled nodejs..." - pushd vendor/node > /dev/null || die - # Make sure gyp_node does not run - echo '#!/usr/bin/env python' > tools/gyp_node.py || die - # --shared-libuv cannot be used as electron's node fork - # patches uv_loop structure. - ./configure --shared-openssl --shared-http-parser \ - --shared-zlib --without-npm --with-intl=system-icu \ - --without-dtrace --dest-cpu=${target_arch} \ - --prefix="" || die - popd > /dev/null || die - - # libchromiumcontent configuration - myconf+=" -Dcomponent=static_library" - myconf+=" -Dmac_mas_build=0" - myconf+=' -Dicu_small="false"' - myconf+=" -Dlibchromiumcontent_component=0" - myconf+=" -Dlibrary=static_library" - myconf+=" -Dmas_build=0" - - einfo "Configuring electron..." - build/linux/unbundle/replace_gyp_files.py ${myconf} || die - - myconf+=" -Ivendor/node/config.gypi - -Icommon.gypi - atom.gyp" - - egyp_chromium ${myconf} || die -} - -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - -src_compile() { - local ninja_targets="electron" compile_target="out/R" - - eninja -C ${compile_target} mksnapshot || die - pax-mark -m ${compile_target}/mksnapshot - - eninja -C ${compile_target} nodebin || die - pax-mark -m ${compile_target}/nodebin - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C ${compile_target} ${ninja_targets} || die -} - -src_install() { - local install_dir="$(_get_install_dir)" - local install_suffix="$(_get_install_suffix)" - local LIBDIR="${ED}/usr/$(get_libdir)" - - pushd out/R/locales > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - # Install Electron - insinto "${install_dir}" - exeinto "${install_dir}" - newexe out/R/nodebin node - doexe out/R/electron - doins out/R/libv8.so - doins out/R/libnode.so - fperms +x "${install_dir}/libv8.so" "${install_dir}/libnode.so" - doins out/R/content_shell.pak - doins out/R/natives_blob.bin - doins out/R/snapshot_blob.bin - rm -r out/R/resources/inspector || die - doins -r out/R/resources - doins -r out/R/locales - dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}" - - # Install Node headers - HEADERS_ONLY=1 \ - "${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die - # set up a symlink structure that npm expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - dodir "/usr/include/electron${install_suffix}" - mv "${ED}/usr/include/node" \ - "${ED}/usr/include/electron${install_suffix}/node" || die -} - -pkg_postinst() { - eselect electron update -} - -pkg_prerm() { - eselect electron update -} diff --git a/dev-util/electron/electron-0.37.8-r2.ebuild b/dev-util/electron/electron-0.37.8-r2.ebuild deleted file mode 100644 index d4bf4ae0d2f4..000000000000 --- a/dev-util/electron/electron-0.37.8-r2.ebuild +++ /dev/null @@ -1,750 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -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 flag-o-matic multilib multiprocessing \ - pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs \ - versionator virtualx - -# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION -CHROMIUM_VERSION="49.0.2623.75" -# Keep this in sync with vendor/brightray -BRIGHTRAY_COMMIT="8dbaeed37b9c4fb8ae985670b142f659bb265fb4" -# Keep this in sync with vendor/node -NODE_COMMIT="6bcd8af891a991f8aa196e49e6bf908ebbe24cae" -# Keep this in sync with vendor/native_mate -NATIVE_MATE_COMMIT="0df2d882ea2286e6335f206b7002037fce66c4a5" -# Keep this in sync with vendor/brightray/vendor/libchromiumcontent -LIBCHROMIUMCONTENT_COMMIT="60c7ec9f9bf465a8c9c7ccc3fcd2aa1cdf644bac" -# Keep this in sync with package.json#devDependencies -ASAR_VERSION="0.12.1" - -CHROMIUM_P="chromium-${CHROMIUM_VERSION}" -BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}" -NODE_P="node-${NODE_COMMIT}" -NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}" -LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}" -ASAR_P="asar-${ASAR_VERSION}" - -DESCRIPTION="Cross platform application development framework based on web technologies" -HOMEPAGE="https://electron.atom.io/" -SRC_URI=" - https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz - https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> ${BRIGHTRAY_P}.tar.gz - https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz - https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> ${NATIVE_MATE_P}.tar.gz - https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> ${LIBCHROMIUMCONTENT_P}.tar.gz - https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz -" - -S="${WORKDIR}/${CHROMIUM_P}" -ELECTRON_S="${WORKDIR}/${P}" -NODE_S="${S}/vendor/node" -BRIGHTRAY_S="${S}/vendor/brightray" -NATIVE_MATE_S="${S}/vendor/native_mate" -LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent" - -LICENSE="BSD" -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~amd64" -IUSE="custom-cflags cups debug gnome gnome-keyring hidpi kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" - -# Native Client binaries are compiled with different set of flags, bug #452066. -QA_FLAGS_IGNORED=".*\.nexe" - -# Native Client binaries may be stripped by the build system, which uses the -# right tools for it, bug #469144 . -QA_PRESTRIPPED=".*\.nexe" - -RDEPEND="!<dev-util/electron-0.36.12-r4 - >=app-accessibility/speech-dispatcher-0.8:= - app-arch/bzip2:= - app-arch/snappy:= - >=app-eselect/eselect-electron-1.0.0 - cups? ( >=net-print/cups-1.3.11:= ) - >=dev-libs/elfutils-0.149 - dev-libs/expat:= - dev-libs/glib:= - >=dev-libs/icu-55.1:= - >=dev-libs/jsoncpp-0.5.0-r1:= - >=dev-libs/libevent-1.4.13:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= - dev-libs/re2:= - gnome? ( >=gnome-base/gconf-2.24.0:= ) - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/flac:= - media-libs/fontconfig:= - media-libs/freetype:= - >=media-libs/harfbuzz-0.9.41:=[icu(+)] - media-libs/libexif:= - >=media-libs/libjpeg-turbo-1.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.4.0:= - media-libs/speex:= - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) - sys-apps/dbus:= - sys-apps/pciutils:= - >=sys-libs/libcap-2.22:= - sys-libs/zlib:=[minizip] - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:= - x11-libs/gtk+:2= - x11-libs/libdrm - x11-libs/libnotify:= - 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/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - kerberos? ( virtual/krb5 ) - >=net-libs/http-parser-2.6.2:= - >=dev-libs/openssl-1.0.2g:0=[-bindist]" -DEPEND="${RDEPEND} - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - dev-perl/JSON - >=dev-util/gperf-3.0.3 - dev-util/ninja - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig" - -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND+=" - x11-misc/xdg-utils - virtual/opengl - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )" - -# Python dependencies. The DEPEND part needs to be kept in sync -# with python_check_deps. -DEPEND+=" $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/jinja[${PYTHON_USEDEP}] - dev-python/jsmin[${PYTHON_USEDEP}] - dev-python/ply[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] -')" -python_check_deps() { - has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/beautifulsoup:4[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/jinja[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/jsmin[${PYTHON_USEDEP}]" && - has_version --host-root "dev-python/ply[${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 - -pkg_pretend() { - if [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then - die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' - fi - - # LTO pass requires more file descriptors - if use lto; then - local lto_n_rlimit_min="16384" - local maxfiles=$(ulimit -n -H) - if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then - eerror "" - eerror "Building with USE=\"lto\" requires file descriptor" \ - "limit to be no less than ${lto_n_rlimit_min}." - eerror "The current limit for portage is ${maxfiles}." - eerror "Please add the following to /etc/security/limits.conf:" - eerror "" - eerror " root hard nofile ${lto_n_rlimit_min}" - eerror " root soft nofile ${lto_n_rlimit_min}" - eerror "" - die - fi - fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - use lto && CHECKREQS_MEMORY="5G" - CHECKREQS_DISK_BUILD="10G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - CHECKREQS_DISK_BUILD="25G" - fi - eshopts_pop - check-reqs_pkg_pretend -} - -pkg_setup() { - # Make sure the build system will use the right python, bug #344367. - python-any-r1_pkg_setup - - chromium_suid_sandbox_check_kernel_config -} - -_unnest_patches() { - local _s="${1%/}/" relpath out - - for f in $(find "${_s}" -mindepth 2 -name *.patch -printf \"%P\"\\n); do - relpath="$(dirname ${f})" - out="${_s}/${relpath////_}_$(basename ${f})" - sed -r -e "s|^([-+]{3}) (.*)$|\1 ${relpath}/\2 ${f}|g" > "${out}" - done -} - -_get_install_suffix() { - local c=(${SLOT//\// }) - local slot=${c[0]} - local suffix - - if [[ "${slot}" == "0" ]]; then - suffix="" - else - suffix="-${slot}" - fi - - echo -n "${suffix}" -} - -_get_install_dir() { - echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)" -} - -src_prepare() { - # Merge Electron code and its submodules into the Chromium source tree - # so that everything can be configured and built in a single pass. - # - rsync -a --ignore-existing "${ELECTRON_S}/" "${S}/" || die - rm -r "${NODE_S}" && - mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die - rm -r "${BRIGHTRAY_S}" && - mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die - rm -r "${NATIVE_MATE_S}" && - mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die - rm -r "${LIBCC_S}" && - mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die - rm -r "${S}/vendor/breakpad" && - ln -s "../breakpad" "${S}/vendor/breakpad" || die - ln -s "${WORKDIR}/${ASAR_P}/node_modules" "${S}/node_modules" || die - - # electron patches - epatch "${FILESDIR}/${P}.patch" - - # node patches - cd "${NODE_S}" || die - epatch "${FILESDIR}/${P}-vendor-node.patch" - epatch "${FILESDIR}/electron-vendor-node-external-snapshots-r0.patch" - # make sure node uses the correct version of v8 - rm -r deps/v8 || die - ln -s ../../../v8 deps/ || die - - # make sure we use python2.* while using gyp - sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die - sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die - sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die - - # brightray patches - cd "${BRIGHTRAY_S}" || die - epatch "${FILESDIR}/${P}-vendor-brightray.patch" - - # libcc patches - cd "${LIBCC_S}" || die - epatch "${FILESDIR}/${P}-vendor-libchromiumcontent.patch" - - # chromium patches - cd "${S}" || die - epatch "${FILESDIR}/chromium-system-ffmpeg-r2.patch" - epatch "${FILESDIR}/chromium-system-jinja-r7.patch" - epatch "${FILESDIR}/chromium-disable-widevine.patch" - epatch "${FILESDIR}/chromium-last-commit-position-r0.patch" - epatch "${FILESDIR}/chromium-snapshot-toolchain-r1.patch" - epatch "${FILESDIR}/chromium-remove-gardiner-mod-font.patch" - epatch "${FILESDIR}/chromium-shared-v8.patch" - epatch "${FILESDIR}/chromium-lto-fixes.patch" - epatch "${FILESDIR}/chromium-icu-58-r0.patch" - epatch "${FILESDIR}/chromium-cups-fix.patch" - - # libcc chromium patches - _unnest_patches "${LIBCC_S}/patches" - - EPATCH_SOURCE="${LIBCC_S}/patches" \ - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_EXCLUDE="third_party_icu*" \ - EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \ - epatch - - # build scripts - mkdir -p "${S}/chromiumcontent" || die - cp -a "${LIBCC_S}/chromiumcontent" "${S}/" || die - cp -a "${LIBCC_S}/tools/linux/" "${S}/tools/" || die - - local conditional_bundled_libraries="" - if ! use system-ffmpeg; then - conditional_bundled_libraries+=" third_party/ffmpeg" - fi - - # Remove most bundled libraries. Some are still needed. - build/linux/unbundle/remove_bundled_libraries.py \ - ${conditional_bundled_libraries} \ - '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' \ - 'breakpad/src/third_party/curl' \ - 'chrome/third_party/mozilla_security_manager' \ - 'courgette/third_party' \ - 'crypto/third_party/nss' \ - 'net/third_party/mozilla_security_manager' \ - 'net/third_party/nss' \ - 'third_party/WebKit' \ - 'third_party/analytics' \ - 'third_party/angle' \ - 'third_party/angle/src/third_party/compiler' \ - 'third_party/angle/src/third_party/murmurhash' \ - 'third_party/angle/src/third_party/trace_event' \ - 'third_party/boringssl' \ - 'third_party/brotli' \ - 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - 'third_party/catapult/third_party/py_vulcanize' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ - 'third_party/catapult/tracing/third_party/components/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/cld_2' \ - 'third_party/cros_system_api' \ - 'third_party/cython/python_flags.py' \ - 'third_party/devscripts' \ - 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ - 'third_party/fips181' \ - 'third_party/flot' \ - '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/hunspell' \ - 'third_party/iccjpeg' \ - '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/libusb' \ - 'third_party/libvpx_new' \ - 'third_party/libvpx_new/source/libvpx/third_party/x86inc' \ - 'third_party/libxml/chromium' \ - 'third_party/libwebm' \ - 'third_party/libyuv' \ - 'third_party/lss' \ - 'third_party/lzma_sdk' \ - 'third_party/mesa' \ - 'third_party/modp_b64' \ - 'third_party/mojo' \ - 'third_party/mt19937ar' \ - 'third_party/npapi' \ - 'third_party/openmax_dl' \ - 'third_party/opus' \ - '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/lcms2-2.6' \ - 'third_party/pdfium/third_party/libjpeg' \ - 'third_party/pdfium/third_party/libopenjpeg20' \ - 'third_party/pdfium/third_party/zlib_v128' \ - 'third_party/polymer' \ - 'third_party/protobuf' \ - 'third_party/qcms' \ - 'third_party/re2' \ - 'third_party/sfntly' \ - 'third_party/skia' \ - 'third_party/smhasher' \ - 'third_party/sqlite' \ - 'third_party/tcmalloc' \ - 'third_party/usrsctp' \ - 'third_party/web-animations-js' \ - 'third_party/webdriver' \ - 'third_party/webrtc' \ - 'third_party/widevine' \ - 'third_party/woff2' \ - 'third_party/x86inc' \ - 'third_party/zlib/google' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/fdlibm' \ - 'v8/src/third_party/valgrind' \ - --do-remove || die - - epatch_user -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf+=" -Ddisable_nacl=1" - - # Disable glibc Native Client toolchain, we don't need it (bug #417019). - # myconf+=" -Ddisable_glibc=1" - - # TODO: also build with pnacl - # myconf+=" -Ddisable_pnacl=1" - - # It would be awkward for us to tar the toolchain and get it untarred again - # during the build. - # myconf+=" -Ddisable_newlib_untar=1" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #459932). - # TODO: use_system_libusb (http://crbug.com/266149). - # TODO: use_system_libvpx (http://crbug.com/494939). - # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) - -Duse_system_flac=1 - -Duse_system_harfbuzz=1 - -Duse_system_icu=1 - -Duse_system_jsoncpp=1 - -Duse_system_libevent=1 - -Duse_system_libjpeg=1 - -Duse_system_libpng=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_libxslt=1 - -Duse_system_minizip=1 - -Duse_system_nspr=1 - -Duse_system_snappy=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Needed for system icu - we don't need additional data files. - myconf+=" -Dicu_use_data_file_flag=0" - - # TODO: patch gyp so that this arm conditional is not needed. - if ! use arm; then - myconf+=" - -Duse_system_yasm=1" - fi - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use hidpi enable_hidpi) - $(gyp_use kerberos) - $(gyp_use lto) - $(gyp_use pulseaudio) - $(gyp_use tcmalloc use_allocator tcmalloc none)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1 - -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlibspeechd_h_prefix=speech-dispatcher/" - - # TODO: use the file at run time instead of effectively compiling it in. - myconf+=" - -Dusb_ids_path=/usr/share/misc/usb.ids" - - # Save space by removing DLOG and DCHECK messages (about 6% reduction). - myconf+=" - -Dlogging_like_official_build=1" - - if [[ $(tc-getCC) == *clang* ]]; then - myconf+=" -Dclang=1" - else - myconf+=" -Dclang=0" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - myconf+=" - -Dclang_use_chrome_plugins=0 - -Dhost_clang=0 - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0 - -Dsysroot=" - - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_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. - myconf+=" -Dgoogle_api_key=AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc - -Dgoogle_default_client_id=329227923882.apps.googleusercontent.com - -Dgoogle_default_client_secret=vgKG0NNv7GoDpbtoFNLxCUXu" - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - target_arch=x64 - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - target_arch=ia32 - ffmpeg_target_arch=ia32 - elif [[ $myarch = arm ]] ; then - target_arch=arm - ffmpeg_target_arch=$(usex neon arm-neon arm) - # TODO: re-enable NaCl (NativeClient). - local CTARGET=${CTARGET:-${CHOST}} - if [[ $(tc-is-softfloat) == "no" ]]; then - - myconf+=" -Darm_float_abi=hard" - fi - filter-flags "-mfpu=*" - use neon || myconf+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" - - if [[ ${CTARGET} == armv[78]* ]]; then - myconf+=" -Darmv7=1" - else - myconf+=" -Darmv7=0" - fi - myconf+=" -Dsysroot= - $(gyp_use neon arm_neon) - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - myconf+=" -Dtarget_arch=${target_arch}" - - # 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+=" -Dwerror=" - - # Disable fatal linker warnings, bug 506268. - myconf+=" -Ddisable_fatal_linker_warnings=1" - - # 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 - - # Tools for building programs to be executed on the build system, bug #410883. - if tc-is-cross-compiler; then - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export NM_host=$(tc-getBUILD_NM) - fi - - # 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_gyp.py || die - popd > /dev/null || die - fi - - third_party/libaddressinput/chromium/tools/update-strings.py || die - - touch chrome/test/data/webui/i18n_process_css_test.html || die - - einfo "Configuring bundled nodejs..." - pushd vendor/node > /dev/null || die - # Make sure gyp_node does not run - echo '#!/usr/bin/env python' > tools/gyp_node.py || die - # --shared-libuv cannot be used as electron's node fork - # patches uv_loop structure. - ./configure --shared-openssl --shared-http-parser \ - --shared-zlib --without-npm --with-intl=system-icu \ - --without-dtrace --dest-cpu=${target_arch} \ - --prefix="" || die - popd > /dev/null || die - - # libchromiumcontent configuration - myconf+=" -Dcomponent=static_library" - myconf+=" -Dmac_mas_build=0" - myconf+=' -Dicu_small="false"' - myconf+=" -Dlibchromiumcontent_component=0" - myconf+=" -Dlibrary=static_library" - myconf+=" -Dmas_build=0" - - einfo "Configuring electron..." - build/linux/unbundle/replace_gyp_files.py ${myconf} || die - - myconf+=" -Ivendor/node/config.gypi - -Icommon.gypi - electron.gyp" - - egyp_chromium ${myconf} || die -} - -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - -src_compile() { - local ninja_targets="electron" compile_target="out/R" - - eninja -C ${compile_target} mksnapshot || die - pax-mark -m ${compile_target}/mksnapshot - - eninja -C ${compile_target} nodebin || die - pax-mark -m ${compile_target}/nodebin - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C ${compile_target} ${ninja_targets} || die -} - -src_install() { - local install_dir="$(_get_install_dir)" - local install_suffix="$(_get_install_suffix)" - local LIBDIR="${ED}/usr/$(get_libdir)" - - pushd out/R/locales > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - # Install Electron - insinto "${install_dir}" - exeinto "${install_dir}" - newexe out/R/nodebin node - doexe out/R/electron - doins out/R/libv8.so - doins out/R/libnode.so - fperms +x "${install_dir}/libv8.so" "${install_dir}/libnode.so" - doins out/R/content_shell.pak - doins out/R/natives_blob.bin - doins out/R/snapshot_blob.bin - rm -r out/R/resources/inspector || die - doins -r out/R/resources - doins -r out/R/locales - dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}" - - pax-mark -rm "${ED}/${install_dir}/electron" - - # Install Node headers - HEADERS_ONLY=1 \ - "${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die - # set up a symlink structure that npm expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - dodir "/usr/include/electron${install_suffix}" - mv "${ED}/usr/include/node" \ - "${ED}/usr/include/electron${install_suffix}/node" || die -} - -pkg_postinst() { - eselect electron update -} - -pkg_prerm() { - eselect electron update -} diff --git a/dev-util/electron/electron-1.3.13-r1.ebuild b/dev-util/electron/electron-1.3.13-r1.ebuild deleted file mode 100644 index c00fd0f61608..000000000000 --- a/dev-util/electron/electron-1.3.13-r1.ebuild +++ /dev/null @@ -1,763 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -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 \ - multiprocessing pax-utils portability python-any-r1 readme.gentoo-r1 \ - toolchain-funcs versionator virtualx xdg-utils - -# Keep this in sync with vendor/brightray/vendor/libchromiumcontent/VERSION -CHROMIUM_VERSION="52.0.2743.82" -# Keep this in sync with vendor/brightray -BRIGHTRAY_COMMIT="ee26c5218eeec199c54c92a7517a72d2dbd0adbf" -# Keep this in sync with vendor/node -NODE_COMMIT="c47e9bf9011de682d07c82f7f610a467f30cca60" -# Keep this in sync with vendor/native_mate -NATIVE_MATE_COMMIT="b5e5de626c6a57e44c7e6448d8bbaaac475d493c" -# Keep this in sync with vendor/brightray/vendor/libchromiumcontent -LIBCHROMIUMCONTENT_COMMIT="27add4cfef98f21d5910539bebb47ae175f024c2" -# Keep this in sync with package.json#devDependencies -ASAR_VERSION="0.12.1" - -CHROMIUM_P="chromium-${CHROMIUM_VERSION}" -BRIGHTRAY_P="brightray-${BRIGHTRAY_COMMIT}" -NODE_P="node-${NODE_COMMIT}" -NATIVE_MATE_P="native-mate-${NATIVE_MATE_COMMIT}" -LIBCHROMIUMCONTENT_P="libchromiumcontent-${LIBCHROMIUMCONTENT_COMMIT}" -ASAR_P="asar-${ASAR_VERSION}" - -DESCRIPTION="Cross platform application development framework based on web technologies" -HOMEPAGE="https://electron.atom.io/" -SRC_URI=" - https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz - https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/electron/brightray/archive/${BRIGHTRAY_COMMIT}.tar.gz -> ${BRIGHTRAY_P}.tar.gz - https://github.com/electron/node/archive/${NODE_COMMIT}.tar.gz -> electron-${NODE_P}.tar.gz - https://github.com/zcbenz/native-mate/archive/${NATIVE_MATE_COMMIT}.tar.gz -> ${NATIVE_MATE_P}.tar.gz - https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> ${LIBCHROMIUMCONTENT_P}.tar.gz - https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz -" - -S="${WORKDIR}/${CHROMIUM_P}" -ELECTRON_S="${WORKDIR}/${P}" -NODE_S="${S}/vendor/node" -BRIGHTRAY_S="${S}/vendor/brightray" -NATIVE_MATE_S="${S}/vendor/native_mate" -LIBCC_S="${BRIGHTRAY_S}/vendor/libchromiumcontent" - -LICENSE="BSD" -SLOT="$(get_version_component_range 1-2)" -KEYWORDS="~amd64" -IUSE="custom-cflags cups gnome gnome-keyring hidpi kerberos lto neon pic +proprietary-codecs pulseaudio selinux +system-ffmpeg +tcmalloc" -RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )" - -# Native Client binaries are compiled with different set of flags, bug #452066. -QA_FLAGS_IGNORED=".*\.nexe" - -# Native Client binaries may be stripped by the build system, which uses the -# right tools for it, bug #469144 . -QA_PRESTRIPPED=".*\.nexe" - -RDEPEND="!<dev-util/electron-0.36.12-r4 - >=app-accessibility/speech-dispatcher-0.8:= - app-arch/bzip2:= - app-arch/snappy:= - >=app-eselect/eselect-electron-1.0.0 - cups? ( >=net-print/cups-1.3.11:= ) - >=dev-libs/elfutils-0.149 - dev-libs/expat:= - dev-libs/glib:= - >=dev-libs/icu-55.1:= - >=dev-libs/jsoncpp-0.5.0-r1:= - >=dev-libs/libevent-1.4.13:= - dev-libs/libxml2:=[icu] - dev-libs/libxslt:= - dev-libs/nspr:= - >=dev-libs/nss-3.14.3:= - dev-libs/re2:= - gnome? ( >=gnome-base/gconf-2.24.0:= ) - gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) - >=media-libs/alsa-lib-1.0.19:= - media-libs/flac:= - media-libs/fontconfig:= - media-libs/freetype:= - >=media-libs/harfbuzz-0.9.41:=[icu(+)] - media-libs/libexif:= - >=media-libs/libjpeg-turbo-1.2.0-r1:= - media-libs/libpng:0= - >=media-libs/libwebp-0.4.0:= - media-libs/speex:= - pulseaudio? ( media-sound/pulseaudio:= ) - system-ffmpeg? ( >=media-video/ffmpeg-2.7.2:=[opus,vorbis,vpx] ) - sys-apps/dbus:= - sys-apps/pciutils:= - >=sys-libs/libcap-2.22:= - sys-libs/zlib:=[minizip] - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:= - x11-libs/gtk+:2= - x11-libs/libdrm - x11-libs/libnotify:= - 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/libXinerama:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXScrnSaver:= - x11-libs/libXtst:= - x11-libs/pango:= - kerberos? ( virtual/krb5 ) - >=net-libs/http-parser-2.6.2:= - >=dev-libs/libuv-1.8.0:= - >=dev-libs/openssl-1.0.2g:0=[-bindist]" -DEPEND="${RDEPEND} - !arm? ( - dev-lang/yasm - ) - dev-lang/perl - dev-perl/JSON - >=dev-util/gperf-3.0.3 - dev-util/ninja - sys-apps/hwids[usb(+)] - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig" - -# For nvidia-drivers blocker, see bug #413637 . -RDEPEND+=" - x11-misc/xdg-utils - virtual/opengl - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )" - -# Python dependencies. The DEPEND part needs to be kept in sync -# with python_check_deps. -DEPEND+=" $(python_gen_any_dep ' - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - dev-python/beautifulsoup:4[${PYTHON_USEDEP}] - dev-python/html5lib[${PYTHON_USEDEP}] - dev-python/jsmin[${PYTHON_USEDEP}] - dev-python/simplejson[${PYTHON_USEDEP}] -')" -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/jsmin[${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 - -pkg_pretend() { - if [[ $(tc-getCC)$ == *gcc* ]] && \ - [[ $(gcc-major-version)$(gcc-minor-version) -lt 48 ]]; then - die 'At least gcc 4.8 is required, see bugs: #535730, #525374, #518668.' - fi - - # LTO pass requires more file descriptors - if use lto; then - local lto_n_rlimit_min="16384" - local maxfiles=$(ulimit -n -H) - if [ "${maxfiles}" -lt "${lto_n_rlimit_min}" ]; then - eerror "" - eerror "Building with USE=\"lto\" requires file descriptor" \ - "limit to be no less than ${lto_n_rlimit_min}." - eerror "The current limit for portage is ${maxfiles}." - eerror "Please add the following to /etc/security/limits.conf:" - eerror "" - eerror " root hard nofile ${lto_n_rlimit_min}" - eerror " root soft nofile ${lto_n_rlimit_min}" - eerror "" - die - fi - fi - - # Check build requirements, bug #541816 and bug #471810 . - CHECKREQS_MEMORY="3G" - use lto && CHECKREQS_MEMORY="5G" - CHECKREQS_DISK_BUILD="10G" - eshopts_push -s extglob - if is-flagq '-g?(gdb)?([1-9])'; then - CHECKREQS_DISK_BUILD="25G" - fi - eshopts_pop - check-reqs_pkg_pretend -} - -pkg_setup() { - # Make sure the build system will use the right python, bug #344367. - python-any-r1_pkg_setup - - chromium_suid_sandbox_check_kernel_config -} - -_unnest_patches() { - local _s="${1%/}/" relpath out - - for f in $(find "${_s}" -mindepth 2 -name *.patch -printf \"%P\"\\n); do - relpath="$(dirname ${f})" - out="${_s}/${relpath////_}_$(basename ${f})" - sed -r -e "s|^([-+]{3}) (.*)$|\1 ${relpath}/\2 ${f}|g" > "${out}" - done -} - -_get_install_suffix() { - local c=(${SLOT//\// }) - local slot=${c[0]} - local suffix - - if [[ "${slot}" == "0" ]]; then - suffix="" - else - suffix="-${slot}" - fi - - echo -n "${suffix}" -} - -_get_install_dir() { - echo -n "/usr/$(get_libdir)/electron$(_get_install_suffix)" -} - -src_prepare() { - # Merge Electron code and its submodules into the Chromium source tree - # so that everything can be configured and built in a single pass. - # - rsync -a --ignore-existing "${ELECTRON_S}/" "${S}/" || die - rm -r "${NODE_S}" && - mv "${WORKDIR}/${NODE_P}" "${NODE_S}" || die - rm -r "${BRIGHTRAY_S}" && - mv "${WORKDIR}/${BRIGHTRAY_P}" "${BRIGHTRAY_S}" || die - rm -r "${NATIVE_MATE_S}" && - mv "${WORKDIR}/${NATIVE_MATE_P}" "${NATIVE_MATE_S}" || die - rm -r "${LIBCC_S}" && - mv "${WORKDIR}/${LIBCHROMIUMCONTENT_P}" "${LIBCC_S}" || die - rm -r "${S}/vendor/breakpad" && - ln -s "../breakpad" "${S}/vendor/breakpad" || die - ln -s "${WORKDIR}/${ASAR_P}/node_modules" "${S}/node_modules" || die - - # electron patches - epatch "${FILESDIR}/${PN}-1.3.6.patch" - - # node patches - cd "${NODE_S}" || die - epatch "${FILESDIR}/${P}-vendor-node.patch" - epatch "${FILESDIR}/electron-vendor-node-external-snapshots-r0.patch" - # make sure node uses the correct version of v8 - rm -r deps/v8 || die - ln -s ../../../v8 deps/ || die - - # make sure we use python2.* while using gyp - sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die - sed -i -e "s/|| 'python'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die - - # less verbose install output (stating the same as portage, basically) - sed -i -e "/print/d" tools/install.py || die - - # proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504 - local LIBDIR=$(get_libdir) - sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die - sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die - sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die - - # brightray patches - cd "${BRIGHTRAY_S}" || die - epatch "${FILESDIR}/${PN}-1.3.6-vendor-brightray.patch" - - # libcc patches - cd "${LIBCC_S}" || die - epatch "${FILESDIR}/${PN}-1.3.6-vendor-libchromiumcontent.patch" - - # chromium patches - cd "${S}" || die - epatch "${FILESDIR}/chromium-system-ffmpeg-r2.patch" - epatch "${FILESDIR}/chromium-disable-widevine.patch" - epatch "${FILESDIR}/chromium-last-commit-position-r0.patch" - epatch "${FILESDIR}/chromium-snapshot-toolchain-r1.patch" - epatch "${FILESDIR}/chromium-remove-gardiner-mod-font.patch" - epatch "${FILESDIR}/chromium-pdfium-r0.patch" - epatch "${FILESDIR}/chromium-system-zlib-r0.patch" - epatch "${FILESDIR}/chromium-linker-warnings-r0.patch" - epatch "${FILESDIR}/chromium-ffmpeg-license-r0.patch" - epatch "${FILESDIR}/chromium-shared-v8-r1.patch" - epatch "${FILESDIR}/chromium-lto-fixes-r1.patch" - epatch "${FILESDIR}/chromium-icu-58-r1.patch" - epatch "${FILESDIR}/chromium-cups-fix.patch" - # libcc chromium patches - _unnest_patches "${LIBCC_S}/patches" - - EPATCH_SOURCE="${LIBCC_S}/patches" \ - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_EXCLUDE="third_party_icu*" \ - EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \ - epatch - - # build scripts - mkdir -p "${S}/chromiumcontent" || die - cp -a "${LIBCC_S}/chromiumcontent" "${S}/" || die - cp -a "${LIBCC_S}/tools/linux/" "${S}/tools/" || die - - local conditional_bundled_libraries="" - if ! use system-ffmpeg; then - conditional_bundled_libraries+=" third_party/ffmpeg" - fi - - # Remove most bundled libraries. Some are still needed. - build/linux/unbundle/remove_bundled_libraries.py \ - ${conditional_bundled_libraries} \ - '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' \ - 'breakpad/src/third_party/curl' \ - 'breakpad/src/third_party/musl' \ - '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/third_party/compiler' \ - 'third_party/angle/src/third_party/libXNVCtrl' \ - 'third_party/angle/src/third_party/murmurhash' \ - 'third_party/angle/src/third_party/trace_event' \ - 'third_party/boringssl' \ - 'third_party/brotli' \ - 'third_party/cacheinvalidation' \ - 'third_party/catapult' \ - 'third_party/catapult/third_party/py_vulcanize' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rcssmin' \ - 'third_party/catapult/third_party/py_vulcanize/third_party/rjsmin' \ - 'third_party/catapult/tracing/third_party/components/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/cld_2' \ - 'third_party/cros_system_api' \ - 'third_party/cython/python_flags.py' \ - 'third_party/devscripts' \ - 'third_party/dom_distiller_js' \ - 'third_party/dom_distiller_js/dist/proto_gen/third_party/dom_distiller_js' \ - 'third_party/fips181' \ - 'third_party/flot' \ - '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/hunspell' \ - 'third_party/iccjpeg' \ - 'third_party/jinja2' \ - 'third_party/jstemplate' \ - 'third_party/khronos' \ - 'third_party/leveldatabase' \ - 'third_party/libXNVCtrl' \ - 'third_party/libaddressinput' \ - 'third_party/libjingle' \ - 'third_party/libjpeg_turbo' \ - 'third_party/libphonenumber' \ - 'third_party/libpng' \ - 'third_party/libsecret' \ - 'third_party/libsrtp' \ - 'third_party/libudev' \ - 'third_party/libusb' \ - 'third_party/libvpx' \ - 'third_party/libvpx/source/libvpx/third_party/x86inc' \ - '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/openh264' \ - 'third_party/openmax_dl' \ - 'third_party/opus' \ - '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/lcms2-2.6' \ - 'third_party/pdfium/third_party/libjpeg' \ - 'third_party/pdfium/third_party/libopenjpeg20' \ - 'third_party/pdfium/third_party/libpng16' \ - 'third_party/pdfium/third_party/libtiff' \ - 'third_party/pdfium/third_party/zlib_v128' \ - 'third_party/ply' \ - 'third_party/polymer' \ - 'third_party/protobuf' \ - 'third_party/protobuf/third_party/six' \ - 'third_party/qcms' \ - 'third_party/re2' \ - 'third_party/sfntly' \ - 'third_party/skia' \ - 'third_party/smhasher' \ - 'third_party/sqlite' \ - 'third_party/tcmalloc' \ - 'third_party/usrsctp' \ - 'third_party/web-animations-js' \ - 'third_party/webdriver' \ - 'third_party/webrtc' \ - 'third_party/widevine' \ - 'third_party/woff2' \ - 'third_party/x86inc' \ - 'third_party/zlib/google' \ - 'url/third_party/mozilla' \ - 'v8/src/third_party/fdlibm' \ - 'v8/src/third_party/valgrind' \ - --do-remove || die - - epatch_user -} - -src_configure() { - local myconf="" - - # Never tell the build system to "enable" SSE2, it has a few unexpected - # additions, bug #336871. - myconf+=" -Ddisable_sse2=1" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf+=" -Ddisable_nacl=1" - - # Disable glibc Native Client toolchain, we don't need it (bug #417019). - # myconf+=" -Ddisable_glibc=1" - - # TODO: also build with pnacl - # myconf+=" -Ddisable_pnacl=1" - - # It would be awkward for us to tar the toolchain and get it untarred again - # during the build. - # myconf+=" -Ddisable_newlib_untar=1" - - # Make it possible to remove third_party/adobe. - echo > "${T}/flapper_version.h" || die - myconf+=" -Dflapper_version_h_file=${T}/flapper_version.h" - - # Use system-provided libraries. - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_libsrtp (bug #459932). - # TODO: use_system_libusb (http://crbug.com/266149). - # TODO: use_system_libvpx (http://crbug.com/494939). - # TODO: use_system_opus (https://code.google.com/p/webrtc/issues/detail?id=3077). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_ssl (http://crbug.com/58087). - # TODO: use_system_sqlite (http://crbug.com/22208). - myconf+=" - -Duse_system_bzip2=1 - -Duse_system_ffmpeg=$(usex system-ffmpeg 1 0) - -Duse_system_flac=1 - -Duse_system_harfbuzz=1 - -Duse_system_icu=1 - -Duse_system_jsoncpp=1 - -Duse_system_libevent=1 - -Duse_system_libwebp=1 - -Duse_system_libxml=1 - -Duse_system_libxslt=1 - -Duse_system_minizip=1 - -Duse_system_nspr=1 - -Duse_system_snappy=1 - -Duse_system_speex=1 - -Duse_system_xdg_utils=1 - -Duse_system_zlib=1" - - # Needed for system icu - we don't need additional data files. - myconf+=" -Dicu_use_data_file_flag=0" - myconf+=" -Dgenerate_character_data=0" - - # TODO: patch gyp so that this arm conditional is not needed. - if ! use arm; then - myconf+=" - -Duse_system_yasm=1" - fi - - # Optional dependencies. - # TODO: linux_link_kerberos, bug #381289. - myconf+=" - $(gyp_use cups) - $(gyp_use gnome use_gconf) - $(gyp_use gnome-keyring use_gnome_keyring) - $(gyp_use gnome-keyring linux_link_gnome_keyring) - $(gyp_use hidpi enable_hidpi) - $(gyp_use kerberos) - $(gyp_use lto) - $(gyp_use pulseaudio) - $(gyp_use tcmalloc use_allocator tcmalloc none)" - - # Use explicit library dependencies instead of dlopen. - # This makes breakages easier to detect by revdep-rebuild. - myconf+=" - -Dlinux_link_gsettings=1 - -Dlinux_link_libpci=1 - -Dlinux_link_libspeechd=1 - -Dlibspeechd_h_prefix=speech-dispatcher/" - - # TODO: use the file at run time instead of effectively compiling it in. - myconf+=" - -Dusb_ids_path=/usr/share/misc/usb.ids" - - # Save space by removing DLOG and DCHECK messages (about 6% reduction). - myconf+=" - -Dlogging_like_official_build=1" - - if [[ $(tc-getCC) == *clang* ]]; then - myconf+=" -Dclang=1" - else - myconf+=" -Dclang=0" - fi - - # Never use bundled gold binary. Disable gold linker flags for now. - # Do not use bundled clang. - myconf+=" - -Dclang_use_chrome_plugins=0 - -Dhost_clang=0 - -Dlinux_use_bundled_binutils=0 - -Dlinux_use_bundled_gold=0 - -Dlinux_use_gold_flags=0 - -Dsysroot=" - - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf+=" -Dproprietary_codecs=1 -Dffmpeg_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+=" -Dgoogle_api_key=${google_api_key} - -Dgoogle_default_client_id=${google_default_client_id} - -Dgoogle_default_client_secret=${google_default_client_secret}" - - local myarch="$(tc-arch)" - if [[ $myarch = amd64 ]] ; then - target_arch=x64 - ffmpeg_target_arch=x64 - elif [[ $myarch = x86 ]] ; then - target_arch=ia32 - ffmpeg_target_arch=ia32 - elif [[ $myarch = arm64 ]] ; then - target_arch=arm64 - ffmpeg_target_arch=arm64 - elif [[ $myarch = arm ]] ; then - target_arch=arm - ffmpeg_target_arch=$(usex neon arm-neon arm) - # TODO: re-enable NaCl (NativeClient). - local CTARGET=${CTARGET:-${CHOST}} - if [[ $(tc-is-softfloat) == "no" ]]; then - - myconf_gyp+=" -Darm_float_abi=hard" - fi - filter-flags "-mfpu=*" - use neon || myconf_gyp+=" -Darm_fpu=${ARM_FPU:-vfpv3-d16}" - - if [[ ${CTARGET} == armv[78]* ]]; then - myconf_gyp+=" -Darmv7=1" - else - myconf_gyp+=" -Darmv7=0" - fi - myconf_gyp+=" -Dsysroot= - $(gyp_use neon arm_neon) - -Ddisable_nacl=1" - else - die "Failed to determine target arch, got '$myarch'." - fi - - myconf+=" -Dtarget_arch=${target_arch}" - - # 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+=" -Dwerror=" - - # Disable fatal linker warnings, bug 506268. - myconf+=" -Ddisable_fatal_linker_warnings=1" - - # 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 - - # Tools for building programs to be executed on the build system, bug #410883. - if tc-is-cross-compiler; then - export AR_host=$(tc-getBUILD_AR) - export CC_host=$(tc-getBUILD_CC) - export CXX_host=$(tc-getBUILD_CXX) - export NM_host=$(tc-getBUILD_NM) - fi - - # 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_gyp.py || die - popd > /dev/null || die - fi - - third_party/libaddressinput/chromium/tools/update-strings.py || die - - touch chrome/test/data/webui/i18n_process_css_test.html || die - - einfo "Configuring bundled nodejs..." - pushd vendor/node > /dev/null || die - # Make sure gyp_node does not run - echo '#!/usr/bin/env python' > tools/gyp_node.py || die - # --shared-libuv cannot be used as electron's node fork - # patches uv_loop structure. - ./configure --shared --without-bundled-v8 --shared-openssl \ - --shared-http-parser --shared-zlib --without-npm \ - --with-intl=system-icu --without-dtrace \ - --dest-cpu=${target_arch} --prefix="" || die - popd > /dev/null || die - - # libchromiumcontent configuration - myconf+=" -Dcomponent=static_library" - myconf+=" -Dmac_mas_build=0" - myconf+=' -Dicu_small="false"' - myconf+=" -Dlibchromiumcontent_component=0" - myconf+=" -Dlibrary=static_library" - myconf+=" -Dmas_build=0" - - einfo "Configuring electron..." - build/linux/unbundle/replace_gyp_files.py ${myconf} || die - - myconf+=" -Ivendor/node/config.gypi - -Icommon.gypi - electron.gyp" - - egyp_chromium ${myconf} || die -} - -eninja() { - if [[ -z ${NINJAOPTS+set} ]]; then - local jobs=$(makeopts_jobs) - local loadavg=$(makeopts_loadavg) - - if [[ ${MAKEOPTS} == *-j* && ${jobs} != 999 ]]; then - NINJAOPTS+=" -j ${jobs}" - fi - if [[ ${MAKEOPTS} == *-l* && ${loadavg} != 999 ]]; then - NINJAOPTS+=" -l ${loadavg}" - fi - fi - set -- ninja -v ${NINJAOPTS} "$@" - echo "$@" - "$@" -} - -src_compile() { - local ninja_targets="electron" compile_target="out/R" - - eninja -C ${compile_target} mksnapshot || die - pax-mark -m ${compile_target}/mksnapshot - - eninja -C ${compile_target} nodebin || die - pax-mark -m ${compile_target}/nodebin - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C ${compile_target} ${ninja_targets} || die -} - -src_install() { - local install_dir="$(_get_install_dir)" - local install_suffix="$(_get_install_suffix)" - local LIBDIR="${ED}/usr/$(get_libdir)" - - pushd out/R/locales > /dev/null || die - chromium_remove_language_paks - popd > /dev/null || die - - # Install Electron - insinto "${install_dir}" - exeinto "${install_dir}" - newexe out/R/nodebin node - doexe out/R/electron - doins out/R/libv8.so - doins out/R/libnode.so - fperms +x "${install_dir}/libv8.so" "${install_dir}/libnode.so" - doins out/R/content_shell.pak - doins out/R/natives_blob.bin - doins out/R/snapshot_blob.bin - rm -r out/R/resources/inspector || die - doins -r out/R/resources - doins -r out/R/locales - dosym "${install_dir}/electron" "/usr/bin/electron${install_suffix}" - - pax-mark -rm "${ED}/${install_dir}/electron" - - # Install Node headers - HEADERS_ONLY=1 \ - "${S}/vendor/node/tools/install.py" install "${ED}" "/usr" || die - # set up a symlink structure that npm expects.. - dodir /usr/include/node/deps/{v8,uv} - dosym . /usr/include/node/src - for var in deps/{uv,v8}/include; do - dosym ../.. /usr/include/node/${var} - done - - dodir "/usr/include/electron${install_suffix}" - mv "${ED}/usr/include/node" \ - "${ED}/usr/include/electron${install_suffix}/node" || die -} - -pkg_postinst() { - eselect electron update -} - -pkg_prerm() { - eselect electron update -} diff --git a/dev-util/electron/electron-1.6.15.ebuild b/dev-util/electron/electron-1.6.15.ebuild index 9fb088b4ae1c..d4467b022301 100644 --- a/dev-util/electron/electron-1.6.15.ebuild +++ b/dev-util/electron/electron-1.6.15.ebuild @@ -35,6 +35,7 @@ LIBCHROMIUMCONTENT_COMMIT="a9b88fab38a8162bb485cc5854973f71ea0bc7a6" ASAR_VERSION="0.13.0" BROWSERIFY_VERSION="14.0.0" +PATCHES_P="gentoo-electron-patches-${P}" CHROMIUM_P="chromium-${CHROMIUM_VERSION}" BREAKPAD_P="chromium-breakpad-${BREAKPAD_COMMIT}" BREAKPAD_SRC_P="breakpad-${BREAKPAD_SRC_COMMIT}" @@ -48,7 +49,7 @@ ASAR_P="asar-${ASAR_VERSION}" BROWSERIFY_P="browserify-${BROWSERIFY_VERSION}" DESCRIPTION="Cross platform application development framework based on web technologies" -HOMEPAGE="http://electron.atom.io/" +HOMEPAGE="https://electronjs.org/" SRC_URI=" https://commondatastorage.googleapis.com/chromium-browser-official/${CHROMIUM_P}.tar.xz https://github.com/electron/electron/archive/v${PV}.tar.gz -> ${P}.tar.gz @@ -62,6 +63,7 @@ SRC_URI=" https://github.com/electron/libchromiumcontent/archive/${LIBCHROMIUMCONTENT_COMMIT}.tar.gz -> electron-${LIBCHROMIUMCONTENT_P}.tar.gz https://github.com/elprans/asar/releases/download/v${ASAR_VERSION}-gentoo/asar-build.tar.gz -> ${ASAR_P}.tar.gz https://github.com/elprans/node-browserify/releases/download/${BROWSERIFY_VERSION}-gentoo/browserify-build.tar.gz -> ${BROWSERIFY_P}.tar.gz + https://github.com/elprans/gentoo-electron-patches/archive/${P}.tar.gz -> electron-patches-${PV}.tar.gz " S="${WORKDIR}/${P}" @@ -178,23 +180,6 @@ DEPEND="${COMMON_DEPEND} ') " -CHROMIUM_PATCHES=" - chromium-FORTIFY_SOURCE.patch - chromium-gcc-7-r0.patch - chromium-glibc-2.24.patch - chromium-56-gcc4.patch - chromium-system-ffmpeg-r4.patch - chromium-system-icu-r0.patch - chromium-icu-59-r0.patch - chromium-icu-60-r0.patch - chromium-v8-icu-59-r0.patch - chromium-disable-widevine.patch - chromium-remove-gardiner-mod-font-r1.patch - chromium-shared-v8-r2.patch - chromium-lto-fixes-r3.patch - chromium-python3-compat-r0.patch -" - # 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}]" && @@ -339,15 +324,8 @@ src_prepare() { rsync -a "${WORKDIR}/${BROWSERIFY_P}/node_modules/" \ "${S}/node_modules/" || die - # electron patches - cd "${ELECTRON_S}" || die - eapply "${FILESDIR}/${P}.patch" - eapply "${FILESDIR}/${PN}-system-icu-r0.patch" - # node patches cd "${NODE_S}" || die - eapply "${FILESDIR}/${P}-vendor-node.patch" - eapply "${FILESDIR}/${PN}-vendor-node-external-snapshots-r2.patch" # make sure node uses the correct version of v8 rm -r deps/v8 || die ln -s "${CHROMIUM_S}/v8" deps/ || die @@ -371,22 +349,9 @@ src_prepare() { sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die - # brightray patches - cd "${BRIGHTRAY_S}" || die - eapply "${FILESDIR}/${P}-vendor-brightray.patch" - - # libchromiumcontent patches - cd "${LIBCC_S}" || die - eapply "${FILESDIR}/${P}-vendor-libchromiumcontent.patch" - - # breakpad patches - cd "${BREAKPAD_S}" || die - eapply "${FILESDIR}/${P}-vendor-breakpad.patch" - - # chromium patches cd "${CHROMIUM_S}" || die - # libcc chromium patches + # Apply libcc Chromium patches. _unnest_patches "${LIBCC_S}/patches" EPATCH_SOURCE="${LIBCC_S}/patches" \ @@ -395,11 +360,16 @@ src_prepare() { EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \ epatch - # Apply Gentoo-specific Chromium patches - local p - for p in ${CHROMIUM_PATCHES}; do - eapply "${FILESDIR}/${p}" - done + cd "${S}" || die + + # Apply Gentoo patches + _unnest_patches "${WORKDIR}/${PATCHES_P}/${PV}" + + EPATCH_SOURCE="${WORKDIR}/${PATCHES_P}/${PV}" \ + EPATCH_SUFFIX="patch" \ + EPATCH_FORCE="yes" \ + EPATCH_MULTI_MSG="Applying Gentoo patches..." \ + epatch # Merge chromiumcontent component into chromium source tree. mkdir -p "${CHROMIUM_S}/chromiumcontent" || die @@ -526,6 +496,8 @@ src_prepare() { keeplibs+=( third_party/ffmpeg ) fi + cd "${CHROMIUM_S}" || die + # Remove most bundled libraries. Some are still needed. ebegin "Unbundling libraries" build/linux/unbundle/remove_bundled_libraries.py \ diff --git a/dev-util/electron/files/chromium-56-gcc4.patch b/dev-util/electron/files/chromium-56-gcc4.patch deleted file mode 100644 index e3188668ce5a..000000000000 --- a/dev-util/electron/files/chromium-56-gcc4.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 888874f761fdd69bb9448b3905627289b5fd66dd Mon Sep 17 00:00:00 2001 -From: floppymaster <floppymaster@gmail.com> -Date: Thu, 19 Jan 2017 20:20:45 -0800 -Subject: [PATCH] Allow GCC 4.9 to compile Chromium - -In order to implicit cast an lvalue to an rvalue when returning -from a function, the return type and type of variable in the return -statement previously had to be exactly the same. When this was not -the case, std::move was required. For instance, when returning a -std::unique_ptr<Derived> variable in a function with a -std::unique_ptr<Base> return type, std::move is required. - -DR 1579 changed this, and allows for implicitly converting -to the return type, if the return type has a constructor(T&&), where -T is the type of the local variable being returned. DR 1579 was -implemented in GCC 5, but not in GCC 4.9 and below. By explicitly -qualifying the local variable with std::move, we allow for compiling -with GCC 4.9 and incur no performance penalty. The code is still -absolutely correct to the word of C++11. - -BUG=chromium:682965 - -See also: -* https://bugs.gentoo.org/show_bug.cgi?id=600288 -* https://stackoverflow.com/questions/22018115/converting-stdunique-ptrderived-to-stdunique-ptrbase#comment33375875_22018521 -* http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2014/n3833.html#1579 - -Review-Url: https://codereview.webrtc.org/2642053003 -Cr-Commit-Position: refs/heads/master@{#16175} ---- - AUTHORS | 1 + - webrtc/modules/desktop_capture/screen_capturer_x11.cc | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - ---- a/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc -+++ b/third_party/webrtc/modules/desktop_capture/screen_capturer_x11.cc -@@ -412,7 +412,7 @@ std::unique_ptr<DesktopCapturer> DesktopCapturer::CreateRawScreenCapturer( - return nullptr; - } - -- return capturer; -+ return std::move(capturer); - } - - } // namespace webrtc --- -2.11.0 - diff --git a/dev-util/electron/files/chromium-FORTIFY_SOURCE.patch b/dev-util/electron/files/chromium-FORTIFY_SOURCE.patch deleted file mode 100644 index c6477d690872..000000000000 --- a/dev-util/electron/files/chromium-FORTIFY_SOURCE.patch +++ /dev/null @@ -1,27 +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 -@@ -1069,19 +1069,6 @@ config("chromium_code") { - "__STDC_FORMAT_MACROS", - ] - -- if (!is_debug && !using_sanitizer && -- (!is_linux || !is_clang || is_official_build)) { -- # _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/dev-util/electron/files/chromium-cups-fix.patch b/dev-util/electron/files/chromium-cups-fix.patch deleted file mode 100644 index bbd462a8081e..000000000000 --- a/dev-util/electron/files/chromium-cups-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -index 8bacfd7..b469a1c 100644 ---- a/printing/backend/print_backend_cups.cc -+++ b/printing/backend/print_backend_cups.cc - -@@ -4,6 +4,7 @@ - - #include "printing/backend/print_backend_cups.h" - -+#include <cups/ppd.h> - #include <dlfcn.h> - #include <errno.h> - #include <pthread.h> diff --git a/dev-util/electron/files/chromium-disable-widevine.patch b/dev-util/electron/files/chromium-disable-widevine.patch deleted file mode 100644 index 5b166463c88c..000000000000 --- a/dev-util/electron/files/chromium-disable-widevine.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- a/third_party/widevine/cdm/stub/widevine_cdm_version.h -+++ b/third_party/widevine/cdm/stub/widevine_cdm_version.h -@@ -10,6 +10,5 @@ - - #include "third_party/widevine/cdm/widevine_cdm_common.h" - --#define WIDEVINE_CDM_AVAILABLE - - #endif // WIDEVINE_CDM_VERSION_H_ diff --git a/dev-util/electron/files/chromium-ffmpeg-license-r0.patch b/dev-util/electron/files/chromium-ffmpeg-license-r0.patch deleted file mode 100644 index 8e44cbdbb0ac..000000000000 --- a/dev-util/electron/files/chromium-ffmpeg-license-r0.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 3c9d5afe45bf1c4656b8f630525433f29017cd08 Mon Sep 17 00:00:00 2001 -From: Chris Cunningham <chcunningham@chromium.org> -Date: Tue, 21 Jun 2016 10:52:45 -0700 -Subject: [PATCH] Avoid ffmpeg licences/credits checking generated autorename_ files. - -We generated these renames as a fix for http://crbug.com/495833. The -generated rename contains no license or credits info and should be -skipped to avoid confusing license/credits scripts. Care must be -taken to not also skip the underlying include file from upstream ffmpeg. - -Found by: Zoltan Kuscsik - -BUG=495833 - -Change-Id: I3359f4de0281b5f057d4b109ab2a4f31895b5cb1 ---- - -diff --git a/chromium/scripts/generate_gyp.py b/chromium/scripts/generate_gyp.py -index c3fd3c0..94c2aad 100755 ---- a/third_party/ffmpeg/chromium/scripts/generate_gyp.py -+++ b/third_party/ffmpeg/chromium/scripts/generate_gyp.py -@@ -790,6 +790,9 @@ - # Prefix added to renamed files as part of - RENAME_PREFIX = 'autorename' - -+# Match an absolute path to a generated auotorename_ file. -+RENAME_REGEX = re.compile('.*' + RENAME_PREFIX + '_.+'); -+ - # Content for the rename file. #includes the original file to ensure the two - # files stay in sync. - RENAME_CONTENT = """// File automatically generated. See crbug.com/495833. -@@ -1020,6 +1023,12 @@ - for source in source_set.sources: - GetIncludedSources(source, source_dir, sources_to_check) - -+ # Remove autorename_ files now that we've grabbed their underlying includes. -+ # We generated autorename_ files above and should not consider them for -+ # licensing or credits. -+ sources_to_check = filter(lambda s: not RENAME_REGEX.search(s), -+ sources_to_check) -+ - if not CheckLicensesForStaticLinking(sources_to_check, source_dir, - options.print_licenses): - exit('GENERATE FAILED: invalid licenses detected.') diff --git a/dev-util/electron/files/chromium-gcc-7-r0.patch b/dev-util/electron/files/chromium-gcc-7-r0.patch deleted file mode 100644 index 7a7ded275cd0..000000000000 --- a/dev-util/electron/files/chromium-gcc-7-r0.patch +++ /dev/null @@ -1,114 +0,0 @@ -From 19597ff341e55fef78c7fae794574785bfde9acd Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Thu, 7 Dec 2017 09:25:03 -0500 -Subject: [PATCH] GCC-7 compatibility - ---- - .../Source/platform/graphics/gpu/SharedGpuContext.h | 1 + - third_party/WebKit/Source/wtf/LinkedHashSet.h | 1 + - v8/src/objects-body-descriptors.h | 2 +- - v8/src/objects-inl.h | 19 +++++++++++++++++++ - v8/src/objects.h | 20 ++++---------------- - 5 files changed, 26 insertions(+), 17 deletions(-) - -diff --git a/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h b/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h -index 7c32007346..dd2d637085 100644 ---- a/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h -+++ b/third_party/WebKit/Source/platform/graphics/gpu/SharedGpuContext.h -@@ -5,6 +5,7 @@ - #include "platform/PlatformExport.h" - #include "wtf/ThreadSpecific.h" - -+#include <functional> - #include <memory> - - namespace gpu { -diff --git a/third_party/WebKit/Source/wtf/LinkedHashSet.h b/third_party/WebKit/Source/wtf/LinkedHashSet.h -index 65f5100a8f..7c6c9fc5d8 100644 ---- a/third_party/WebKit/Source/wtf/LinkedHashSet.h -+++ b/third_party/WebKit/Source/wtf/LinkedHashSet.h -@@ -630,6 +630,7 @@ inline LinkedHashSet<T, U, V, W>& LinkedHashSet<T, U, V, W>::operator=( - return *this; - } - -+inline void swapAnchor(LinkedHashSetNodeBase& a, LinkedHashSetNodeBase& b); - template <typename T, typename U, typename V, typename W> - inline void LinkedHashSet<T, U, V, W>::swap(LinkedHashSet& other) { - m_impl.swap(other.m_impl); -diff --git a/v8/src/objects-body-descriptors.h b/v8/src/objects-body-descriptors.h -index 91cb8883be..a1c3634bd7 100644 ---- a/v8/src/objects-body-descriptors.h -+++ b/v8/src/objects-body-descriptors.h -@@ -99,7 +99,7 @@ class FixedBodyDescriptor final : public BodyDescriptorBase { - - template <typename StaticVisitor> - static inline void IterateBody(HeapObject* obj, int object_size) { -- IterateBody(obj); -+ IterateBody<StaticVisitor>(obj); - } - }; - -diff --git a/v8/src/objects-inl.h b/v8/src/objects-inl.h -index 1a8274cbf1..6c4b13c0d0 100644 ---- a/v8/src/objects-inl.h -+++ b/v8/src/objects-inl.h -@@ -39,6 +39,25 @@ - namespace v8 { - namespace internal { - -+template <typename Derived, typename Shape, typename Key> -+uint32_t HashTable<Derived, Shape, Key>::Hash(Key key) { -+ if (Shape::UsesSeed) { -+ return Shape::SeededHash(key, GetHeap()->HashSeed()); -+ } else { -+ return Shape::Hash(key); -+ } -+} -+ -+template <typename Derived, typename Shape, typename Key> -+uint32_t HashTable<Derived, Shape, Key>::HashForObject(Key key, -+ Object* object) { -+ if (Shape::UsesSeed) { -+ return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); -+ } else { -+ return Shape::HashForObject(key, object); -+ } -+} -+ - PropertyDetails::PropertyDetails(Smi* smi) { - value_ = smi->value(); - } -diff --git a/v8/src/objects.h b/v8/src/objects.h -index 747a4f0511..b9279640e2 100644 ---- a/v8/src/objects.h -+++ b/v8/src/objects.h -@@ -3531,22 +3531,10 @@ class HashTable : public HashTableBase { - public: - typedef Shape ShapeT; - -- // Wrapper methods -- inline uint32_t Hash(Key key) { -- if (Shape::UsesSeed) { -- return Shape::SeededHash(key, GetHeap()->HashSeed()); -- } else { -- return Shape::Hash(key); -- } -- } -- -- inline uint32_t HashForObject(Key key, Object* object) { -- if (Shape::UsesSeed) { -- return Shape::SeededHashForObject(key, GetHeap()->HashSeed(), object); -- } else { -- return Shape::HashForObject(key, object); -- } -- } -+ // Wrapper methods. Defined in src/objects-inl.h -+ // to break a cycle with src/heap/heap.h. -+ inline uint32_t Hash(Key key); -+ inline uint32_t HashForObject(Key key, Object* object); - - // Returns a new HashTable object. - MUST_USE_RESULT static Handle<Derived> New( --- -2.14.3 - diff --git a/dev-util/electron/files/chromium-glibc-2.24.patch b/dev-util/electron/files/chromium-glibc-2.24.patch deleted file mode 100644 index f7bfd816433f..000000000000 --- a/dev-util/electron/files/chromium-glibc-2.24.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp.orig 2017-01-05 20:50:56.329369189 +0000 -+++ b/third_party/WebKit/Source/wtf/allocator/PageAllocator.cpp 2017-01-05 20:51:32.926099779 +0000 -@@ -242,6 +242,12 @@ - ASSERT(!(len & kSystemPageOffsetMask)); - #if OS(POSIX) - int ret = madvise(addr, len, MADV_FREE); -+ if (ret != 0 && errno == EINVAL) { -+ // MADV_FREE only works on Linux 4.5+ . If request failed, -+ // retry with older MADV_DONTNEED . Note that MADV_FREE -+ // being defined at compile time doesn't imply runtime support. -+ ret = madvise(addr, len, MADV_DONTNEED); -+ } - RELEASE_ASSERT(!ret); - #else - setSystemPagesInaccessible(addr, len); diff --git a/dev-util/electron/files/chromium-icu-58-r0.patch b/dev-util/electron/files/chromium-icu-58-r0.patch deleted file mode 100644 index ca402f6e4a89..000000000000 --- a/dev-util/electron/files/chromium-icu-58-r0.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp.orig 2016-11-11 13:21:19.747054059 -0500 -+++ b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp 2016-11-11 13:24:34.474939062 -0500 -@@ -26,6 +26,9 @@ - #include "wtf/StdLibExtras.h" - #include "wtf/text/CharacterNames.h" - -+#include <unicode/uchar.h> -+#include <unicode/uvernum.h> -+ - namespace blink { - - unsigned numGraphemeClusters(const String& string) -@@ -122,13 +125,19 @@ - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL - }; - -+#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#define BA_LB_COUNT (U_LB_COUNT - 3) -+#else -+#define BA_LB_COUNT U_LB_COUNT -+#endif -+ - // Line breaking table for CSS word-break: break-all. This table differs from - // asciiLineBreakTable in: - // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking - // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties - // - 1 indicates additional break opportunities. 0 indicates to fallback to - // normal line break, not "prohibit break." --static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = { -+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = { - // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX - { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI -@@ -178,7 +187,7 @@ - #undef AL - - static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent"); --static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); -+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); - - static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) - { -@@ -209,7 +218,7 @@ - - static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak) - { -- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) { -+ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) { - const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; - return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); - } diff --git a/dev-util/electron/files/chromium-icu-58-r1.patch b/dev-util/electron/files/chromium-icu-58-r1.patch deleted file mode 100644 index 9e6e5fd72d70..000000000000 --- a/dev-util/electron/files/chromium-icu-58-r1.patch +++ /dev/null @@ -1,128 +0,0 @@ -From 424584b4984bde7c831f42e9fb47f1ad583a1c46 Mon Sep 17 00:00:00 2001 -From: jshin <jshin@chromium.org> -Date: Fri, 21 Oct 2016 01:15:50 -0700 -Subject: [PATCH] Update aspirational_scripts per Unicode 9 - -This is a preparation to update ICU to 58.1. -Without this change, ICU update CL cannot be tested on -trybots because a compile will fail due to '#error' checking -if ICU version is less than 58. - -BUG=637001 -TEST=None -TBR=pkasting@chromium.org - -Review-Url: https://chromiumcodereview.appspot.com/2436113003 -Cr-Commit-Position: refs/heads/master@{#426749} ---- - components/url_formatter/url_formatter.cc | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc -index 4455db3..2b82c0c 100644 ---- a/components/url_formatter/url_formatter.cc -+++ b/components/url_formatter/url_formatter.cc -@@ -431,7 +431,7 @@ - // are added to the allowed set. The list has to be updated when a new - // version of Unicode is released. The current version is 8.0.0 and ICU 58 - // will have Unicode 9.0 data. --#if U_ICU_VERSION_MAJOR_NUM < 58 -+#if U_ICU_VERSION_MAJOR_NUM < 60 - const icu::UnicodeSet aspirational_scripts( - icu::UnicodeString( - // Unified Canadian Syllabics -@@ -445,13 +445,13 @@ - // Yi - "\\uA000-\\uA48C" - // Miao -- "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7F" -+ "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7E" - "\\U00016F8F-\\U00016F9F]", - -1, US_INV), - *status); - allowed_set.addAll(aspirational_scripts); - #else --#error "Update aspirational_scripts per Unicode 9.0" -+#error "Update aspirational_scripts per Unicode 10.0" - #endif - - // U+0338 is included in the recommended set, while U+05F4 and U+2027 are in --- -2.10.2 - -From e60b571faa3f14dd9119a6792dccf12f8bf80192 Mon Sep 17 00:00:00 2001 -From: jshin <jshin@chromium.org> -Date: Fri, 21 Oct 2016 12:20:05 -0700 -Subject: [PATCH] Prepare to upgrade ICU to 58 part 2 - -U_LB_COUNT is assumed to be 40 in Blink line breaking code, but it's -43 in ICU 58/Unicode 9. - -Three new classes (Emoji Base, Emoji Modifier, and ZWJ) should behave -identically whether or not 'word-break: break-all' is in effect. - -BUG=637001 -TEST=TextBreakIterator.cpp is compiled without an error with ICU 58. -R=kojii@chromium.org -CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_precise_blink_rel - -Review-Url: https://chromiumcodereview.appspot.com/2440923002 -Cr-Commit-Position: refs/heads/master@{#426860} ---- - .../WebKit/Source/platform/text/TextBreakIterator.cpp | 16 ++++++++++++---- - 1 file changed, 12 insertions(+), 4 deletions(-) - -diff --git a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp -index 568dc0a..36121eb 100644 ---- a/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp -+++ b/third_party/WebKit/Source/platform/text/TextBreakIterator.cpp -@@ -27,6 +27,9 @@ - #include "wtf/StdLibExtras.h" - #include "wtf/text/CharacterNames.h" - -+#include <unicode/uchar.h> -+#include <unicode/uvernum.h> -+ - namespace blink { - - unsigned numGraphemeClusters(const String& string) -@@ -123,13 +126,18 @@ - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0), 0, 0, 0, B(0, 0, 0, 0, 0, 0, 0, 0) }, // DEL - }; - -+#if U_ICU_VERSION_MAJOR_NUM >= 58 -+#define BA_LB_COUNT (U_LB_COUNT - 3) -+#else -+#define BA_LB_COUNT U_LB_COUNT -+#endif - // Line breaking table for CSS word-break: break-all. This table differs from - // asciiLineBreakTable in: - // - Indices are Line Breaking Classes defined in UAX#14 Unicode Line Breaking - // Algorithm: http://unicode.org/reports/tr14/#DescriptionOfProperties - // - 1 indicates additional break opportunities. 0 indicates to fallback to - // normal line break, not "prohibit break." --static const unsigned char breakAllLineBreakClassTable[][U_LB_COUNT / 8 + 1] = { -+static const unsigned char breakAllLineBreakClassTable[][BA_LB_COUNT / 8 + 1] = { - // XX AI AL B2 BA BB BK CB CL CM CR EX GL HY ID IN IS LF NS NU OP PO PR QU SA SG SP SY ZW NL WJ H2 H3 JL JT JV CP CJ HL RI - { B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 0, 0) }, // XX - { B(0, 1, 1, 0, 1, 0, 0, 0), B(0, 0, 0, 0, 0, 1, 0, 0), B(0, 0, 0, 1, 1, 0, 1, 0), B(1, 0, 0, 0, 0, 0, 0, 0), B(0, 0, 0, 0, 0, 0, 1, 0) }, // AI -@@ -179,7 +187,7 @@ - #undef AL - - static_assert(WTF_ARRAY_LENGTH(asciiLineBreakTable) == asciiLineBreakTableLastChar - asciiLineBreakTableFirstChar + 1, "asciiLineBreakTable should be consistent"); --static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == U_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); -+static_assert(WTF_ARRAY_LENGTH(breakAllLineBreakClassTable) == BA_LB_COUNT, "breakAllLineBreakClassTable should be consistent"); - - static inline bool shouldBreakAfter(UChar lastCh, UChar ch, UChar nextCh) - { -@@ -210,7 +218,7 @@ - - static inline bool shouldBreakAfterBreakAll(ULineBreak lastLineBreak, ULineBreak lineBreak) - { -- if (lineBreak >= 0 && lineBreak < U_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < U_LB_COUNT) { -+ if (lineBreak >= 0 && lineBreak < BA_LB_COUNT && lastLineBreak >= 0 && lastLineBreak < BA_LB_COUNT) { - const unsigned char* tableRow = breakAllLineBreakClassTable[lastLineBreak]; - return tableRow[lineBreak / 8] & (1 << (lineBreak % 8)); - } --- -2.10.2 diff --git a/dev-util/electron/files/chromium-icu-59-r0.patch b/dev-util/electron/files/chromium-icu-59-r0.patch deleted file mode 100644 index 31dd6983592e..000000000000 --- a/dev-util/electron/files/chromium-icu-59-r0.patch +++ /dev/null @@ -1,582 +0,0 @@ -From f041627ec383536d124002b81301c80b7a1757f7 Mon Sep 17 00:00:00 2001 -From: jshin <jshin@chromium.org> -Date: Thu, 23 Mar 2017 02:57:16 -0700 -Subject: [PATCH] Prepare Chromium and Blink for ICU 59 - -ICU 59 uses char16_t as UChar instead of {wchar_t, uint16_t}. -As a result, char16_t is not compatible with char16 any more. -When constructing string16 from UnicodeString/UChar buffer, we need to -reinterpret_cast with a barrier (to avoid an anti-aliasing optimzation -by some compilers). - -Add UnicodeStringToString16() to base/i18n that utilizes ICU 59-to-be's -helper for the casting regardless of anti-aliasing optimization. - -And, refactor UnicodeString->string16->UTF8 string to UnicodeString->UTF8 -in a few places. - -For ICU C API "clients", UChar will be configured to be {wchar_t, uint16_t} -so that there's little to be changed. - -This was tested with an ICU branch with char16_t as UChar. - -http://source.icu-project.org/repos/icu/branches/markus/ucharptr2/ - -BUG=693640 -TEST=trybots are all green. - -Review-Url: https://codereview.chromium.org/2740673002 -Cr-Commit-Position: refs/heads/master@{#459034} ---- - ash/common/system/date/date_view.cc | 30 ++------------------ - base/BUILD.gn | 1 + - base/i18n/message_formatter.cc | 5 ++-- - base/i18n/number_formatting.cc | 5 ++-- - base/i18n/string_compare.cc | 5 ++-- - base/i18n/time_formatting.cc | 9 +++--- - base/i18n/time_formatting_unittest.cc | 3 +- - base/i18n/timezone.cc | 4 +-- - base/i18n/unicodestring.h | 32 ++++++++++++++++++++++ - chrome/browser/chromeos/system/timezone_util.cc | 6 ++-- - .../webui/md_downloads/downloads_list_tracker.cc | 4 +-- - chromeos/settings/timezone_settings.cc | 4 +-- - .../core/browser/autofill_profile_comparator.cc | 3 +- - components/autofill/core/browser/credit_card.cc | 7 +++-- - .../browser/android/date_time_chooser_android.cc | 4 +-- - content/renderer/android/email_detector.cc | 4 +-- - ios/chrome/browser/notification_promo_unittest.cc | 10 ++----- - net/ftp/ftp_util.cc | 5 ++-- - .../Source/core/html/forms/EmailInputType.cpp | 13 +++++++-- - 19 files changed, 88 insertions(+), 66 deletions(-) - create mode 100644 base/i18n/unicodestring.h - -diff --git a/ash/common/system/date/date_view.cc b/ash/common/system/date/date_view.cc -index 41aa1919a980..8d9c416fd392 100644 ---- a/ash/common/system/date/date_view.cc -+++ b/ash/common/system/date/date_view.cc -@@ -57,43 +57,19 @@ bool UseMd() { - return MaterialDesignController::IsSystemTrayMenuMaterial(); - } - --base::string16 FormatDateWithPattern(const base::Time& time, -- const char* pattern) { -- UErrorCode status = U_ZERO_ERROR; -- std::unique_ptr<icu::DateTimePatternGenerator> generator( -- icu::DateTimePatternGenerator::createInstance(status)); -- DCHECK(U_SUCCESS(status)); -- icu::UnicodeString generated_pattern = -- generator->getBestPattern(icu::UnicodeString(pattern), status); -- DCHECK(U_SUCCESS(status)); -- icu::SimpleDateFormat simple_formatter(generated_pattern, status); -- DCHECK(U_SUCCESS(status)); -- icu::UnicodeString date_string; -- simple_formatter.format(static_cast<UDate>(time.ToDoubleT() * 1000), -- date_string, status); -- DCHECK(U_SUCCESS(status)); -- return base::string16(date_string.getBuffer(), -- static_cast<size_t>(date_string.length())); --} -- - base::string16 FormatDate(const base::Time& time) { - if (UseMd()) { - // Use 'short' month format (e.g., "Oct") followed by non-padded day of - // month (e.g., "2", "10"). -- return FormatDateWithPattern(time, "LLLd"); -+ return base::TimeFormatWithPattern(time, "LLLd"); - } else { -- icu::UnicodeString date_string; -- std::unique_ptr<icu::DateFormat> formatter( -- icu::DateFormat::createDateInstance(icu::DateFormat::kMedium)); -- formatter->format(static_cast<UDate>(time.ToDoubleT() * 1000), date_string); -- return base::string16(date_string.getBuffer(), -- static_cast<size_t>(date_string.length())); -+ return base::TimeFormatShortDate(time); - } - } - - base::string16 FormatDayOfWeek(const base::Time& time) { - // Use 'short' day of week format (e.g., "Wed"). -- return FormatDateWithPattern(time, "EEE"); -+ return base::TimeFormatWithPattern(time, "EEE"); - } - - } // namespace -diff --git a/base/BUILD.gn b/base/BUILD.gn -index 3754be5f383f..29a60c1a265f 100644 ---- a/base/BUILD.gn -+++ b/base/BUILD.gn -@@ -1564,6 +1564,7 @@ component("i18n") { - "i18n/time_formatting.h", - "i18n/timezone.cc", - "i18n/timezone.h", -+ "i18n/unicodestring.h", - "i18n/utf8_validator_tables.cc", - "i18n/utf8_validator_tables.h", - ] -diff --git a/base/i18n/message_formatter.cc b/base/i18n/message_formatter.cc -index 702e51b94aaa..6962a2829755 100644 ---- a/base/i18n/message_formatter.cc -+++ b/base/i18n/message_formatter.cc -@@ -4,6 +4,7 @@ - - #include "base/i18n/message_formatter.h" - -+#include "base/i18n/unicodestring.h" - #include "base/logging.h" - #include "base/numerics/safe_conversions.h" - #include "base/time/time.h" -@@ -91,7 +92,7 @@ string16 MessageFormatter::FormatWithNumberedArgs( - << u_errorName(error); - return string16(); - } -- return string16(formatted.getBuffer(), formatted.length()); -+ return i18n::UnicodeStringToString16(formatted); - } - - string16 MessageFormatter::FormatWithNamedArgs( -@@ -134,7 +135,7 @@ string16 MessageFormatter::FormatWithNamedArgs( - << u_errorName(error); - return string16(); - } -- return string16(formatted.getBuffer(), formatted.length()); -+ return i18n::UnicodeStringToString16(formatted); - } - - } // namespace i18n -diff --git a/base/i18n/number_formatting.cc b/base/i18n/number_formatting.cc -index b51083348460..5a0503f77de1 100644 ---- a/base/i18n/number_formatting.cc -+++ b/base/i18n/number_formatting.cc -@@ -10,6 +10,7 @@ - - #include "base/format_macros.h" - #include "base/i18n/message_formatter.h" -+#include "base/i18n/unicodestring.h" - #include "base/lazy_instance.h" - #include "base/logging.h" - #include "base/strings/string_util.h" -@@ -60,7 +61,7 @@ string16 FormatNumber(int64_t number) { - icu::UnicodeString ustr; - number_format->format(number, ustr); - -- return string16(ustr.getBuffer(), static_cast<size_t>(ustr.length())); -+ return i18n::UnicodeStringToString16(ustr); - } - - string16 FormatDouble(double number, int fractional_digits) { -@@ -76,7 +77,7 @@ string16 FormatDouble(double number, int fractional_digits) { - icu::UnicodeString ustr; - number_format->format(number, ustr); - -- return string16(ustr.getBuffer(), static_cast<size_t>(ustr.length())); -+ return i18n::UnicodeStringToString16(ustr); - } - - string16 FormatPercent(int number) { -diff --git a/base/i18n/string_compare.cc b/base/i18n/string_compare.cc -index 2851e7d2dce1..649c28119fe3 100644 ---- a/base/i18n/string_compare.cc -+++ b/base/i18n/string_compare.cc -@@ -6,6 +6,7 @@ - - #include "base/logging.h" - #include "base/strings/utf_string_conversions.h" -+#include "third_party/icu/source/common/unicode/unistr.h" - - namespace base { - namespace i18n { -@@ -17,8 +18,8 @@ UCollationResult CompareString16WithCollator(const icu::Collator& collator, - const string16& rhs) { - UErrorCode error = U_ZERO_ERROR; - UCollationResult result = collator.compare( -- static_cast<const UChar*>(lhs.c_str()), static_cast<int>(lhs.length()), -- static_cast<const UChar*>(rhs.c_str()), static_cast<int>(rhs.length()), -+ icu::UnicodeString(FALSE, lhs.c_str(), static_cast<int>(lhs.length())), -+ icu::UnicodeString(FALSE, rhs.c_str(), static_cast<int>(rhs.length())), - error); - DCHECK(U_SUCCESS(error)); - return result; -diff --git a/base/i18n/time_formatting.cc b/base/i18n/time_formatting.cc -index 024b86510b5a..ae1c59eb411a 100644 ---- a/base/i18n/time_formatting.cc -+++ b/base/i18n/time_formatting.cc -@@ -8,6 +8,7 @@ - - #include <memory> - -+#include "base/i18n/unicodestring.h" - #include "base/logging.h" - #include "base/strings/utf_string_conversions.h" - #include "base/time/time.h" -@@ -26,8 +27,7 @@ string16 TimeFormat(const icu::DateFormat* formatter, - icu::UnicodeString date_string; - - formatter->format(static_cast<UDate>(time.ToDoubleT() * 1000), date_string); -- return string16(date_string.getBuffer(), -- static_cast<size_t>(date_string.length())); -+ return i18n::UnicodeStringToString16(date_string); - } - - string16 TimeFormatWithoutAmPm(const icu::DateFormat* formatter, -@@ -46,8 +46,7 @@ string16 TimeFormatWithoutAmPm(const icu::DateFormat* formatter, - begin--; - time_string.removeBetween(begin, ampm_field.getEndIndex()); - } -- return string16(time_string.getBuffer(), -- static_cast<size_t>(time_string.length())); -+ return i18n::UnicodeStringToString16(time_string); - } - - icu::SimpleDateFormat CreateSimpleDateFormatter(const char* pattern) { -@@ -168,7 +167,7 @@ string16 TimeDurationFormat(const TimeDelta& time, - icu::UnicodeString formatted; - icu::FieldPosition ignore(icu::FieldPosition::DONT_CARE); - measure_format.formatMeasures(measures, 2, formatted, ignore, status); -- return base::string16(formatted.getBuffer(), formatted.length()); -+ return i18n::UnicodeStringToString16(formatted); - } - - HourClockType GetHourClockType() { -diff --git a/base/i18n/time_formatting_unittest.cc b/base/i18n/time_formatting_unittest.cc -index 51a48513aca6..eca8ea2cdaea 100644 ---- a/base/i18n/time_formatting_unittest.cc -+++ b/base/i18n/time_formatting_unittest.cc -@@ -7,6 +7,7 @@ - #include <memory> - - #include "base/i18n/rtl.h" -+#include "base/i18n/unicodestring.h" - #include "base/strings/utf_string_conversions.h" - #include "base/test/icu_test_util.h" - #include "base/time/time.h" -@@ -37,7 +38,7 @@ base::string16 GetShortTimeZone(const Time& time) { - zone_formatter->format(UTZFMT_STYLE_SPECIFIC_SHORT, *zone, - static_cast<UDate>(time.ToDoubleT() * 1000), - name, nullptr); -- return base::string16(name.getBuffer(), name.length()); -+ return i18n::UnicodeStringToString16(name); - } - - #if defined(OS_ANDROID) -diff --git a/base/i18n/timezone.cc b/base/i18n/timezone.cc -index e881c9d680f8..95e7aee34c4c 100644 ---- a/base/i18n/timezone.cc -+++ b/base/i18n/timezone.cc -@@ -610,9 +610,9 @@ std::string CountryCodeForCurrentTimezone() { - std::unique_ptr<icu::TimeZone> zone(icu::TimeZone::createDefault()); - icu::UnicodeString id; - zone->getID(id); -- string16 olson_code(id.getBuffer(), id.length()); -+ std::string olson_code; - return TimezoneMap::GetInstance()->CountryCodeForTimezone( -- UTF16ToUTF8(olson_code)); -+ id.toUTF8String(olson_code)); - } - - } // namespace base -diff --git a/base/i18n/unicodestring.h b/base/i18n/unicodestring.h -new file mode 100644 -index 000000000000..b62c5264deb4 ---- /dev/null -+++ b/base/i18n/unicodestring.h -@@ -0,0 +1,32 @@ -+// Copyright (c) 2017 The Chromium Authors. All rights reserved. -+// Use of this source code is governed by a BSD-style license that can be -+// found in the LICENSE file. -+ -+#ifndef BASE_I18N_UNICODESTRING_H_ -+#define BASE_I18N_UNICODESTRING_H_ -+ -+#include "base/strings/string16.h" -+#include "third_party/icu/source/common/unicode/unistr.h" -+#include "third_party/icu/source/common/unicode/uvernum.h" -+ -+#if U_ICU_VERSION_MAJOR_NUM >= 59 -+#include "third_party/icu/source/common/unicode/char16ptr.h" -+#endif -+ -+namespace base { -+namespace i18n { -+ -+inline string16 UnicodeStringToString16(const icu::UnicodeString& unistr) { -+#if U_ICU_VERSION_MAJOR_NUM >= 59 -+ return base::string16(icu::toUCharPtr(unistr.getBuffer()), -+ static_cast<size_t>(unistr.length())); -+#else -+ return base::string16(unistr.getBuffer(), -+ static_cast<size_t>(unistr.length())); -+#endif -+} -+ -+} // namespace i18n -+} // namespace base -+ -+#endif // BASE_UNICODESTRING_H_ -diff --git a/chrome/browser/chromeos/system/timezone_util.cc b/chrome/browser/chromeos/system/timezone_util.cc -index 6c41a052197a..d01f60e03b9f 100644 ---- a/chrome/browser/chromeos/system/timezone_util.cc -+++ b/chrome/browser/chromeos/system/timezone_util.cc -@@ -11,6 +11,7 @@ - #include <utility> - - #include "base/i18n/rtl.h" -+#include "base/i18n/unicodestring.h" - #include "base/lazy_instance.h" - #include "base/memory/ptr_util.h" - #include "base/strings/string_util.h" -@@ -77,7 +78,7 @@ base::string16 GetExemplarCity(const icu::TimeZone& zone) { - if (!U_FAILURE(status)) { - city = icu::ures_getUnicodeStringByKey(zone_item.get(), "ec", &status); - if (U_SUCCESS(status)) -- return base::string16(city.getBuffer(), city.length()); -+ return base::i18n::UnicodeStringToString16(city); - } - - // Fallback case in case of failure. -@@ -135,8 +136,7 @@ base::string16 GetTimezoneName(const icu::TimeZone& timezone) { - } - base::string16 result(l10n_util::GetStringFUTF16( - IDS_OPTIONS_SETTINGS_TIMEZONE_DISPLAY_TEMPLATE, -- base::ASCIIToUTF16(offset_str), -- base::string16(name.getBuffer(), name.length()), -+ base::ASCIIToUTF16(offset_str), base::i18n::UnicodeStringToString16(name), - GetExemplarCity(timezone))); - base::i18n::AdjustStringForLocaleDirection(&result); - return result; -diff --git a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.cc b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.cc -index caf07f69197c..38ed53586d6a 100644 ---- a/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.cc -+++ b/chrome/browser/ui/webui/md_downloads/downloads_list_tracker.cc -@@ -9,6 +9,7 @@ - #include "base/bind.h" - #include "base/bind_helpers.h" - #include "base/i18n/rtl.h" -+#include "base/i18n/unicodestring.h" - #include "base/strings/string16.h" - #include "base/strings/string_number_conversions.h" - #include "base/time/time.h" -@@ -74,8 +75,7 @@ base::string16 TimeFormatLongDate(const base::Time& time) { - icu::DateFormat::createDateInstance(icu::DateFormat::kLong)); - icu::UnicodeString date_string; - formatter->format(static_cast<UDate>(time.ToDoubleT() * 1000), date_string); -- return base::string16(date_string.getBuffer(), -- static_cast<size_t>(date_string.length())); -+ return base::i18n::UnicodeStringToString16(date_string); - } - - } // namespace -diff --git a/chromeos/settings/timezone_settings.cc b/chromeos/settings/timezone_settings.cc -index 38ea65d653ac..63aa4c02f260 100644 ---- a/chromeos/settings/timezone_settings.cc -+++ b/chromeos/settings/timezone_settings.cc -@@ -12,6 +12,7 @@ - #include "base/bind.h" - #include "base/files/file_path.h" - #include "base/files/file_util.h" -+#include "base/i18n/unicodestring.h" - #include "base/location.h" - #include "base/logging.h" - #include "base/macros.h" -@@ -478,8 +479,7 @@ TimezoneSettings* TimezoneSettings::GetInstance() { - // static - base::string16 TimezoneSettings::GetTimezoneID(const icu::TimeZone& timezone) { - icu::UnicodeString id; -- timezone.getID(id); -- return base::string16(id.getBuffer(), id.length()); -+ return base::i18n::UnicodeStringToString16(timezone.getID(id)); - } - - } // namespace system -diff --git a/components/autofill/core/browser/autofill_profile_comparator.cc b/components/autofill/core/browser/autofill_profile_comparator.cc -index edfe2450d679..227a5901c683 100644 ---- a/components/autofill/core/browser/autofill_profile_comparator.cc -+++ b/components/autofill/core/browser/autofill_profile_comparator.cc -@@ -9,6 +9,7 @@ - - #include "base/i18n/case_conversion.h" - #include "base/i18n/char_iterator.h" -+#include "base/i18n/unicodestring.h" - #include "base/strings/string_piece.h" - #include "base/strings/string_split.h" - #include "base/strings/string_util.h" -@@ -128,7 +129,7 @@ base::string16 AutofillProfileComparator::NormalizeForComparison( - - icu::UnicodeString value = icu::UnicodeString(result.data(), result.length()); - transliterator_->transliterate(value); -- return base::string16(value.getBuffer(), value.length()); -+ return base::i18n::UnicodeStringToString16(value); - } - - bool AutofillProfileComparator::AreMergeable(const AutofillProfile& p1, -diff --git a/components/autofill/core/browser/credit_card.cc b/components/autofill/core/browser/credit_card.cc -index 75a34c75a260..76867e0391c2 100644 ---- a/components/autofill/core/browser/credit_card.cc -+++ b/components/autofill/core/browser/credit_card.cc -@@ -12,6 +12,8 @@ - #include <string> - - #include "base/guid.h" -+#include "base/i18n/time_formatting.h" -+#include "base/i18n/unicodestring.h" - #include "base/logging.h" - #include "base/macros.h" - #include "base/metrics/histogram_macros.h" -@@ -806,7 +808,8 @@ bool CreditCard::ConvertMonth(const base::string16& month, - int32_t num_months; - const icu::UnicodeString* months = date_format_symbols.getMonths(num_months); - for (int32_t i = 0; i < num_months; ++i) { -- const base::string16 icu_month(months[i].getBuffer(), months[i].length()); -+ const base::string16 icu_month( -+ base::i18n::UnicodeStringToString16(months[i])); - if (compare.StringsEqual(icu_month, month)) { - *num = i + 1; // Adjust from 0-indexed to 1-indexed. - return true; -@@ -819,7 +822,7 @@ bool CreditCard::ConvertMonth(const base::string16& month, - base::string16 trimmed_month; - base::TrimString(month, ASCIIToUTF16("."), &trimmed_month); - for (int32_t i = 0; i < num_months; ++i) { -- base::string16 icu_month(months[i].getBuffer(), months[i].length()); -+ base::string16 icu_month(base::i18n::UnicodeStringToString16(months[i])); - base::TrimString(icu_month, ASCIIToUTF16("."), &icu_month); - if (compare.StringsEqual(icu_month, trimmed_month)) { - *num = i + 1; // Adjust from 0-indexed to 1-indexed. -diff --git a/content/browser/android/date_time_chooser_android.cc b/content/browser/android/date_time_chooser_android.cc -index ba20ad53bd5c..28b6d03344f0 100644 ---- a/content/browser/android/date_time_chooser_android.cc -+++ b/content/browser/android/date_time_chooser_android.cc -@@ -9,6 +9,7 @@ - #include "base/android/jni_android.h" - #include "base/android/jni_string.h" - #include "base/i18n/char_iterator.h" -+#include "base/i18n/unicodestring.h" - #include "content/common/date_time_suggestion.h" - #include "content/common/view_messages.h" - #include "content/public/browser/render_view_host.h" -@@ -36,8 +37,7 @@ base::string16 SanitizeSuggestionString(const base::string16& string) { - sanitized.append(c); - sanitized_iterator.Advance(); - } -- return base::string16(sanitized.getBuffer(), -- static_cast<size_t>(sanitized.length())); -+ return base::i18n::UnicodeStringToString16(sanitized); - } - - } // namespace -diff --git a/content/renderer/android/email_detector.cc b/content/renderer/android/email_detector.cc -index 564f3417305f..1a0db8b07a85 100644 ---- a/content/renderer/android/email_detector.cc -+++ b/content/renderer/android/email_detector.cc -@@ -62,8 +62,8 @@ bool EmailDetector::FindContent(const base::string16::const_iterator& begin, - DCHECK(U_SUCCESS(status)); - icu::UnicodeString content_ustr(matcher->group(status)); - DCHECK(U_SUCCESS(status)); -- base::UTF16ToUTF8(content_ustr.getBuffer(), content_ustr.length(), -- content_text); -+ content_text->clear(); -+ content_ustr.toUTF8String(*content_text); - return true; - } - -diff --git a/ios/chrome/browser/notification_promo_unittest.cc b/ios/chrome/browser/notification_promo_unittest.cc -index 830d9c5f65a0..d5356e8e6dcb 100644 ---- a/ios/chrome/browser/notification_promo_unittest.cc -+++ b/ios/chrome/browser/notification_promo_unittest.cc -@@ -34,18 +34,14 @@ bool YearFromNow(double* date_epoch, std::string* date_string) { - UErrorCode status = U_ZERO_ERROR; - icu::SimpleDateFormat simple_formatter(icu::UnicodeString(kDateFormat), - icu::Locale("en_US"), status); -- if (!U_SUCCESS(status)) -- return false; -- - icu::UnicodeString date_unicode_string; - simple_formatter.format(static_cast<UDate>(*date_epoch * 1000), - date_unicode_string, status); -- if (!U_SUCCESS(status)) -+ if (U_FAILURE(status)) - return false; - -- return base::UTF16ToUTF8(date_unicode_string.getBuffer(), -- static_cast<size_t>(date_unicode_string.length()), -- date_string); -+ date_unicode_string.toUTF8String(*date_string); -+ return true; - } - - } // namespace -diff --git a/net/ftp/ftp_util.cc b/net/ftp/ftp_util.cc -index 00b23b7c10b7..e9331ab3818b 100644 ---- a/net/ftp/ftp_util.cc -+++ b/net/ftp/ftp_util.cc -@@ -9,6 +9,7 @@ - - #include "base/i18n/case_conversion.h" - #include "base/i18n/char_iterator.h" -+#include "base/i18n/unicodestring.h" - #include "base/logging.h" - #include "base/macros.h" - #include "base/memory/singleton.h" -@@ -175,8 +176,8 @@ class AbbreviatedMonthsMap { - format_symbols.getShortMonths(months_count); - - for (int32_t month = 0; month < months_count; month++) { -- base::string16 month_name(months[month].getBuffer(), -- static_cast<size_t>(months[month].length())); -+ base::string16 month_name( -+ base::i18n::UnicodeStringToString16(months[month])); - - // Ignore the case of the month names. The simplest way to handle that - // is to make everything lowercase. -diff --git a/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp b/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp -index 07d10a31ffde..4dab06aa19a5 100644 ---- a/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp -+++ b/third_party/WebKit/Source/core/html/forms/EmailInputType.cpp -@@ -23,6 +23,9 @@ - - #include "core/html/forms/EmailInputType.h" - -+#include <unicode/idna.h> -+#include <unicode/unistr.h> -+#include <unicode/uvernum.h> - #include "bindings/core/v8/ScriptRegexp.h" - #include "core/InputTypeNames.h" - #include "core/html/HTMLInputElement.h" -@@ -31,8 +34,10 @@ - #include "platform/text/PlatformLocale.h" - #include "public/platform/Platform.h" - #include "wtf/text/StringBuilder.h" --#include <unicode/idna.h> --#include <unicode/unistr.h> -+ -+#if U_ICU_VERSION_MAJOR_NUM >= 59 -+#include <unicode/char16ptr.h> -+#endif - - namespace blink { - -@@ -87,7 +92,11 @@ String EmailInputType::convertEmailAddressToASCII(const ScriptRegexp& regexp, - - StringBuilder builder; - builder.append(address, 0, atPosition + 1); -+#if U_ICU_VERSION_MAJOR_NUM >= 59 -+ builder.append(icu::toUCharPtr(domainName.getBuffer()), domainName.length()); -+#else - builder.append(domainName.getBuffer(), domainName.length()); -+#endif - String asciiEmail = builder.toString(); - return isValidEmailAddress(regexp, asciiEmail) ? asciiEmail : address; - } -diff --git a/third_party/sfntly/src/cpp/src/sample/chromium/subsetter_impl.cc b/third_party/sfntly/src/cpp/src/sample/chromium/subsetter_impl.cc -index c53e607..17452e1 100644 ---- a/third_party/sfntly/src/cpp/src/sample/chromium/subsetter_impl.cc -+++ b/third_party/sfntly/src/cpp/src/sample/chromium/subsetter_impl.cc -@@ -23,6 +23,8 @@ - #include <map> - #include <set> - -+#include <unicode/unistr.h> -+ - #include "sfntly/table/bitmap/eblc_table.h" - #include "sfntly/table/bitmap/ebdt_table.h" - #include "sfntly/table/bitmap/index_sub_table.h" --- -2.14.3 diff --git a/dev-util/electron/files/chromium-icu-60-r0.patch b/dev-util/electron/files/chromium-icu-60-r0.patch deleted file mode 100644 index f6f98497ba09..000000000000 --- a/dev-util/electron/files/chromium-icu-60-r0.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 020c458932087a7da9b514563c3926be5a406d55 Mon Sep 17 00:00:00 2001 -From: Jungshik Shin <jshin@chromium.org> -Date: Mon, 4 Dec 2017 09:42:01 -0500 -Subject: [PATCH] Disallow 5 aspirational scripts in IDN display - -UTS 31 (http://www.unicode.org/reports/tr31/#Aspirational_Use_Scripts ) -used to list 5 scripts in Table 6 as 'aspirational scripts', but it -deprecated the category and moved 5 scripts to Table 7 for limited use -scripts. - -Given this, there's no basis to treat those 5 scripts differently from -other limited use scripts. Note that Mozilla stopped allowding those 5 -scripts in IDN display a while ago. - -This is also necessary for updating ICU to version 60. ---- - components/url_formatter/url_formatter.cc | 33 ------------------------------- - 1 file changed, 33 deletions(-) - -diff --git a/components/url_formatter/url_formatter.cc b/components/url_formatter/url_formatter.cc -index a93bf1154c..6b000c3480 100644 ---- a/components/url_formatter/url_formatter.cc -+++ b/components/url_formatter/url_formatter.cc -@@ -426,39 +426,6 @@ void IDNSpoofChecker::SetAllowedUnicodeSet(UErrorCode* status) { - const icu::UnicodeSet* inclusion_set = uspoof_getInclusionUnicodeSet(status); - allowed_set.addAll(*inclusion_set); - -- // Five aspirational scripts are taken from UTR 31 Table 6 at -- // http://www.unicode.org/reports/tr31/#Aspirational_Use_Scripts . -- // Not all the characters of aspirational scripts are suitable for -- // identifiers. Therefore, only characters belonging to -- // [:Identifier_Type=Aspirational:] (listed in 'Status/Type=Aspirational' -- // section at -- // http://www.unicode.org/Public/security/latest/xidmodifications.txt) are -- // are added to the allowed set. The list has to be updated when a new -- // version of Unicode is released. The current version is 9.0.0 and ICU 60 -- // will have Unicode 10.0 data. --#if U_ICU_VERSION_MAJOR_NUM < 60 -- const icu::UnicodeSet aspirational_scripts( -- icu::UnicodeString( -- // Unified Canadian Syllabics -- "[\\u1401-\\u166C\\u166F-\\u167F" -- // Mongolian -- "\\u1810-\\u1819\\u1820-\\u1877\\u1880-\\u18AA" -- // Unified Canadian Syllabics -- "\\u18B0-\\u18F5" -- // Tifinagh -- "\\u2D30-\\u2D67\\u2D7F" -- // Yi -- "\\uA000-\\uA48C" -- // Miao -- "\\U00016F00-\\U00016F44\\U00016F50-\\U00016F7E" -- "\\U00016F8F-\\U00016F9F]", -- -1, US_INV), -- *status); -- allowed_set.addAll(aspirational_scripts); --#else --#error "Update aspirational_scripts per Unicode 10.0" --#endif -- - // U+0338 is included in the recommended set, while U+05F4 and U+2027 are in - // the inclusion set. However, they are blacklisted as a part of Mozilla's - // IDN blacklist (http://kb.mozillazine.org/Network.IDN.blacklist_chars). --- -2.14.3 - diff --git a/dev-util/electron/files/chromium-last-commit-position-r0.patch b/dev-util/electron/files/chromium-last-commit-position-r0.patch deleted file mode 100644 index 344ed4c7deb7..000000000000 --- a/dev-util/electron/files/chromium-last-commit-position-r0.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- tools/gn/gn_main.cc.orig 2015-11-12 11:49:56.260549036 +0000 -+++ tools/gn/gn_main.cc 2015-11-12 11:50:14.780931485 +0000 -@@ -11,13 +11,7 @@ - #include "tools/gn/standard_out.h" - #include "tools/gn/switches.h" - --// Only the GN-generated build makes this header for now. --// TODO(brettw) consider adding this if we need it in GYP. --#if defined(GN_BUILD) --#include "tools/gn/last_commit_position.h" --#else - #define LAST_COMMIT_POSITION "UNKNOWN" --#endif - - namespace { - ---- tools/gn/BUILD.gn.orig 2015-11-12 11:50:43.513524769 +0000 -+++ tools/gn/BUILD.gn 2015-11-12 11:50:57.697817632 +0000 -@@ -227,7 +227,6 @@ - - deps = [ - ":gn_lib", -- ":last_commit_position", - "//base", - "//build/config/sanitizers:deps", - ] diff --git a/dev-util/electron/files/chromium-linker-warnings-r0.patch b/dev-util/electron/files/chromium-linker-warnings-r0.patch deleted file mode 100644 index 97d5e1670bdb..000000000000 --- a/dev-util/electron/files/chromium-linker-warnings-r0.patch +++ /dev/null @@ -1,18 +0,0 @@ ---- build/config/compiler/BUILD.gn.orig 2016-05-30 13:50:15.341749039 +0000 -+++ build/config/compiler/BUILD.gn 2016-05-30 13:50:30.502061407 +0000 -@@ -203,15 +203,6 @@ - cflags += [ "-fstack-protector" ] - } - } -- -- # Linker warnings. -- if (!(is_chromeos && current_cpu == "arm") && -- !(is_android && use_order_profiling) && !is_mac && !is_ios) { -- # TODO(jochen): Enable this on chromeos on arm. http://crbug.com/356580 -- # TODO(lizeb,pasko): Fix link errors when linking with order_profiling=1 -- # crbug.com/485542 -- ldflags += [ "-Wl,--fatal-warnings" ] -- } - } - - if (is_clang && is_debug) { diff --git a/dev-util/electron/files/chromium-lto-fixes-r1.patch b/dev-util/electron/files/chromium-lto-fixes-r1.patch deleted file mode 100644 index b8bd8558b520..000000000000 --- a/dev-util/electron/files/chromium-lto-fixes-r1.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/build/common.gypi.orig b/build/common.gypi -index cce7b3c..3b905c0 100644 ---- a/build/common.gypi.orig -+++ b/build/common.gypi -@@ -6096,7 +6096,7 @@ - 'target_conditions': [ - ['_toolset=="target"', { - 'ldflags': [ -- '-flto=32', -+ '-flto=4' - ], - }], - ], -@@ -6248,7 +6248,7 @@ - }, - }], - # TODO(pcc): Make these flags work correctly with CFI. -- ['use_lto!=0 and cfi_vptr==0', { -+ ['use_lto!=0 and cfi_vptr==0 and clang==1', { - 'target_defaults': { - 'target_conditions': [ - ['_toolset=="target"', { - -diff --git a/build/android/disable_gcc_lto.gypi.orig b/build/android/disable_gcc_lto.gypi -index a733c7a..57570f8 100644 ---- a/build/android/disable_gcc_lto.gypi.orig -+++ b/build/android/disable_gcc_lto.gypi -@@ -8,7 +8,7 @@ - 'target_conditions': [ - ['_toolset=="target"', { - 'conditions': [ -- ['OS=="android" and clang==0 and (use_lto==1 or use_lto_o2==1)', { -+ ['(OS=="android" or OS=="linux") and clang==0 and (use_lto==1 or use_lto_o2==1)', { - 'cflags!': [ - '-flto', - '-ffat-lto-objects', diff --git a/dev-util/electron/files/chromium-lto-fixes-r3.patch b/dev-util/electron/files/chromium-lto-fixes-r3.patch deleted file mode 100644 index 10493e6fd388..000000000000 --- a/dev-util/electron/files/chromium-lto-fixes-r3.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 2f2028a19fd12477fcd9050ea354174f33b68b46 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 21 Aug 2017 10:16:44 -0400 -Subject: [PATCH] LTO fixes - ---- - build/config/compiler/BUILD.gn | 35 +++++++++++++++++++++++++---------- - build/config/posix/BUILD.gn | 2 +- - build/toolchain/gcc_ar_wrapper.py | 12 +++++++++++- - 3 files changed, 37 insertions(+), 12 deletions(-) - -diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index d0510b8..583f186 100644 ---- a/build/config/compiler/BUILD.gn -+++ b/build/config/compiler/BUILD.gn -@@ -448,20 +448,35 @@ config("compiler") { - } else { - # Note: ThinLTO does not currently have this feature implemented - # For Full LTO, it provides a measurable runtime speedup of Chrome. -- cflags += [ -- "-flto", -- "-fwhole-program-vtables", -- ] -- ldflags += [ -- "-flto", -- "-fwhole-program-vtables", -- ] -+ if (is_clang) { -+ cflags += [ -+ "-flto", -+ "-fwhole-program-vtables" -+ ] -+ ldflags += [ -+ "-flto", -+ "-fwhole-program-vtables" -+ ] -+ } else { -+ cflags += [ -+ "-flto=4", -+ "-fno-fat-lto-objects", -+ "-fuse-linker-plugin", -+ "--param=lto-partitions=1", -+ ] -+ ldflags += [ -+ "-flto=4", -+ "-fno-fat-lto-objects", -+ "-fuse-linker-plugin", -+ "--param=lto-partitions=1", -+ ] -+ } - - # Apply a lower LTO optimization level as the default is too slow. - if (is_linux) { - if (use_lld) { - ldflags += [ "-Wl,--lto-O1" ] -- } else { -+ } else if (is_clang) { - ldflags += [ "-Wl,-plugin-opt,O1" ] - } - } else if (is_mac) { -@@ -478,7 +493,7 @@ config("compiler") { - # targeting ARM, without this flag, LTO produces a .text section that is - # larger than the maximum call displacement, preventing the linker from - # relocating calls (http://llvm.org/PR22999). -- if (is_linux) { -+ if (is_linux && is_clang) { - ldflags += [ "-Wl,-plugin-opt,-function-sections" ] - } - } -diff --git a/build/config/posix/BUILD.gn b/build/config/posix/BUILD.gn -index d7e917a..fc68864 100644 ---- a/build/config/posix/BUILD.gn -+++ b/build/config/posix/BUILD.gn -@@ -21,7 +21,7 @@ config("compiler") { - if ((allow_posix_link_time_opt || is_cfi) && !is_nacl) { - arflags = [ - "--plugin", -- rebase_path("$clang_base_path/lib/LLVMgold.so", root_build_dir), -+ "auto" - ] - } - } -diff --git a/build/toolchain/gcc_ar_wrapper.py b/build/toolchain/gcc_ar_wrapper.py -index de53df0..39c7b56 100755 ---- a/build/toolchain/gcc_ar_wrapper.py -+++ b/build/toolchain/gcc_ar_wrapper.py -@@ -47,7 +47,17 @@ def main(): - - command = [args.ar, args.operation] - if args.plugin is not None: -- command += ['--plugin', args.plugin] -+ if args.plugin == 'auto': -+ gcc = os.environ.get('CC', '/usr/bin/cc') -+ gcc_ver = subprocess.check_output([gcc, '-dumpversion'], -+ universal_newlines=True) -+ gcc_ver = gcc_ver.strip(' \n') -+ plugin = '/usr/libexec/gcc/x86_64-pc-linux-gnu/{}/liblto_plugin.so'. \ -+ format(gcc_ver) -+ else: -+ plugin = args.plugin -+ -+ command += ['--plugin', plugin] - command.append(args.output) - command += args.inputs - --- -2.14.1 - diff --git a/dev-util/electron/files/chromium-lto-fixes.patch b/dev-util/electron/files/chromium-lto-fixes.patch deleted file mode 100644 index 7de3df1b26f6..000000000000 --- a/dev-util/electron/files/chromium-lto-fixes.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/build/common.gypi.orig b/build/common.gypi -index cce7b3c..3b905c0 100644 ---- a/build/common.gypi.orig -+++ b/build/common.gypi -@@ -6096,7 +6096,7 @@ - 'target_conditions': [ - ['_toolset=="target"', { - 'ldflags': [ -- '-flto=32', -+ '-flto=4' - ], - }], - ], -diff --git a/build/android/disable_gcc_lto.gypi.orig b/build/android/disable_gcc_lto.gypi -index a733c7a..57570f8 100644 ---- a/build/android/disable_gcc_lto.gypi.orig -+++ b/build/android/disable_gcc_lto.gypi -@@ -8,7 +8,7 @@ - 'target_conditions': [ - ['_toolset=="target"', { - 'conditions': [ -- ['OS=="android" and clang==0 and (use_lto==1 or use_lto_o2==1)', { -+ ['(OS=="android" or OS=="linux") and clang==0 and (use_lto==1 or use_lto_o2==1)', { - 'cflags!': [ - '-flto', - '-ffat-lto-objects', diff --git a/dev-util/electron/files/chromium-pdfium-r0.patch b/dev-util/electron/files/chromium-pdfium-r0.patch deleted file mode 100644 index 2ba268467ef8..000000000000 --- a/dev-util/electron/files/chromium-pdfium-r0.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- third_party/pdfium/xfa/fxbarcode/utils.h.orig 2016-05-30 10:24:54.071773744 +0000 -+++ third_party/pdfium/xfa/fxbarcode/utils.h 2016-05-30 10:25:15.808219373 +0000 -@@ -26,12 +26,10 @@ - #endif - #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_) - #define FXSYS_isnan(x) _isnan(x) --#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_) -+#elif(_FX_OS_ == _FX_MACOSX_ || _FX_OS_ == _FX_IOS_ || \ -+ _FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_) - #include <cmath> - #define FXSYS_isnan(x) std::isnan(x) --#elif(_FX_OS_ == _FX_LINUX_DESKTOP_ || _FX_OS_ == _FX_ANDROID_) --#include <math.h> --#define FXSYS_isnan(x) isnan(x) - #endif - #if (_FX_OS_ == _FX_WIN32_DESKTOP_ || _FX_OS_ == _FX_WIN64_) - #define FXSYS_nan() (std::numeric_limits<float>::quiet_NaN()) diff --git a/dev-util/electron/files/chromium-python3-compat-r0.patch b/dev-util/electron/files/chromium-python3-compat-r0.patch deleted file mode 100644 index d91ea8a4c1b1..000000000000 --- a/dev-util/electron/files/chromium-python3-compat-r0.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/v8/gypfiles/detect_v8_host_arch.py b/v8/gypfiles/detect_v8_host_arch.py -index 89e8286..cc61946 100644 ---- a/v8/gypfiles/detect_v8_host_arch.py -+++ b/v8/gypfiles/detect_v8_host_arch.py -@@ -28,13 +28,15 @@ - - """Outputs host CPU architecture in format recognized by gyp.""" - -+from __future__ import print_function -+ - import platform - import re - import sys - - - def main(): -- print DoMain([]) -+ print(DoMain([])) - return 0 - - def DoMain(_): -diff --git a/v8/gypfiles/toolchain.gypi b/v8/gypfiles/toolchain.gypi -index 95eb1d9..1ec652a 100644 ---- a/v8/gypfiles/toolchain.gypi -+++ b/v8/gypfiles/toolchain.gypi -@@ -40,7 +40,7 @@ - 'has_valgrind%': 0, - 'coverage%': 0, - 'v8_target_arch%': '<(target_arch)', -- 'v8_host_byteorder%': '<!(python -c "import sys; print sys.byteorder")', -+ 'v8_host_byteorder%': '<!(python -c "from __future__ import print_function; import sys; print(sys.byteorder)")', - 'force_dynamic_crt%': 0, - - # Setting 'v8_can_use_vfp32dregs' to 'true' will cause V8 to use the VFP diff --git a/dev-util/electron/files/chromium-remove-gardiner-mod-font-r1.patch b/dev-util/electron/files/chromium-remove-gardiner-mod-font-r1.patch deleted file mode 100644 index f59549094107..000000000000 --- a/dev-util/electron/files/chromium-remove-gardiner-mod-font-r1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/components/test_runner/BUILD.gn~ b/components/test_runner/BUILD.gn -index 3ac8955..6a968cb 100644 ---- a/components/test_runner/BUILD.gn~ -+++ b/components/test_runner/BUILD.gn -@@ -155,8 +155,6 @@ if (use_x11) { - copy("copy_x11_fonts") { - visibility = [ ":*" ] - sources = [ -- "//third_party/gardiner_mod/GardinerModBug.ttf", -- "//third_party/gardiner_mod/GardinerModCat.ttf", - "resources/fonts/fonts.conf", - ] - outputs = [ diff --git a/dev-util/electron/files/chromium-remove-gardiner-mod-font.patch b/dev-util/electron/files/chromium-remove-gardiner-mod-font.patch deleted file mode 100644 index cf1955ffbfd2..000000000000 --- a/dev-util/electron/files/chromium-remove-gardiner-mod-font.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/test_runner.gyp b/test_runner.gyp -index 30ffa75..8838bdf 100644 ---- a/components/test_runner/test_runner.gyp -+++ b/components/test_runner/test_runner.gyp -@@ -162,8 +162,6 @@ - 'files': [ - 'resources/fonts/AHEM____.TTF', - 'resources/fonts/fonts.conf', -- '../../third_party/gardiner_mod/GardinerModBug.ttf', -- '../../third_party/gardiner_mod/GardinerModCat.ttf', - ] - }], - }], diff --git a/dev-util/electron/files/chromium-shared-v8-r1.patch b/dev-util/electron/files/chromium-shared-v8-r1.patch deleted file mode 100644 index eb4d998d9b03..000000000000 --- a/dev-util/electron/files/chromium-shared-v8-r1.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/v8/src/v8.gyp.orig b/v8/src/v8.gyp -index bcb5801..3162456 100644 ---- a/v8/src/v8.gyp.orig -+++ b/v8/src/v8.gyp -@@ -48,8 +48,8 @@ - }, { - 'toolsets': ['target'], - }], -- ['component=="shared_library"', { -- 'type': '<(component)', -+ ['v8_target_type=="shared_library"', { -+ 'type': 'shared_library', - 'sources': [ - # Note: on non-Windows we still build this file so that gyp - # has some sources to link into the component. diff --git a/dev-util/electron/files/chromium-shared-v8-r2.patch b/dev-util/electron/files/chromium-shared-v8-r2.patch deleted file mode 100644 index 82d87d48d9fc..000000000000 --- a/dev-util/electron/files/chromium-shared-v8-r2.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/v8/gni/v8.gni.orig b/v8/gni/v8.gni -index 264c1de..df17239 100644 ---- a/v8/gni/v8.gni.orig -+++ b/v8/gni/v8.gni -@@ -114,13 +114,7 @@ template("v8_executable") { - } - - template("v8_component") { -- if (is_electron_build && !is_component_build && -- (target_name == "v8_libbase" || target_name == "v8_libplatform")) { -- v8_component = "source_set" -- } else { -- v8_component = component_electron -- } -- target(v8_component, target_name) { -+ component(target_name) { - forward_variables_from(invoker, "*", [ "configs" ]) - configs += invoker.configs - configs -= v8_remove_configs diff --git a/dev-util/electron/files/chromium-shared-v8.patch b/dev-util/electron/files/chromium-shared-v8.patch deleted file mode 100644 index 67d97c8b3974..000000000000 --- a/dev-util/electron/files/chromium-shared-v8.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/v8/tools/gyp/v8.gyp.orig b/v8/tools/gyp/v8.gyp -index bcb5801..3162456 100644 ---- a/v8/tools/gyp/v8.gyp.orig -+++ b/v8/tools/gyp/v8.gyp -@@ -48,8 +48,8 @@ - }, { - 'toolsets': ['target'], - }], -- ['component=="shared_library"', { -- 'type': '<(component)', -+ ['v8_target_type=="shared_library"', { -+ 'type': 'shared_library', - 'sources': [ - # Note: on non-Windows we still build this file so that gyp - # has some sources to link into the component. diff --git a/dev-util/electron/files/chromium-snapshot-toolchain-r1.patch b/dev-util/electron/files/chromium-snapshot-toolchain-r1.patch deleted file mode 100644 index 56f35b303077..000000000000 --- a/dev-util/electron/files/chromium-snapshot-toolchain-r1.patch +++ /dev/null @@ -1,23 +0,0 @@ ---- v8/snapshot_toolchain.gni.orig 2016-01-07 15:47:46.772435180 +0000 -+++ v8/snapshot_toolchain.gni 2016-01-07 15:48:06.144841801 +0000 -@@ -28,19 +28,4 @@ - # The snapshot needs to be compiled for the host, but compiled with - # a toolchain that matches the bit-width of the target. - --# TODO(GYP): For now we only support 32-bit little-endian target builds from an --# x64 Linux host. Eventually we need to support all of the host/target --# configurations v8 runs on. --if (host_cpu == "x64" && host_os == "linux") { -- if (target_cpu == "arm" || target_cpu == "mipsel" || target_cpu == "x86") { -- snapshot_toolchain = "//build/toolchain/linux:clang_x86" -- } else if (target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "mips64el") { -- snapshot_toolchain = "//build/toolchain/linux:clang_x64" -- } else { -- assert(false, "Need environment for this arch: $target_cpu") -- } --} else { -- snapshot_toolchain = default_toolchain --} -- -- -+snapshot_toolchain = default_toolchain diff --git a/dev-util/electron/files/chromium-system-ffmpeg-r0.patch b/dev-util/electron/files/chromium-system-ffmpeg-r0.patch deleted file mode 100644 index 667e0ecb2a72..000000000000 --- a/dev-util/electron/files/chromium-system-ffmpeg-r0.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h -index 677bd76..23a21f8 100644 ---- a/media/ffmpeg/ffmpeg_common.h -+++ b/media/ffmpeg/ffmpeg_common.h -@@ -19,20 +19,12 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp --// file or the headers below will generate different structures. --#define FF_API_PIX_FMT_DESC 0 --#define FF_API_OLD_DECODE_AUDIO 0 --#define FF_API_DESTRUCT_PACKET 0 --#define FF_API_GET_BUFFER 0 - - // Temporarily disable possible loss of data warning. - // TODO(scherkus): fix and upstream the compiler warnings. - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> --#include <libavformat/internal.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> -diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc -index 155e980..7ba327a 100644 ---- a/media/filters/ffmpeg_demuxer.cc -+++ b/media/filters/ffmpeg_demuxer.cc -@@ -966,24 +966,6 @@ void FFmpegDemuxer::OnFindStreamInfoDone(const PipelineStatusCB& status_cb, - // If no estimate is found, the stream entry will be kInfiniteDuration(). - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration()); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast<int64>(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast<int64>(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- if (packet_pts < start_time_estimates[stream->index]) -- start_time_estimates[stream->index] = packet_pts; -- } -- packet_buffer = packet_buffer->next; -- } -- } - - AVStream* audio_stream = NULL; - AudioDecoderConfig audio_config; diff --git a/dev-util/electron/files/chromium-system-ffmpeg-r2.patch b/dev-util/electron/files/chromium-system-ffmpeg-r2.patch deleted file mode 100644 index 8d67ef3898df..000000000000 --- a/dev-util/electron/files/chromium-system-ffmpeg-r2.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- a/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:01:56.155462264 +0000 -+++ b/media/ffmpeg/ffmpeg_common.h 2015-11-27 12:03:03.348846300 +0000 -@@ -19,10 +19,6 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of BUILD.gn file & --// ffmpeg.gyp file or the headers below will generate different structures! --#define FF_API_CONVERGENCE_DURATION 0 - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -36,7 +32,6 @@ - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> --#include <libavformat/internal.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> -diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc -index 155e980..7ba327a 100644 ---- a/media/filters/ffmpeg_demuxer.cc -+++ b/media/filters/ffmpeg_demuxer.cc -@@ -1034,24 +1034,6 @@ - // If no estimate is found, the stream entry will be kInfiniteDuration(). - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration()); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- if (packet_pts < start_time_estimates[stream->index]) -- start_time_estimates[stream->index] = packet_pts; -- } -- packet_buffer = packet_buffer->next; -- } -- } - - AVStream* audio_stream = NULL; - AudioDecoderConfig audio_config; diff --git a/dev-util/electron/files/chromium-system-ffmpeg-r4.patch b/dev-util/electron/files/chromium-system-ffmpeg-r4.patch deleted file mode 100644 index 3abfc163e8a2..000000000000 --- a/dev-util/electron/files/chromium-system-ffmpeg-r4.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/media/ffmpeg/ffmpeg_common.h.orig 2016-09-09 13:16:07.757294768 +0000 -+++ b/media/ffmpeg/ffmpeg_common.h 2016-09-09 13:16:41.705989273 +0000 -@@ -22,10 +22,6 @@ - - // Include FFmpeg header files. - extern "C" { --// Disable deprecated features which result in spammy compile warnings. This --// list of defines must mirror those in the 'defines' section of FFmpeg's --// BUILD.gn file or the headers below will generate different structures! --#define FF_API_CONVERGENCE_DURATION 0 - // Upstream libavcodec/utils.c still uses the deprecated - // av_dup_packet(), causing deprecation warnings. - // The normal fix for such things is to disable the feature as below, -@@ -35,7 +35,6 @@ - MSVC_PUSH_DISABLE_WARNING(4244); - #include <libavcodec/avcodec.h> - #include <libavformat/avformat.h> --#include <libavformat/internal.h> - #include <libavformat/avio.h> - #include <libavutil/avutil.h> - #include <libavutil/imgutils.h> ---- a/media/filters/ffmpeg_demuxer.cc.orig 2016-09-09 14:21:40.185828912 +0000 -+++ b/media/filters/ffmpeg_demuxer.cc 2016-09-09 14:21:52.894089352 +0000 -@@ -1185,24 +1185,6 @@ - // If no estimate is found, the stream entry will be kInfiniteDuration. - std::vector<base::TimeDelta> start_time_estimates(format_context->nb_streams, - kInfiniteDuration); -- const AVFormatInternal* internal = format_context->internal; -- if (internal && internal->packet_buffer && -- format_context->start_time != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- struct AVPacketList* packet_buffer = internal->packet_buffer; -- while (packet_buffer != internal->packet_buffer_end) { -- DCHECK_LT(static_cast<size_t>(packet_buffer->pkt.stream_index), -- start_time_estimates.size()); -- const AVStream* stream = -- format_context->streams[packet_buffer->pkt.stream_index]; -- if (packet_buffer->pkt.pts != static_cast<int64_t>(AV_NOPTS_VALUE)) { -- const base::TimeDelta packet_pts = -- ConvertFromTimeBase(stream->time_base, packet_buffer->pkt.pts); -- if (packet_pts < start_time_estimates[stream->index]) -- start_time_estimates[stream->index] = packet_pts; -- } -- packet_buffer = packet_buffer->next; -- } -- } - - std::unique_ptr<MediaTracks> media_tracks(new MediaTracks()); - diff --git a/dev-util/electron/files/chromium-system-icu-r0.patch b/dev-util/electron/files/chromium-system-icu-r0.patch deleted file mode 100644 index 484a1974e812..000000000000 --- a/dev-util/electron/files/chromium-system-icu-r0.patch +++ /dev/null @@ -1,140 +0,0 @@ -From 520c62f2b87a42bf4f8f8820f6bcde15e342fe4a Mon Sep 17 00:00:00 2001 -From: floppymaster <floppymaster@gmail.com> -Date: Mon, 12 Jun 2017 09:44:54 -0700 -Subject: [PATCH] ICU unbundling fixes - -Update instructions to generate ICU header lists -Update header list for unbundling ICU 59 - -Bug: https://bugs.gentoo.org/619796#c2 -Review-Url: https://codereview.chromium.org/2935603002 -Cr-Commit-Position: refs/heads/master@{#478662} ---- - build/linux/unbundle/icu.gn | 29 +++++++++++++++++------------ - 1 file changed, 17 insertions(+), 12 deletions(-) - -diff --git a/build/linux/unbundle/icu.gn b/build/linux/unbundle/icu.gn -index f3734b7a01a3..5bdd91555df7 100644 ---- a/build/linux/unbundle/icu.gn -+++ b/build/linux/unbundle/icu.gn -@@ -16,6 +16,7 @@ config("icu_config") { - defines = [ - "USING_SYSTEM_ICU=1", - "ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC", -+ "UCHAR_TYPE=uint16_t", - ] - } - -@@ -50,10 +51,9 @@ source_set("icuuc") { - shim_headers("icui18n_shim") { - root_path = "source/i18n" - headers = [ -- # This list can easily be updated using the command below: -- # find third_party/icu/source/i18n/unicode \ -- # -iname '*.h' -printf '"%p",\n' | \ -- # sed -e 's|third_party/icu/i18n/common/||' | sort -u -+ # This list can easily be updated using the commands below: -+ # cd third_party/icu/source/i18n -+ # find unicode -iname '*.h' -printf ' "%p",\n' | LC_ALL=C sort -u - "unicode/alphaindex.h", - "unicode/basictz.h", - "unicode/calendar.h", -@@ -78,7 +78,6 @@ shim_headers("icui18n_shim") { - "unicode/fpositer.h", - "unicode/gender.h", - "unicode/gregocal.h", -- "unicode/locdspnm.h", - "unicode/measfmt.h", - "unicode/measunit.h", - "unicode/measure.h", -@@ -113,15 +112,12 @@ shim_headers("icui18n_shim") { - "unicode/ucol.h", - "unicode/ucoleitr.h", - "unicode/ucsdet.h", -- "unicode/ucurr.h", - "unicode/udat.h", - "unicode/udateintervalformat.h", - "unicode/udatpg.h", -- "unicode/udisplaycontext.h", - "unicode/ufieldpositer.h", - "unicode/uformattable.h", - "unicode/ugender.h", -- "unicode/uldnames.h", - "unicode/ulocdata.h", - "unicode/umsg.h", - "unicode/unirepl.h", -@@ -130,6 +126,7 @@ shim_headers("icui18n_shim") { - "unicode/upluralrules.h", - "unicode/uregex.h", - "unicode/uregion.h", -+ "unicode/ureldatefmt.h", - "unicode/usearch.h", - "unicode/uspoof.h", - "unicode/utmscale.h", -@@ -141,20 +138,22 @@ shim_headers("icui18n_shim") { - shim_headers("icuuc_shim") { - root_path = "source/common" - headers = [ -- # This list can easily be updated using the command below: -- # find third_party/icu/source/common/unicode \ -- # -iname '*.h' -printf '"%p",\n' | \ -- # sed -e 's|third_party/icu/source/common/||' | sort -u -+ # This list can easily be updated using the commands below: -+ # cd third_party/icu/source/common -+ # find unicode -iname '*.h' -printf ' "%p",\n' | LC_ALL=C sort -u - "unicode/appendable.h", - "unicode/brkiter.h", - "unicode/bytestream.h", - "unicode/bytestrie.h", - "unicode/bytestriebuilder.h", - "unicode/caniter.h", -+ "unicode/casemap.h", -+ "unicode/char16ptr.h", - "unicode/chariter.h", - "unicode/dbbi.h", - "unicode/docmain.h", - "unicode/dtintrv.h", -+ "unicode/edits.h", - "unicode/enumset.h", - "unicode/errorcode.h", - "unicode/filteredbrk.h", -@@ -163,6 +162,7 @@ shim_headers("icuuc_shim") { - "unicode/idna.h", - "unicode/listformatter.h", - "unicode/localpointer.h", -+ "unicode/locdspnm.h", - "unicode/locid.h", - "unicode/messagepattern.h", - "unicode/normalizer2.h", -@@ -176,12 +176,14 @@ shim_headers("icuuc_shim") { - "unicode/rep.h", - "unicode/resbund.h", - "unicode/schriter.h", -+ "unicode/simpleformatter.h", - "unicode/std_string.h", - "unicode/strenum.h", - "unicode/stringpiece.h", - "unicode/stringtriebuilder.h", - "unicode/symtable.h", - "unicode/ubidi.h", -+ "unicode/ubiditransform.h", - "unicode/ubrk.h", - "unicode/ucasemap.h", - "unicode/ucat.h", -@@ -195,10 +197,13 @@ shim_headers("icuuc_shim") { - "unicode/ucnv_err.h", - "unicode/ucnvsel.h", - "unicode/uconfig.h", -+ "unicode/ucurr.h", - "unicode/udata.h", -+ "unicode/udisplaycontext.h", - "unicode/uenum.h", - "unicode/uidna.h", - "unicode/uiter.h", -+ "unicode/uldnames.h", - "unicode/ulistformatter.h", - "unicode/uloc.h", - "unicode/umachine.h", --- -2.14.3 - diff --git a/dev-util/electron/files/chromium-system-jinja-r7.patch b/dev-util/electron/files/chromium-system-jinja-r7.patch deleted file mode 100644 index fe28e12c333c..000000000000 --- a/dev-util/electron/files/chromium-system-jinja-r7.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- third_party/WebKit/Source/bindings/scripts/scripts.gyp.orig 2014-08-19 09:55:10.330972228 +0000 -+++ third_party/WebKit/Source/bindings/scripts/scripts.gyp 2014-08-19 09:55:26.387286232 +0000 -@@ -54,7 +54,6 @@ - 'actions': [{ - 'action_name': 'cache_jinja_templates', - 'inputs': [ -- '<@(jinja_module_files)', - 'code_generator_v8.py', - '<@(code_generator_template_files)', - ], ---- third_party/WebKit/Source/build/scripts/scripts.gypi.orig 2014-08-19 10:00:00.216521733 +0000 -+++ third_party/WebKit/Source/build/scripts/scripts.gypi 2014-08-19 10:00:11.464735099 +0000 -@@ -2,10 +2,6 @@ - { - 'variables': { - 'scripts_for_in_files': [ -- # jinja2/__init__.py contains version string, so sufficient as -- # dependency for whole jinja2 package -- '<(DEPTH)/third_party/jinja2/__init__.py', -- '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep - 'hasher.py', - 'in_file.py', - 'in_generator.py', ---- third_party/WebKit/Source/bindings/scripts/scripts.gypi.orig 2014-08-19 10:53:02.824618979 +0000 -+++ third_party/WebKit/Source/bindings/scripts/scripts.gypi 2014-08-19 10:53:20.784957370 +0000 -@@ -12,9 +12,6 @@ - '<(DEPTH)/third_party/markupsafe/__init__.py', # jinja2 dep - ], - 'idl_lexer_parser_files': [ -- # PLY (Python Lex-Yacc) -- '<(DEPTH)/third_party/ply/lex.py', -- '<(DEPTH)/third_party/ply/yacc.py', - # Web IDL lexer/parser (base parser) - '<(DEPTH)/tools/idl_parser/idl_lexer.py', - '<(DEPTH)/tools/idl_parser/idl_node.py', diff --git a/dev-util/electron/files/chromium-system-zlib-r0.patch b/dev-util/electron/files/chromium-system-zlib-r0.patch deleted file mode 100644 index 3bf38e5904fa..000000000000 --- a/dev-util/electron/files/chromium-system-zlib-r0.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- build/linux/unbundle/zlib.gn.orig 2016-05-30 13:09:56.987716771 +0000 -+++ build/linux/unbundle/zlib.gn 2016-05-30 13:12:36.879014187 +0000 -@@ -9,11 +9,16 @@ - headers = [ "zlib.h" ] - } - -+config("system_zlib") { -+ defines = [ "USE_SYSTEM_ZLIB=1" ] -+} -+ - source_set("zlib") { - deps = [ - ":zlib_shim", - ] - libs = [ "z" ] -+ public_configs = [ ":system_zlib" ] - } - - shim_headers("minizip_shim") { diff --git a/dev-util/electron/files/chromium-v8-icu-59-r0.patch b/dev-util/electron/files/chromium-v8-icu-59-r0.patch deleted file mode 100644 index d963db9db93b..000000000000 --- a/dev-util/electron/files/chromium-v8-icu-59-r0.patch +++ /dev/null @@ -1,83 +0,0 @@ -From fd5b3e755df541b44128caed625215017ef59989 Mon Sep 17 00:00:00 2001 -From: jshin <jshin@chromium.org> -Date: Thu, 9 Mar 2017 12:01:15 -0800 -Subject: [PATCH] Prepare for ICU's switch to char16_t - -ICU's UChar was uint16_t (non-Win) or wchar_t (Windows). It's switching -to char16_t in both C/C++ API. It needs some changes. Fortunately, -v8 needs only a couple of changes because v8 has been using -reinterpret_cast in many places calling ICU API. - -This change was confirmed to work fine with ICU-59-to-be. - -BUG=v8:6062 -TEST=trybot - -Review-Url: https://codereview.chromium.org/2738503008 -Cr-Commit-Position: refs/heads/master@{#43707} ---- - src/i18n.cc | 12 +++++++++++- - src/runtime/runtime-i18n.cc | 10 ++++++---- - 2 files changed, 17 insertions(+), 5 deletions(-) - -diff --git a/v8/src/i18n.cc b/v8/src/i18n.cc -index d2245ef34a9..7c22871ff5e 100644 ---- a/v8/src/i18n.cc -+++ b/v8/src/i18n.cc -@@ -30,8 +30,13 @@ - #include "unicode/ucol.h" - #include "unicode/ucurr.h" - #include "unicode/unum.h" -+#include "unicode/uvernum.h" - #include "unicode/uversion.h" - -+#if U_ICU_VERSION_MAJOR_NUM >= 59 -+#include "unicode/char16ptr.h" -+#endif -+ - namespace v8 { - namespace internal { - -@@ -270,8 +275,13 @@ icu::DecimalFormat* CreateICUNumberFormat( - } - - UErrorCode status_digits = U_ZERO_ERROR; -+#if U_ICU_VERSION_MAJOR_NUM >= 59 - uint32_t fraction_digits = ucurr_getDefaultFractionDigits( -- currency.getTerminatedBuffer(), &status_digits); -+ icu::toUCharPtr(currency.getTerminatedBuffer()), &status_digits); -+#else -+ uint32_t fraction_digits = ucurr_getDefaultFractionDigits( -+ currency.getTerminatedBuffer(), &status_digits); -+#endif - if (U_SUCCESS(status_digits)) { - number_format->setMinimumFractionDigits(fraction_digits); - number_format->setMaximumFractionDigits(fraction_digits); -diff --git a/v8/src/runtime/runtime-i18n.cc b/v8/src/runtime/runtime-i18n.cc -index 0b453819146..e89175a37db 100644 ---- a/v8/src/runtime/runtime-i18n.cc -+++ b/v8/src/runtime/runtime-i18n.cc -@@ -43,6 +43,7 @@ - #include "unicode/uloc.h" - #include "unicode/unistr.h" - #include "unicode/unum.h" -+#include "unicode/ustring.h" - #include "unicode/uversion.h" - - -@@ -609,10 +610,11 @@ RUNTIME_FUNCTION(Runtime_InternalCompare) { - String::FlatContent flat2 = string2->GetFlatContent(); - std::unique_ptr<uc16[]> sap1; - std::unique_ptr<uc16[]> sap2; -- const UChar* string_val1 = GetUCharBufferFromFlat(flat1, &sap1, length1); -- const UChar* string_val2 = GetUCharBufferFromFlat(flat2, &sap2, length2); -- result = -- collator->compare(string_val1, length1, string_val2, length2, status); -+ icu::UnicodeString string_val1( -+ FALSE, GetUCharBufferFromFlat(flat1, &sap1, length1), length1); -+ icu::UnicodeString string_val2( -+ FALSE, GetUCharBufferFromFlat(flat2, &sap2, length2), length2); -+ result = collator->compare(string_val1, string_val2, status); - } - if (U_FAILURE(status)) return isolate->ThrowIllegalOperation(); - diff --git a/dev-util/electron/files/electron-0.36.12-vendor-brightray.patch b/dev-util/electron/files/electron-0.36.12-vendor-brightray.patch deleted file mode 100644 index 7acbe04ff9d7..000000000000 --- a/dev-util/electron/files/electron-0.36.12-vendor-brightray.patch +++ /dev/null @@ -1,144 +0,0 @@ -From 4ec57d1c20b841c6121a77f1539b0c759a031904 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:14:58 -0500 -Subject: [PATCH] brightray build fixes - ---- - brightray.gyp | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- - brightray.gypi | 21 ++++++++------------- - 2 files changed, 56 insertions(+), 17 deletions(-) - -diff --git a/brightray.gyp b/brightray.gyp -index d7120ea..d0fd603 100644 ---- a/brightray.gyp -+++ b/brightray.gyp -@@ -1,7 +1,7 @@ - { - 'variables': { - # The libraries brightray will be compiled to. -- 'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gconf-2.0 gmodule-2.0 nss' -+ 'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gmodule-2.0 nss' - }, - 'includes': [ - 'filenames.gypi', -@@ -9,6 +9,11 @@ - 'targets': [ - { - 'target_name': 'brightray', -+ 'dependencies': [ -+ 'cups', -+ 'gconf', -+ '<(libchromiumcontent_src_dir)/chromiumcontent/chromiumcontent.gyp:chromiumcontent_all' -+ ], - 'type': 'static_library', - 'include_dirs': [ - '.', -@@ -100,12 +105,9 @@ - }, { - 'link_settings': { - 'libraries': [ -- # Link with ffmpeg. -- '<(libchromiumcontent_dir)/libffmpeg.so', - # Following libraries are required by libchromiumcontent: - '-lasound', - '-lcap', -- '-lcups', - '-lrt', - '-ldl', - '-lresolv', -@@ -274,5 +276,47 @@ - }], # OS=="win" - ], - }, -+ { -+ 'target_name': 'gconf', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_gconf==1 and _toolset=="target"', { -+ 'direct_dependent_settings': { -+ 'cflags': [ -+ '<!@(<(pkg-config) --cflags gconf-2.0)', -+ ], -+ 'defines': [ -+ 'USE_GCONF', -+ ], -+ }, -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)', -+ ], -+ 'libraries': [ -+ '<!@(<(pkg-config) --libs-only-l gconf-2.0)', -+ ], -+ }, -+ }], -+ ], -+ }, -+ { -+ 'target_name': 'cups', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_cups==1', { -+ 'direct_dependent_settings': { -+ 'defines': [ -+ 'USE_CUPS', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lcups', -+ ], -+ }, -+ }, -+ }], -+ ], -+ }, - ], - } -diff --git a/brightray.gypi b/brightray.gypi -index 4513fa9..95bdfa1 100644 ---- a/brightray.gypi -+++ b/brightray.gypi -@@ -1,9 +1,14 @@ - { -- 'includes': [ -- 'vendor/download/libchromiumcontent/filenames.gypi', -- ], - 'variables': { - 'libchromiumcontent_component%': 1, -+ 'libchromiumcontent_src_dir': '<(DEPTH)', -+ 'libchromiumcontent_shared_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)', -+ 'libchromiumcontent_static_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)', -+ 'libchromiumcontent_shared_libraries': [], -+ 'libchromiumcontent_static_libraries': [], -+ 'libchromiumcontent_shared_v8_libraries': [], -+ 'libchromiumcontent_static_v8_libraries': [], -+ 'pkg-config%': 'pkg-config', - 'conditions': [ - # The "libchromiumcontent_component" is defined when calling "gyp". - ['libchromiumcontent_component', { -@@ -258,22 +263,12 @@ - 'conditions': [ - ['OS=="linux"', { - 'cflags': [ -- '-O2', -- # Generate symbols, will be stripped later. -- '-g', -- # Don't emit the GCC version ident directives, they just end up -- # in the .comment section taking up binary size. -- '-fno-ident', - # Put data and code in their own sections, so that unused symbols - # can be removed at link time with --gc-sections. - '-fdata-sections', - '-ffunction-sections', - ], - 'ldflags': [ -- # Specifically tell the linker to perform optimizations. -- # See http://lwn.net/Articles/192624/ . -- '-Wl,-O1', -- '-Wl,--as-needed', - '-Wl,--gc-sections', - ], - }], # OS=="linux" --- -2.7.3 - diff --git a/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch b/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch deleted file mode 100644 index 168d8db477a9..000000000000 --- a/dev-util/electron/files/electron-0.36.12-vendor-libchromiumcontent.patch +++ /dev/null @@ -1,75 +0,0 @@ -From b7022129450eaf2136746f5332956e76848796ef Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:12:12 -0500 -Subject: [PATCH] libchromiumcontent build fixes - ---- - chromiumcontent/chromiumcontent.gyp | 6 +++--- - chromiumcontent/chromiumcontent.gypi | 26 -------------------------- - 2 files changed, 3 insertions(+), 29 deletions(-) - -diff --git a/chromiumcontent/chromiumcontent.gyp b/chromiumcontent/chromiumcontent.gyp -index 52a1d36..db74a52 100644 ---- a/chromiumcontent/chromiumcontent.gyp -+++ b/chromiumcontent/chromiumcontent.gyp -@@ -24,11 +24,11 @@ - }, - { - 'target_name': 'chromiumcontent', -- # Build chromiumcontent as shared_library otherwise some static libraries -- # will not build. -- 'type': 'shared_library', -+ 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base_prefs', -+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', -+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', - '<(DEPTH)/components/components.gyp:cdm_renderer', - '<(DEPTH)/components/components.gyp:devtools_discovery', - '<(DEPTH)/components/components.gyp:devtools_http_handler', -diff --git a/chromiumcontent/chromiumcontent.gypi b/chromiumcontent/chromiumcontent.gypi -index 37c572b..3f4dcea 100644 ---- a/chromiumcontent/chromiumcontent.gypi -+++ b/chromiumcontent/chromiumcontent.gypi -@@ -1,17 +1,5 @@ - { - 'variables': { -- # Enalbe using proprietary codecs. -- 'proprietary_codecs': 1, -- 'ffmpeg_branding': 'Chrome', -- # Enable support for Widevine CDM. -- 'enable_widevine': 1, -- # Using libc++ requires building for >= 10.7. -- 'mac_deployment_target': '10.8', -- # The 10.8 SDK does not work well with C++11. -- 'mac_sdk_min': '10.9', -- # Use the standard way of linking with msvc runtime. -- 'win_use_allocator_shim': 0, -- 'win_release_RuntimeLibrary': '2', - # The V8 libraries. - 'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]', - # The icu libraries. -@@ -22,20 +10,6 @@ - 'v8_use_external_startup_data': 1, - }], - ['OS=="linux"', { -- # Enable high DPI support on Linux. -- 'enable_hidpi': 1, -- # Use Dbus. -- 'use_dbus': 1, -- # Make Linux build contain debug symbols, this flag will add '-g' to -- # cflags. -- 'linux_dump_symbols': 1, -- # The Linux build of libchromiumcontent.so depends on, but doesn't -- # provide, tcmalloc by default. Disabling tcmalloc here also prevents -- # any conflicts when linking to binaries or libraries that don't use -- # tcmalloc. -- 'linux_use_tcmalloc': 0, -- # Force using gold linker. -- 'linux_use_bundled_gold': 1, - 'conditions': [ - ['target_arch=="arm"', { - 'arm_version': 7, --- -2.4.10 - diff --git a/dev-util/electron/files/electron-0.36.12-vendor-node.patch b/dev-util/electron/files/electron-0.36.12-vendor-node.patch deleted file mode 100644 index 85f34b6178fe..000000000000 --- a/dev-util/electron/files/electron-0.36.12-vendor-node.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 56b57ea7f0c111bfd9c719060cf17346e638fdd1 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Wed, 10 Feb 2016 14:45:13 -0500 -Subject: [PATCH] Build fixes - ---- - node.gyp | 5 +++-- - src/node.cc | 8 -------- - src/node.js | 2 ++ - src/node_main.cc | 2 ++ - 4 files changed, 7 insertions(+), 10 deletions(-) - -diff --git a/node.gyp b/node.gyp -index d431210..fea5e07 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -1,6 +1,7 @@ - { - 'variables': { - 'v8_use_snapshot%': 'false', -+ 'v8_gyp_path%': 'deps/v8/tools/gyp/v8.gyp', - 'node_use_dtrace%': 'false', - 'node_use_lttng%': 'false', - 'node_use_etw%': 'false', -@@ -89,8 +90,8 @@ - 'dependencies': [ - 'node_js2c#host', - 'deps/cares/cares.gyp:cares', -- # 'deps/v8/tools/gyp/v8.gyp:v8', -- # 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' -+ '<(v8_gyp_path):v8', -+ '<(v8_gyp_path):v8_libplatform' - ], - - 'include_dirs': [ -diff --git a/src/node.cc b/src/node.cc -index 7df6053..cbe1538 100644 ---- a/src/node.cc -+++ b/src/node.cc -@@ -4085,15 +4085,11 @@ static void StartNodeInstance(void* arg) { - SealHandleScope seal(isolate); - bool more; - do { --#if 0 - v8::platform::PumpMessageLoop(default_platform, isolate); --#endif - more = uv_run(env->event_loop(), UV_RUN_ONCE); - - if (more == false) { --#if 0 - v8::platform::PumpMessageLoop(default_platform, isolate); --#endif - EmitBeforeExit(env); - - // Emit `beforeExit` if the loop became alive either after emitting -@@ -4153,10 +4149,8 @@ int Start(int argc, char** argv) { - #endif - - const int thread_pool_size = 4; --#if 0 - default_platform = v8::platform::CreateDefaultPlatform(thread_pool_size); - V8::InitializePlatform(default_platform); --#endif - V8::Initialize(); - - int exit_code = 1; -@@ -4173,10 +4167,8 @@ int Start(int argc, char** argv) { - } - V8::Dispose(); - --#if 0 - delete default_platform; - default_platform = nullptr; --#endif - - delete[] exec_argv; - exec_argv = nullptr; -diff --git a/src/node.js b/src/node.js -index 37aa371..a835d0a 100644 ---- a/src/node.js -+++ b/src/node.js -@@ -40,7 +40,9 @@ - startup.globalConsole(); - } // not isRenderer - -+ if (!process.env.ELECTRON_NODE_DISABLE_ASAR_SUPPORT) { - startup.initAsarSupport(); -+ } - - startup.processAssert(); - startup.processConfig(); -diff --git a/src/node_main.cc b/src/node_main.cc -index 58e747e..24949f3 100644 ---- a/src/node_main.cc -+++ b/src/node_main.cc -@@ -40,8 +40,10 @@ int wmain(int argc, wchar_t *wargv[]) { - } - #else - // UNIX -+#include <stdlib.h> - int main(int argc, char *argv[]) { - setvbuf(stderr, NULL, _IOLBF, 1024); -+ putenv("ELECTRON_NODE_DISABLE_ASAR_SUPPORT=1"); - return node::Start(argc, argv); - } - #endif --- -2.7.3 - diff --git a/dev-util/electron/files/electron-0.36.12.patch b/dev-util/electron/files/electron-0.36.12.patch deleted file mode 100644 index ec21b25af508..000000000000 --- a/dev-util/electron/files/electron-0.36.12.patch +++ /dev/null @@ -1,257 +0,0 @@ -From 293b40208c981a3a18a1ccd5c5ea0a50611e2356 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:16:40 -0500 -Subject: [PATCH] electron build fixes - ---- - atom.gyp | 55 +++++++++++++++++++++++++++++++++++++++++++------------ - common.gypi | 29 +++++++++++++++++++++++------ - filenames.gypi | 1 - - tools/js2asar.py | 11 ++++++----- - 4 files changed, 72 insertions(+), 24 deletions(-) - -diff --git a/atom.gyp b/atom.gyp -index 5554adb..61ec47c 100644 ---- a/atom.gyp -+++ b/atom.gyp -@@ -29,6 +29,7 @@ - 'type': 'executable', - 'dependencies': [ - 'js2asar', -+ 'nodebin', - '<(project_name)_lib', - ], - 'sources': [ -@@ -177,7 +178,7 @@ - ], - }, { - 'dependencies': [ -- 'vendor/breakpad/breakpad.gyp:dump_syms#host', -+ 'breakpad/breakpad.gyp:dump_syms#host', - ], - }], # OS=="win" - ['OS=="linux"', { -@@ -194,7 +195,7 @@ - }, { - 'copied_libraries': [ - '<(PRODUCT_DIR)/lib/libnode.so', -- '<(libchromiumcontent_dir)/libffmpeg.so', -+ '<(PRODUCT_DIR)/lib/libv8.so', - ], - }], - ], -@@ -202,9 +203,6 @@ - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<@(copied_libraries)', -- '<(libchromiumcontent_dir)/locales', -- '<(libchromiumcontent_dir)/icudtl.dat', -- '<(libchromiumcontent_dir)/content_shell.pak', - '<(libchromiumcontent_dir)/natives_blob.bin', - '<(libchromiumcontent_dir)/snapshot_blob.bin', - ], -@@ -242,15 +240,14 @@ - '<@(lib_sources)', - ], - 'include_dirs': [ -- '.', - 'chromium_src', -+ '.', - 'vendor/brightray', - 'vendor/native_mate', - # Include atom_natives.h. - '<(SHARED_INTERMEDIATE_DIR)', - # Include directories for uv and node. - 'vendor/node/src', -- 'vendor/node/deps/http_parser', - 'vendor/node/deps/uv/include', - # The `node.h` is using `#include"v8.h"`. - '<(libchromiumcontent_src_dir)/v8/include', -@@ -301,8 +298,8 @@ - 'vendor/node/deps/uv/uv.gyp:libuv', - 'vendor/node/deps/zlib/zlib.gyp:zlib', - # Build with breakpad support. -- 'vendor/breakpad/breakpad.gyp:breakpad_handler', -- 'vendor/breakpad/breakpad.gyp:breakpad_sender', -+ 'breakpad/breakpad.gyp:breakpad_handler', -+ 'breakpad/breakpad.gyp:breakpad_sender', - ], - }], # OS=="win" - ['OS=="mac" and mas_build==0', { -@@ -333,7 +330,7 @@ - # Make binary search for libraries under current directory, so we - # don't have to manually set $LD_LIBRARY_PATH: - # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable -- '-rpath \$$ORIGIN', -+ '-Wl,-rpath=\$$ORIGIN/', - # Make native module dynamic loading work. - '-rdynamic', - ], -@@ -344,10 +341,10 @@ - '-Wno-reserved-user-defined-literal', - ], - 'include_dirs': [ -- 'vendor/breakpad/src', -+ 'breakpad/src', - ], - 'dependencies': [ -- 'vendor/breakpad/breakpad.gyp:breakpad_client', -+ 'breakpad/breakpad.gyp:breakpad_client', - ], - }], # OS=="linux" - ], -@@ -355,6 +352,9 @@ - { - 'target_name': 'js2asar', - 'type': 'none', -+ 'dependencies': [ -+ 'nodebin' -+ ], - 'actions': [ - { - 'action_name': 'js2asar', -@@ -376,6 +376,7 @@ - 'action': [ - 'python', - 'tools/js2asar.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(_outputs)', - '<@(_inputs)', - ], -@@ -403,6 +404,36 @@ - } - ], - }, # target atom_js2c -+ { -+ 'target_name': 'nodebin', -+ 'type': 'executable', -+ 'sources': [ -+ 'vendor/node/src/node_main.cc', -+ ], -+ 'dependencies': [ -+ 'vendor/node/node.gyp:node', -+ ], -+ 'include_dirs': [ -+ '.', -+ 'vendor/native_mate', -+ # Include atom_natives.h. -+ '<(SHARED_INTERMEDIATE_DIR)', -+ # Include directories for uv and node. -+ 'vendor/node/src', -+ 'vendor/node/deps/uv/include', -+ # The `node.h` is using `#include"v8.h"`. -+ '<(libchromiumcontent_src_dir)/v8/include', -+ # The `node.h` is using `#include"ares.h"`. -+ 'vendor/node/deps/cares/include', -+ ], -+ 'link_settings': { -+ 'ldflags': [ -+ '-Wl,-rpath=\$$ORIGIN/', -+ # Make native module dynamic loading work. -+ '-rdynamic', -+ ], -+ }, -+ }, # target nodebin - ], - 'conditions': [ - ['OS=="mac"', { -diff --git a/common.gypi b/common.gypi -index 7c41c36..2da2fea 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -17,12 +17,6 @@ - 'node_target_type': 'shared_library', - 'node_install_npm': 'false', - 'node_prefix': '', -- 'node_shared_cares': 'false', -- 'node_shared_http_parser': 'false', -- 'node_shared_libuv': 'false', -- 'node_shared_openssl': 'false', -- 'node_shared_v8': 'true', -- 'node_shared_zlib': 'false', - 'node_tag': '', - 'node_use_dtrace': 'false', - 'node_use_etw': 'false', -@@ -35,10 +29,33 @@ - 'V8_BASE': '', - 'v8_postmortem_support': 'false', - 'v8_enable_i18n_support': 'false', -+ 'v8_gyp_path': '<(DEPTH)/v8/tools/gyp/v8.gyp', -+ 'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]', -+ 'v8_target_type': 'shared_library', -+ 'v8_use_snapshot': 'true', -+ 'v8_use_external_startup_data': 1, - }, - # Settings to compile node under Windows. - 'target_defaults': { - 'target_conditions': [ -+ ['_target_name in <(v8_libraries) + ["node"]', { -+ 'cflags!': [ -+ '-fvisibility=hidden', -+ '-fdata-sections', -+ '-ffunction-sections', -+ ], -+ 'cflags_cc!': [ -+ '-fvisibility-inlines-hidden' -+ ], -+ }], -+ -+ ['_target_name in <(v8_libraries) + ["mksnapshot"]', { -+ 'defines': [ -+ 'V8_SHARED', -+ 'BUILDING_V8_SHARED', -+ ], -+ }], -+ - ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', { - 'msvs_disabled_warnings': [ - 4013, # 'free' undefined; assuming extern returning int -diff --git a/filenames.gypi b/filenames.gypi -index f9e1955..84999a3 100644 ---- a/filenames.gypi -+++ b/filenames.gypi -@@ -498,7 +498,6 @@ - 'chromium_src/extensions/browser/app_window/size_constraints.h', - 'chromium_src/extensions/common/url_pattern.cc', - 'chromium_src/extensions/common/url_pattern.h', -- 'chromium_src/library_loaders/libspeechd_loader.cc', - 'chromium_src/library_loaders/libspeechd.h', - 'chromium_src/net/test/embedded_test_server/stream_listen_socket.cc', - 'chromium_src/net/test/embedded_test_server/stream_listen_socket.h', -diff --git a/tools/js2asar.py b/tools/js2asar.py -index cb02e33..3d80a11 100755 ---- a/tools/js2asar.py -+++ b/tools/js2asar.py -@@ -11,12 +11,13 @@ SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__)) - - - def main(): -- archive = sys.argv[1] -- js_source_files = sys.argv[2:] -+ node = sys.argv[1] -+ archive = sys.argv[2] -+ js_source_files = sys.argv[3:] - - output_dir = tempfile.mkdtemp() - copy_js(js_source_files, output_dir) -- call_asar(archive, output_dir) -+ call_asar(node, archive, output_dir) - shutil.rmtree(output_dir) - - -@@ -28,10 +29,10 @@ def copy_js(js_source_files, output_dir): - shutil.copy2(source_file, output_path) - - --def call_asar(archive, output_dir): -+def call_asar(node, archive, output_dir): - js_dir = os.path.join(output_dir, 'lib') - asar = os.path.join(SOURCE_ROOT, 'node_modules', 'asar', 'bin', 'asar') -- subprocess.check_call([find_node(), asar, 'pack', js_dir, archive]) -+ subprocess.check_call([node, asar, 'pack', js_dir, archive]) - - - def find_node(): --- -2.7.3 - diff --git a/dev-util/electron/files/electron-0.37.8-vendor-brightray.patch b/dev-util/electron/files/electron-0.37.8-vendor-brightray.patch deleted file mode 100644 index 4c68e4199e91..000000000000 --- a/dev-util/electron/files/electron-0.37.8-vendor-brightray.patch +++ /dev/null @@ -1,143 +0,0 @@ -From e28b41fcc6d59d1774995c5a7b6aa4c634616481 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:14:58 -0500 -Subject: [PATCH] brightray build fixes - ---- - brightray.gyp | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- - brightray.gypi | 20 +++++++------------- - 2 files changed, 55 insertions(+), 17 deletions(-) - -diff --git a/brightray.gyp b/brightray.gyp -index 4a821d1..0897f9d 100644 ---- a/brightray.gyp -+++ b/brightray.gyp -@@ -1,7 +1,7 @@ - { - 'variables': { - # The libraries brightray will be compiled to. -- 'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gconf-2.0 gmodule-2.0 nss' -+ 'linux_system_libraries': 'gtk+-2.0 libnotify dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst gmodule-2.0 nss' - }, - 'includes': [ - 'filenames.gypi', -@@ -9,6 +9,11 @@ - 'targets': [ - { - 'target_name': 'brightray', -+ 'dependencies': [ -+ 'cups', -+ 'gconf', -+ '<(libchromiumcontent_src_dir)/chromiumcontent/chromiumcontent.gyp:chromiumcontent_all' -+ ], - 'type': 'static_library', - 'include_dirs': [ - '.', -@@ -101,12 +106,9 @@ - }, { - 'link_settings': { - 'libraries': [ -- # Link with ffmpeg. -- '<(libchromiumcontent_dir)/libffmpeg.so', - # Following libraries are required by libchromiumcontent: - '-lasound', - '-lcap', -- '-lcups', - '-lrt', - '-ldl', - '-lresolv', -@@ -302,5 +304,47 @@ - }], # OS=="win" - ], - }, -+ { -+ 'target_name': 'gconf', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_gconf==1 and _toolset=="target"', { -+ 'direct_dependent_settings': { -+ 'cflags': [ -+ '<!@(<(pkg-config) --cflags gconf-2.0)', -+ ], -+ 'defines': [ -+ 'USE_GCONF', -+ ], -+ }, -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)', -+ ], -+ 'libraries': [ -+ '<!@(<(pkg-config) --libs-only-l gconf-2.0)', -+ ], -+ }, -+ }], -+ ], -+ }, -+ { -+ 'target_name': 'cups', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_cups==1', { -+ 'direct_dependent_settings': { -+ 'defines': [ -+ 'USE_CUPS', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lcups', -+ ], -+ }, -+ }, -+ }], -+ ], -+ }, - ], - } -diff --git a/brightray.gypi b/brightray.gypi -index 8bae073..95bdfa1 100644 ---- a/brightray.gypi -+++ b/brightray.gypi -@@ -1,9 +1,13 @@ - { -- 'includes': [ -- 'vendor/download/libchromiumcontent/filenames.gypi', -- ], - 'variables': { - 'libchromiumcontent_component%': 1, -+ 'libchromiumcontent_src_dir': '<(DEPTH)', -+ 'libchromiumcontent_shared_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)', -+ 'libchromiumcontent_static_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)', -+ 'libchromiumcontent_shared_libraries': [], -+ 'libchromiumcontent_static_libraries': [], -+ 'libchromiumcontent_shared_v8_libraries': [], -+ 'libchromiumcontent_static_v8_libraries': [], - 'pkg-config%': 'pkg-config', - 'conditions': [ - # The "libchromiumcontent_component" is defined when calling "gyp". -@@ -259,22 +263,12 @@ - 'conditions': [ - ['OS=="linux"', { - 'cflags': [ -- '-O2', -- # Generate symbols, will be stripped later. -- '-g', -- # Don't emit the GCC version ident directives, they just end up -- # in the .comment section taking up binary size. -- '-fno-ident', - # Put data and code in their own sections, so that unused symbols - # can be removed at link time with --gc-sections. - '-fdata-sections', - '-ffunction-sections', - ], - 'ldflags': [ -- # Specifically tell the linker to perform optimizations. -- # See http://lwn.net/Articles/192624/ . -- '-Wl,-O1', -- '-Wl,--as-needed', - '-Wl,--gc-sections', - ], - }], # OS=="linux" --- -2.7.3 - diff --git a/dev-util/electron/files/electron-0.37.8-vendor-libchromiumcontent.patch b/dev-util/electron/files/electron-0.37.8-vendor-libchromiumcontent.patch deleted file mode 100644 index 8115345b077d..000000000000 --- a/dev-util/electron/files/electron-0.37.8-vendor-libchromiumcontent.patch +++ /dev/null @@ -1,71 +0,0 @@ -From bfa42ae7f5251a65fd90a68d0914384b7e63b8ad Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:12:12 -0500 -Subject: [PATCH] libchromiumcontent build fixes - ---- - chromiumcontent/chromiumcontent.gyp | 6 +++--- - chromiumcontent/chromiumcontent.gypi | 22 ---------------------- - 2 files changed, 3 insertions(+), 25 deletions(-) - -diff --git a/chromiumcontent/chromiumcontent.gyp b/chromiumcontent/chromiumcontent.gyp -index ddaa0b9..cc8c7c6 100644 ---- a/chromiumcontent/chromiumcontent.gyp -+++ b/chromiumcontent/chromiumcontent.gyp -@@ -24,11 +24,11 @@ - }, - { - 'target_name': 'chromiumcontent', -- # Build chromiumcontent as shared_library otherwise some static libraries -- # will not build. -- 'type': 'shared_library', -+ 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/base/base.gyp:base_prefs', -+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', -+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', - '<(DEPTH)/components/components.gyp:cdm_renderer', - '<(DEPTH)/components/components.gyp:devtools_discovery', - '<(DEPTH)/components/components.gyp:devtools_http_handler', -diff --git a/chromiumcontent/chromiumcontent.gypi b/chromiumcontent/chromiumcontent.gypi -index 73bc78a..53694e7 100644 ---- a/chromiumcontent/chromiumcontent.gypi -+++ b/chromiumcontent/chromiumcontent.gypi -@@ -1,18 +1,5 @@ - { - 'variables': { -- # Don't use nacl. -- 'disable_nacl': 1, -- # Enalbe using proprietary codecs. -- 'proprietary_codecs': 1, -- # Build ffmpeg as shared library. -- 'ffmpeg_component': 'shared_library', -- # Enable support for Widevine CDM. -- 'enable_widevine': 1, -- # Using libc++ requires building for >= 10.7. -- 'mac_deployment_target': '10.8', -- # Use the standard way of linking with msvc runtime. -- 'win_use_allocator_shim': 0, -- 'win_release_RuntimeLibrary': '2', - # The V8 libraries. - 'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]', - # The icu libraries. -@@ -23,15 +10,6 @@ - 'v8_use_external_startup_data': 1, - }], - ['OS=="linux"', { -- # Enable high DPI support on Linux. -- 'enable_hidpi': 1, -- # Use Dbus. -- 'use_dbus': 1, -- # Make Linux build contain debug symbols, this flag will add '-g' to -- # cflags. -- 'linux_dump_symbols': 1, -- # Force using gold linker. -- 'linux_use_bundled_gold': 1, - 'conditions': [ - ['target_arch=="arm"', { - 'arm_version': 7, --- -2.7.3 - diff --git a/dev-util/electron/files/electron-0.37.8-vendor-node.patch b/dev-util/electron/files/electron-0.37.8-vendor-node.patch deleted file mode 100644 index 6e706c3ab49b..000000000000 --- a/dev-util/electron/files/electron-0.37.8-vendor-node.patch +++ /dev/null @@ -1,105 +0,0 @@ -From ee5dd0d41e8426d6915c4b2b9095674ab4175fee Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Wed, 10 Feb 2016 14:45:13 -0500 -Subject: [PATCH] Build fixes - ---- - lib/internal/bootstrap_node.js | 2 ++ - node.gyp | 5 +++-- - src/node.cc | 8 ++++---- - src/node_main.cc | 2 ++ - 4 files changed, 11 insertions(+), 6 deletions(-) - -diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js -index f2edf80..dd2fdb4 100644 ---- a/lib/internal/bootstrap_node.js -+++ b/lib/internal/bootstrap_node.js -@@ -53,7 +53,9 @@ - setupGlobalConsole(); - } // not isRenderer - -+ if (!process.env.ELECTRON_NODE_DISABLE_ASAR_SUPPORT) { - setupAsarSupport(); -+ } - - const _process = NativeModule.require('internal/process'); - -diff --git a/node.gyp b/node.gyp -index df3bb6a..fbe21d8 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -1,6 +1,7 @@ - { - 'variables': { - 'v8_use_snapshot%': 'false', -+ 'v8_gyp_path%': 'deps/v8/tools/gyp/v8.gyp', - 'node_use_dtrace%': 'false', - 'node_use_lttng%': 'false', - 'node_use_etw%': 'false', -@@ -107,8 +108,8 @@ - 'dependencies': [ - 'node_js2c#host', - 'deps/cares/cares.gyp:cares', -- # 'deps/v8/tools/gyp/v8.gyp:v8', -- # 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' -+ '<(v8_gyp_path):v8', -+ '<(v8_gyp_path):v8_libplatform' - ], - - 'include_dirs': [ -diff --git a/src/node.cc b/src/node.cc -index 66f31d0..961abc2 100644 ---- a/src/node.cc -+++ b/src/node.cc -@@ -4240,13 +4240,13 @@ static void StartNodeInstance(void* arg) { - SealHandleScope seal(isolate); - bool more; - do { --#if 0 -+#if 1 - v8::platform::PumpMessageLoop(default_platform, isolate); - #endif - more = uv_run(env->event_loop(), UV_RUN_ONCE); - - if (more == false) { --#if 0 -+#if 1 - v8::platform::PumpMessageLoop(default_platform, isolate); - #endif - EmitBeforeExit(env); -@@ -4312,7 +4312,7 @@ int Start(int argc, char** argv) { - V8::SetEntropySource(crypto::EntropySource); - #endif - --#if 0 -+#if 1 - default_platform = v8::platform::CreateDefaultPlatform(v8_thread_pool_size); - V8::InitializePlatform(default_platform); - V8::Initialize(); -@@ -4332,7 +4332,7 @@ int Start(int argc, char** argv) { - } - V8::Dispose(); - --#if 0 -+#if 1 - delete default_platform; - default_platform = nullptr; - #endif -diff --git a/src/node_main.cc b/src/node_main.cc -index dce72af..e567cc4 100644 ---- a/src/node_main.cc -+++ b/src/node_main.cc -@@ -48,8 +48,10 @@ int wmain(int argc, wchar_t *wargv[]) { - } - #else - // UNIX -+#include <stdlib.h> - int main(int argc, char *argv[]) { - setvbuf(stderr, NULL, _IOLBF, 1024); -+ putenv("ELECTRON_NODE_DISABLE_ASAR_SUPPORT=1"); - return node::Start(argc, argv); - } - #endif --- -2.7.3 - diff --git a/dev-util/electron/files/electron-0.37.8.patch b/dev-util/electron/files/electron-0.37.8.patch deleted file mode 100644 index 943281cae834..000000000000 --- a/dev-util/electron/files/electron-0.37.8.patch +++ /dev/null @@ -1,391 +0,0 @@ -From 79e5320a6544a24e45d275cf64bff27fbf6289f2 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:16:40 -0500 -Subject: [PATCH] electron build fixes - ---- - common.gypi | 32 ++++++++++++++++++------ - electron.gyp | 62 ++++++++++++++++++++++++++++++++++++++--------- - filenames.gypi | 1 - - toolchain.gypi | 47 +---------------------------------- - tools/atom_source_root.py | 5 ++++ - tools/get-endianness.py | 4 +++ - tools/js2asar.py | 13 +++++----- - 7 files changed, 92 insertions(+), 72 deletions(-) - create mode 100644 tools/atom_source_root.py - create mode 100644 tools/get-endianness.py - -diff --git a/common.gypi b/common.gypi -index 1088beb..2364ebe 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -15,16 +15,11 @@ - 'openssl_fips': '', - 'openssl_no_asm': 1, - 'node_release_urlbase': 'https://atom.io/download/atom-shell', -- 'node_byteorder': '<!(node <(DEPTH)/tools/get-endianness.js)', -+ 'node_byteorder': '<!(python <(DEPTH)/tools/get-endianness.py)', - 'node_target_type': 'shared_library', - 'node_install_npm': 'false', - 'node_prefix': '', -- 'node_shared_cares': 'false', -- 'node_shared_http_parser': 'false', -- 'node_shared_libuv': 'false', -- 'node_shared_openssl': 'false', - 'node_shared_v8': 'true', -- 'node_shared_zlib': 'false', - 'node_tag': '', - 'node_use_dtrace': 'false', - 'node_use_etw': 'false', -@@ -36,11 +31,34 @@ - 'uv_use_dtrace': 'false', - 'V8_BASE': '', - 'v8_postmortem_support': 'false', -- 'v8_enable_i18n_support': 'false', -+ 'v8_enable_i18n_support': 'true', -+ 'v8_gyp_path': '<(DEPTH)/v8/tools/gyp/v8.gyp', -+ 'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]', -+ 'v8_target_type': 'shared_library', -+ 'v8_use_snapshot': 'true', -+ 'v8_use_external_startup_data': 1, - }, - # Settings to compile node under Windows. - 'target_defaults': { - 'target_conditions': [ -+ ['_target_name in <(v8_libraries) + ["node", "electron_lib"]', { -+ 'cflags!': [ -+ '-fvisibility=hidden', -+ '-fdata-sections', -+ '-ffunction-sections', -+ ], -+ 'cflags_cc!': [ -+ '-fvisibility-inlines-hidden' -+ ], -+ }], -+ -+ ['_target_name in <(v8_libraries) + ["mksnapshot"]', { -+ 'defines': [ -+ 'V8_SHARED', -+ 'BUILDING_V8_SHARED', -+ ], -+ }], -+ - ['_target_name in ["libuv", "http_parser", "openssl", "cares", "node", "zlib"]', { - 'msvs_disabled_warnings': [ - 4003, # not enough actual parameters for macro 'V' -diff --git a/electron.gyp b/electron.gyp -index 66ff2fd..e0e782c 100644 ---- a/electron.gyp -+++ b/electron.gyp -@@ -30,6 +30,7 @@ - 'dependencies': [ - 'js2asar', - 'app2asar', -+ 'nodebin', - '<(project_name)_lib', - ], - 'sources': [ -@@ -165,7 +166,7 @@ - ], - }, { - 'dependencies': [ -- 'vendor/breakpad/breakpad.gyp:dump_syms#host', -+ 'breakpad/breakpad.gyp:dump_syms#host', - ], - }], # OS=="win" - ['OS=="linux"', { -@@ -182,7 +183,7 @@ - }, { - 'copied_libraries': [ - '<(PRODUCT_DIR)/lib/libnode.so', -- '<(libchromiumcontent_dir)/libffmpeg.so', -+ '<(PRODUCT_DIR)/lib/libv8.so', - ], - }], - ], -@@ -190,9 +191,6 @@ - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<@(copied_libraries)', -- '<(libchromiumcontent_dir)/locales', -- '<(libchromiumcontent_dir)/icudtl.dat', -- '<(libchromiumcontent_dir)/content_shell.pak', - '<(libchromiumcontent_dir)/natives_blob.bin', - '<(libchromiumcontent_dir)/snapshot_blob.bin', - ], -@@ -216,6 +214,8 @@ - 'GLIB_DISABLE_DEPRECATION_WARNINGS', - # Defined in Chromium but not exposed in its gyp file. - 'V8_USE_EXTERNAL_STARTUP_DATA', -+ 'V8_SHARED', -+ 'USING_V8_SHARED', - 'ENABLE_PLUGINS', - 'ENABLE_PEPPER_CDMS', - 'USE_PROPRIETARY_CODECS', -@@ -224,15 +224,14 @@ - '<@(lib_sources)', - ], - 'include_dirs': [ -- '.', - 'chromium_src', -+ '.', - 'vendor/brightray', - 'vendor/native_mate', - # Include atom_natives.h. - '<(SHARED_INTERMEDIATE_DIR)', - # Include directories for uv and node. - 'vendor/node/src', -- 'vendor/node/deps/http_parser', - 'vendor/node/deps/uv/include', - # The `node.h` is using `#include"v8.h"`. - '<(libchromiumcontent_src_dir)/v8/include', -@@ -283,8 +282,8 @@ - 'vendor/node/deps/uv/uv.gyp:libuv', - 'vendor/node/deps/zlib/zlib.gyp:zlib', - # Build with breakpad support. -- 'vendor/breakpad/breakpad.gyp:breakpad_handler', -- 'vendor/breakpad/breakpad.gyp:breakpad_sender', -+ 'breakpad/breakpad.gyp:breakpad_handler', -+ 'breakpad/breakpad.gyp:breakpad_sender', - ], - }], # OS=="win" - ['OS=="mac" and mas_build==0', { -@@ -318,7 +317,7 @@ - # Make binary search for libraries under current directory, so we - # don't have to manually set $LD_LIBRARY_PATH: - # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable -- '-rpath \$$ORIGIN', -+ '-Wl,-rpath=\$$ORIGIN/', - # Make native module dynamic loading work. - '-rdynamic', - ], -@@ -329,10 +328,10 @@ - '-Wno-reserved-user-defined-literal', - ], - 'include_dirs': [ -- 'vendor/breakpad/src', -+ 'breakpad/src', - ], - 'dependencies': [ -- 'vendor/breakpad/breakpad.gyp:breakpad_client', -+ 'breakpad/breakpad.gyp:breakpad_client', - ], - }], # OS=="linux" - ], -@@ -340,6 +339,9 @@ - { - 'target_name': 'js2asar', - 'type': 'none', -+ 'dependencies': [ -+ 'nodebin' -+ ], - 'actions': [ - { - 'action_name': 'js2asar', -@@ -361,6 +363,7 @@ - 'action': [ - 'python', - 'tools/js2asar.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(_outputs)', - 'lib', - '<@(_inputs)', -@@ -371,6 +374,9 @@ - { - 'target_name': 'app2asar', - 'type': 'none', -+ 'dependencies': [ -+ 'nodebin' -+ ], - 'actions': [ - { - 'action_name': 'app2asar', -@@ -392,6 +398,7 @@ - 'action': [ - 'python', - 'tools/js2asar.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(_outputs)', - 'default_app', - '<@(_inputs)', -@@ -420,6 +427,37 @@ - } - ], - }, # target atom_js2c -+ { -+ 'target_name': 'nodebin', -+ 'type': 'executable', -+ 'sources': [ -+ 'vendor/node/src/node_main.cc', -+ ], -+ 'dependencies': [ -+ 'vendor/node/node.gyp:node', -+ ], -+ 'include_dirs': [ -+ '.', -+ 'vendor/native_mate', -+ # Include atom_natives.h. -+ '<(SHARED_INTERMEDIATE_DIR)', -+ # Include directories for uv and node. -+ 'vendor/node/src', -+ 'vendor/node/deps/http_parser', -+ 'vendor/node/deps/uv/include', -+ # The `node.h` is using `#include"v8.h"`. -+ '<(libchromiumcontent_src_dir)/v8/include', -+ # The `node.h` is using `#include"ares.h"`. -+ 'vendor/node/deps/cares/include', -+ ], -+ 'link_settings': { -+ 'ldflags': [ -+ '-Wl,-rpath=\$$ORIGIN/', -+ # Make native module dynamic loading work. -+ '-rdynamic', -+ ], -+ }, -+ }, # target nodebin - ], - 'conditions': [ - ['OS=="mac"', { -diff --git a/filenames.gypi b/filenames.gypi -index 1c21394..3e07096 100644 ---- a/filenames.gypi -+++ b/filenames.gypi -@@ -516,7 +516,6 @@ - 'chromium_src/extensions/browser/app_window/size_constraints.h', - 'chromium_src/extensions/common/url_pattern.cc', - 'chromium_src/extensions/common/url_pattern.h', -- 'chromium_src/library_loaders/libspeechd_loader.cc', - 'chromium_src/library_loaders/libspeechd.h', - 'chromium_src/net/test/embedded_test_server/stream_listen_socket.cc', - 'chromium_src/net/test/embedded_test_server/stream_listen_socket.h', -diff --git a/toolchain.gypi b/toolchain.gypi -index 11da28f..52c0316 100644 ---- a/toolchain.gypi -+++ b/toolchain.gypi -@@ -16,7 +16,7 @@ - 'arm_neon%': 1, - - # Abosulte path to source root. -- 'source_root%': '<!(node <(DEPTH)/tools/atom_source_root.js)', -+ 'source_root%': '<!(python <(DEPTH)/tools/atom_source_root.py)', - }, - - # Copy conditionally-set variables out one scope. -@@ -40,34 +40,6 @@ - 'mac_sdk%': '<!(python <(DEPTH)/tools/mac/find_sdk.py <(mac_sdk_min))', - }], - -- ['OS=="linux"', { -- 'variables': { -- # The system libdir used for this ABI. -- 'system_libdir%': 'lib', -- -- # Setting the path to sysroot. -- 'conditions': [ -- ['target_arch=="arm"', { -- # sysroot needs to be an absolute path otherwise it generates -- # incorrect results when passed to pkg-config -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot', -- }], -- ['target_arch=="ia32"', { -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot', -- }], -- ['target_arch=="x64"', { -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot', -- }], -- ], -- }, -- # Copy conditionally-set variables out one scope. -- 'sysroot%': '<(sysroot)', -- 'system_libdir%': '<(system_libdir)', -- -- # Redirect pkg-config to search from sysroot. -- 'pkg-config%': '<(source_root)/tools/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', -- }], -- - # Set default compiler flags depending on ARM version. - ['arm_version==6', { - 'arm_arch%': 'armv6', -@@ -136,23 +108,6 @@ - }, - }], - -- # Setup sysroot environment. -- ['OS=="linux" and target_arch in ["arm", "ia32", "x64"]', { -- 'target_defaults': { -- 'target_conditions': [ -- ['_toolset=="target"', { -- 'cflags': [ -- '--sysroot=<(sysroot)', -- ], -- 'ldflags': [ -- '--sysroot=<(sysroot)', -- '<!(<(source_root)/tools/linux/sysroot_ld_path.sh <(sysroot))', -- ], -- }] -- ], -- }, -- }], # sysroot -- - # Setup cross-compilation on Linux. - ['OS=="linux"', { - 'target_defaults': { -diff --git a/tools/atom_source_root.py b/tools/atom_source_root.py -new file mode 100644 -index 0000000..316e997 ---- /dev/null -+++ b/tools/atom_source_root.py -@@ -0,0 +1,5 @@ -+#!/usr/bin/env python -+ -+import os.path -+ -+print(os.path.abspath(os.path.dirname(os.path.dirname(__file__)))) -diff --git a/tools/get-endianness.py b/tools/get-endianness.py -new file mode 100644 -index 0000000..3150793 ---- /dev/null -+++ b/tools/get-endianness.py -@@ -0,0 +1,4 @@ -+#!/usr/bin/env python -+ -+import sys -+print(sys.byteorder) -diff --git a/tools/js2asar.py b/tools/js2asar.py -index 7860176..b08a38d 100755 ---- a/tools/js2asar.py -+++ b/tools/js2asar.py -@@ -11,13 +11,14 @@ SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__)) - - - def main(): -- archive = sys.argv[1] -- folder_name = sys.argv[2] -- source_files = sys.argv[3:] -+ node = sys.argv[1] -+ archive = sys.argv[2] -+ folder_name = sys.argv[3] -+ source_files = sys.argv[4:] - - output_dir = tempfile.mkdtemp() - copy_files(source_files, output_dir) -- call_asar(archive, os.path.join(output_dir, folder_name)) -+ call_asar(node, archive, os.path.join(output_dir, folder_name)) - shutil.rmtree(output_dir) - - -@@ -28,9 +29,9 @@ def copy_files(source_files, output_dir): - shutil.copy2(source_file, output_path) - - --def call_asar(archive, output_dir): -+def call_asar(node, archive, output_dir): - asar = os.path.join(SOURCE_ROOT, 'node_modules', 'asar', 'bin', 'asar') -- subprocess.check_call([find_node(), asar, 'pack', output_dir, archive]) -+ subprocess.check_call([node, asar, 'pack', output_dir, archive]) - - - def find_node(): --- -2.7.3 - diff --git a/dev-util/electron/files/electron-1.3.13-vendor-node.patch b/dev-util/electron/files/electron-1.3.13-vendor-node.patch deleted file mode 100644 index 8db4a0527df2..000000000000 --- a/dev-util/electron/files/electron-1.3.13-vendor-node.patch +++ /dev/null @@ -1,95 +0,0 @@ -From fe90355a9b8db14ad94cae189ccb90cab0800d5b Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Wed, 10 Feb 2016 14:45:13 -0500 -Subject: [PATCH] Build fixes - ---- - lib/internal/bootstrap_node.js | 2 ++ - node.gyp | 13 ++++++++----- - src/node_main.cc | 2 ++ - 3 files changed, 12 insertions(+), 5 deletions(-) - -diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js -index 9505c7b8a..27d7b9da9 100644 ---- a/lib/internal/bootstrap_node.js -+++ b/lib/internal/bootstrap_node.js -@@ -50,7 +50,9 @@ - setupGlobalConsole(); - } - -+ if (!process.env.ELECTRON_NODE_DISABLE_ASAR_SUPPORT) { - setupAsarSupport(); -+ } - - const _process = NativeModule.require('internal/process'); - -diff --git a/node.gyp b/node.gyp -index a6f7e6e5b..5b95c5778 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -1,6 +1,7 @@ - { - 'variables': { - 'v8_use_snapshot%': 'false', -+ 'v8_gyp_path%': 'deps/v8/tools/gyp/v8.gyp', - 'node_use_dtrace%': 'false', - 'node_use_lttng%': 'false', - 'node_use_etw%': 'false', -@@ -127,6 +128,8 @@ - - 'dependencies': [ - 'node_js2c#host', -+ '<(v8_gyp_path):v8', -+ '<(v8_gyp_path):v8_libplatform' - ], - - 'include_dirs': [ -@@ -258,8 +261,8 @@ - }], - [ 'node_use_bundled_v8=="true"', { - 'dependencies': [ -- 'deps/v8/tools/gyp/v8.gyp:v8', -- 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' -+ '<(v8_gyp_path):v8', -+ '<(v8_gyp_path):v8_libplatform' - ], - }], - [ 'node_use_v8_platform=="true"', { -@@ -869,13 +872,13 @@ - }], - [ 'node_use_v8_platform=="true"', { - 'dependencies': [ -- 'deps/v8/tools/gyp/v8.gyp:v8_libplatform', -+ '<(v8_gyp_path):v8_libplatform', - ], - }], - [ 'node_use_bundled_v8=="true"', { - 'dependencies': [ -- 'deps/v8/tools/gyp/v8.gyp:v8', -- 'deps/v8/tools/gyp/v8.gyp:v8_libplatform' -+ '<(v8_gyp_path):v8', -+ '<(v8_gyp_path):v8_libplatform' - ], - }], - ] -diff --git a/src/node_main.cc b/src/node_main.cc -index bde397562..5b5a6dd99 100644 ---- a/src/node_main.cc -+++ b/src/node_main.cc -@@ -49,11 +49,13 @@ int wmain(int argc, wchar_t *wargv[]) { - } - #else - // UNIX -+#include <stdlib.h> - int main(int argc, char *argv[]) { - // Disable stdio buffering, it interacts poorly with printf() - // calls elsewhere in the program (e.g., any logging from V8.) - setvbuf(stdout, nullptr, _IONBF, 0); - setvbuf(stderr, nullptr, _IONBF, 0); -+ putenv("ELECTRON_NODE_DISABLE_ASAR_SUPPORT=1"); - return node::Start(argc, argv); - } - #endif --- -2.11.0 - diff --git a/dev-util/electron/files/electron-1.3.6-vendor-brightray.patch b/dev-util/electron/files/electron-1.3.6-vendor-brightray.patch deleted file mode 100644 index 5f789e784479..000000000000 --- a/dev-util/electron/files/electron-1.3.6-vendor-brightray.patch +++ /dev/null @@ -1,143 +0,0 @@ -From 08a13bec9d06a0ea3d86b8a3126cf83a200a8320 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:14:58 -0500 -Subject: [PATCH] brightray build fixes - ---- - brightray.gyp | 52 ++++++++++++++++++++++++++++++++++++++++++++++++---- - brightray.gypi | 20 +++++++------------- - 2 files changed, 55 insertions(+), 17 deletions(-) - -diff --git a/brightray.gyp b/brightray.gyp -index d089dba..a34b090 100644 ---- a/brightray.gyp -+++ b/brightray.gyp -@@ -1,7 +1,7 @@ - { - 'variables': { - # The libraries brightray will be compiled to. -- 'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss' -+ 'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gmodule-2.0 nss' - }, - 'includes': [ - 'filenames.gypi', -@@ -9,6 +9,11 @@ - 'targets': [ - { - 'target_name': 'brightray', -+ 'dependencies': [ -+ 'cups', -+ 'gconf', -+ '<(libchromiumcontent_src_dir)/chromiumcontent/chromiumcontent.gyp:chromiumcontent_all' -+ ], - 'type': 'static_library', - 'include_dirs': [ - '.', -@@ -104,12 +109,9 @@ - }, { - 'link_settings': { - 'libraries': [ -- # Link with ffmpeg. -- '<(libchromiumcontent_dir)/libffmpeg.so', - # Following libraries are required by libchromiumcontent: - '-lasound', - '-lcap', -- '-lcups', - '-lrt', - '-ldl', - '-lresolv', -@@ -333,5 +335,47 @@ - }], # OS=="win" - ], - }, -+ { -+ 'target_name': 'gconf', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_gconf==1 and _toolset=="target"', { -+ 'direct_dependent_settings': { -+ 'cflags': [ -+ '<!@(<(pkg-config) --cflags gconf-2.0)', -+ ], -+ 'defines': [ -+ 'USE_GCONF', -+ ], -+ }, -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)', -+ ], -+ 'libraries': [ -+ '<!@(<(pkg-config) --libs-only-l gconf-2.0)', -+ ], -+ }, -+ }], -+ ], -+ }, -+ { -+ 'target_name': 'cups', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_cups==1', { -+ 'direct_dependent_settings': { -+ 'defines': [ -+ 'USE_CUPS', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lcups', -+ ], -+ }, -+ }, -+ }], -+ ], -+ }, - ], - } -diff --git a/brightray.gypi b/brightray.gypi -index 634aec0..8d86999 100644 ---- a/brightray.gypi -+++ b/brightray.gypi -@@ -1,9 +1,13 @@ - { -- 'includes': [ -- 'vendor/download/libchromiumcontent/filenames.gypi', -- ], - 'variables': { - 'libchromiumcontent_component%': 1, -+ 'libchromiumcontent_src_dir': '<(DEPTH)', -+ 'libchromiumcontent_shared_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)', -+ 'libchromiumcontent_static_libraries_dir': '<(SHARED_INTERMEDIATE_DIR)', -+ 'libchromiumcontent_shared_libraries': [], -+ 'libchromiumcontent_static_libraries': [], -+ 'libchromiumcontent_shared_v8_libraries': [], -+ 'libchromiumcontent_static_v8_libraries': [], - 'pkg-config%': 'pkg-config', - 'conditions': [ - # The "libchromiumcontent_component" is defined when calling "gyp". -@@ -234,22 +238,12 @@ - 'conditions': [ - ['OS=="linux"', { - 'cflags': [ -- '-O2', -- # Generate symbols, will be stripped later. -- '-g', -- # Don't emit the GCC version ident directives, they just end up -- # in the .comment section taking up binary size. -- '-fno-ident', - # Put data and code in their own sections, so that unused symbols - # can be removed at link time with --gc-sections. - '-fdata-sections', - '-ffunction-sections', - ], - 'ldflags': [ -- # Specifically tell the linker to perform optimizations. -- # See http://lwn.net/Articles/192624/ . -- '-Wl,-O1', -- '-Wl,--as-needed', - '-Wl,--gc-sections', - ], - }], # OS=="linux" --- -2.7.3 - diff --git a/dev-util/electron/files/electron-1.3.6-vendor-libchromiumcontent.patch b/dev-util/electron/files/electron-1.3.6-vendor-libchromiumcontent.patch deleted file mode 100644 index ed3815006164..000000000000 --- a/dev-util/electron/files/electron-1.3.6-vendor-libchromiumcontent.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 0448735817b941e5039616144aa836c2f08c9c54 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:12:12 -0500 -Subject: [PATCH] libchromiumcontent build fixes - ---- - chromiumcontent/chromiumcontent.gyp | 7 ++++--- - chromiumcontent/chromiumcontent.gypi | 21 --------------------- - 2 files changed, 4 insertions(+), 24 deletions(-) - -diff --git a/chromiumcontent/chromiumcontent.gyp b/chromiumcontent/chromiumcontent.gyp -index 5278324..41e7de3 100644 ---- a/chromiumcontent/chromiumcontent.gyp -+++ b/chromiumcontent/chromiumcontent.gyp -@@ -24,11 +24,11 @@ - }, - { - 'target_name': 'chromiumcontent', -- # Build chromiumcontent as shared_library otherwise some static libraries -- # will not build. -- 'type': 'shared_library', -+ 'type': 'static_library', - 'dependencies': [ - '<(DEPTH)/components/prefs/prefs.gyp:prefs', -+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_extra_resources', -+ '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources', - '<(DEPTH)/components/components.gyp:cdm_renderer', - '<(DEPTH)/components/components.gyp:devtools_discovery', - '<(DEPTH)/components/components.gyp:devtools_http_handler', -@@ -41,6 +41,7 @@ - '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_proxy', - '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_ipc', - '<(DEPTH)/ppapi/ppapi_internal.gyp:ppapi_shared', -+ '<(DEPTH)/third_party/WebKit/Source/config.gyp:config', - '<(DEPTH)/third_party/webrtc/modules/modules.gyp:desktop_capture', - '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter', - '<(DEPTH)/third_party/widevine/cdm/widevine_cdm.gyp:widevine_cdm_version_h', -diff --git a/chromiumcontent/chromiumcontent.gypi b/chromiumcontent/chromiumcontent.gypi -index 6d605a2..bd28a21 100644 ---- a/chromiumcontent/chromiumcontent.gypi -+++ b/chromiumcontent/chromiumcontent.gypi -@@ -1,17 +1,5 @@ - { - 'variables': { -- # Don't use nacl. -- 'disable_nacl': 1, -- # Enable using proprietary codecs. -- 'proprietary_codecs': 1, -- # Build ffmpeg as shared library. -- 'ffmpeg_component': 'shared_library', -- # Enable support for Widevine CDM. -- 'enable_widevine': 1, -- # Using libc++ requires building for >= 10.7. -- 'mac_deployment_target': '10.8', -- # Use the standard way of linking with msvc runtime. -- 'win_use_allocator_shim': 0, - # The V8 libraries. - 'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]', - # The icu libraries. -@@ -22,15 +10,6 @@ - 'v8_use_external_startup_data': 1, - }], - ['OS=="linux"', { -- # Enable high DPI support on Linux. -- 'enable_hidpi': 1, -- # Use Dbus. -- 'use_dbus': 1, -- # Make Linux build contain debug symbols, this flag will add '-g' to -- # cflags. -- 'linux_dump_symbols': 1, -- # Force using gold linker. -- 'linux_use_bundled_gold': 1, - 'conditions': [ - ['target_arch=="arm"', { - 'arm_version': 7, --- -2.7.3 - diff --git a/dev-util/electron/files/electron-1.3.6.patch b/dev-util/electron/files/electron-1.3.6.patch deleted file mode 100644 index 57ebe31a27b9..000000000000 --- a/dev-util/electron/files/electron-1.3.6.patch +++ /dev/null @@ -1,422 +0,0 @@ -From d6b2c31fe1b21d171ecedcd2a198bd5b8347bd98 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:16:40 -0500 -Subject: [PATCH] electron build fixes - ---- - common.gypi | 52 ++++++++++++++++++++++++++++++++------ - electron.gyp | 63 ++++++++++++++++++++++++++++++++++++----------- - filenames.gypi | 1 - - toolchain.gypi | 47 +---------------------------------- - tools/atom_source_root.py | 5 ++++ - tools/get-endianness.py | 4 +++ - tools/js2asar.py | 13 +++++----- - 7 files changed, 110 insertions(+), 75 deletions(-) - create mode 100644 tools/atom_source_root.py - create mode 100644 tools/get-endianness.py - -diff --git a/common.gypi b/common.gypi -index 52eba31..55f061a 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -17,24 +17,20 @@ - 'use_openssl_def': 0, - 'OPENSSL_PRODUCT': 'libopenssl.a', - 'node_release_urlbase': 'https://atom.io/download/atom-shell', -- 'node_byteorder': '<!(node <(DEPTH)/tools/get-endianness.js)', -+ 'node_byteorder': '<!(python <(DEPTH)/tools/get-endianness.py)', - 'node_target_type': 'shared_library', - 'node_install_npm': 'false', - 'node_prefix': '', - 'node_shared': 'true', -- 'node_shared_cares': 'false', -- 'node_shared_http_parser': 'false', -- 'node_shared_libuv': 'false', -- 'node_shared_openssl': 'false', - 'node_shared_v8': 'true', -- 'node_shared_zlib': 'false', - 'node_tag': '', -+ 'node_module_version': '', - 'node_use_dtrace': 'false', - 'node_use_etw': 'false', - 'node_use_mdb': 'false', - 'node_use_openssl': 'true', - 'node_use_perfctr': 'false', -- 'node_use_v8_platform': 'false', -+ 'node_use_v8_platform': 'true', - 'node_use_bundled_v8': 'false', - 'uv_library': 'static_library', - 'uv_parent_path': 'vendor/node/deps/uv', -@@ -43,10 +39,37 @@ - 'v8_postmortem_support': 'false', - 'v8_enable_i18n_support': 'false', - 'v8_inspector': 'false', -+ 'v8_gyp_path': '<(DEPTH)/v8/src/v8.gyp', -+ 'v8_libraries': '["v8", "v8_snapshot", "v8_nosnapshot", "v8_external_snapshot", "v8_base", "v8_libbase", "v8_libplatform"]', -+ 'v8_target_type': 'shared_library', -+ 'v8_use_snapshot': 'true', -+ 'v8_use_external_startup_data': 1, - }, - # Settings to compile node under Windows. - 'target_defaults': { - 'target_conditions': [ -+ ['_target_name in <(v8_libraries) + ["node"]', { -+ 'cflags!': [ -+ '-fvisibility=hidden', -+ '-fdata-sections', -+ '-ffunction-sections', -+ ], -+ 'cflags_cc!': [ -+ '-fvisibility-inlines-hidden' -+ ], -+ }], -+ -+ ['_target_name in <(v8_libraries) + ["mksnapshot"]', { -+ 'defines': [ -+ 'V8_SHARED', -+ 'BUILDING_V8_SHARED', -+ ], -+ }], -+ -+ ['_target_name in ["icuuc", "icui18n"]', { -+ 'cflags_cc!': ['-fno-rtti'] -+ }], -+ - ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "node", "zlib"]', { - 'msvs_disabled_warnings': [ - 4003, # not enough actual parameters for macro 'V' -@@ -253,6 +276,21 @@ - }], # OS=="win" - ], - }], -+ ['_target_name=="shell_runner_host_lib"', { -+ 'conditions': [ -+ ['icu_use_data_file_flag==1', { -+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], -+ }, { # else icu_use_data_file_flag !=1 -+ 'conditions': [ -+ ['OS=="win"', { -+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], -+ }, { -+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], -+ }], -+ ], -+ }], -+ ], -+ }], - ], - 'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail. - 'msvs_disabled_warnings': [ -diff --git a/electron.gyp b/electron.gyp -index eb671fd..7253b37 100644 ---- a/electron.gyp -+++ b/electron.gyp -@@ -30,6 +30,7 @@ - 'dependencies': [ - 'js2asar', - 'app2asar', -+ 'nodebin', - '<(project_name)_lib', - ], - 'sources': [ -@@ -164,7 +165,7 @@ - ], - }, { - 'dependencies': [ -- 'vendor/breakpad/breakpad.gyp:dump_syms#host', -+ 'breakpad/breakpad.gyp:dump_syms#host', - ], - }], # OS=="win" - ['OS=="linux"', { -@@ -181,7 +182,7 @@ - }, { - 'copied_libraries': [ - '<(PRODUCT_DIR)/lib/libnode.so', -- '<(libchromiumcontent_dir)/libffmpeg.so', -+ '<(PRODUCT_DIR)/lib/libv8.so', - ], - }], - ], -@@ -189,13 +190,8 @@ - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<@(copied_libraries)', -- '<(libchromiumcontent_dir)/locales', -- '<(libchromiumcontent_dir)/icudtl.dat', -- '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak', -- '<(libchromiumcontent_dir)/content_resources_200_percent.pak', -+ '<(libchromiumcontent_dir)/repack/chrome_200_percent.pak', - '<(libchromiumcontent_dir)/content_shell.pak', -- '<(libchromiumcontent_dir)/ui_resources_200_percent.pak', -- '<(libchromiumcontent_dir)/views_resources_200_percent.pak', - '<(libchromiumcontent_dir)/natives_blob.bin', - '<(libchromiumcontent_dir)/snapshot_blob.bin', - ], -@@ -230,15 +226,14 @@ - '<@(lib_sources)', - ], - 'include_dirs': [ -- '.', - 'chromium_src', -+ '.', - 'vendor/brightray', - 'vendor/native_mate', - # Include atom_natives.h. - '<(SHARED_INTERMEDIATE_DIR)', - # Include directories for uv and node. - 'vendor/node/src', -- 'vendor/node/deps/http_parser', - 'vendor/node/deps/uv/include', - # The `node.h` is using `#include"v8.h"`. - '<(libchromiumcontent_src_dir)/v8/include', -@@ -289,8 +284,8 @@ - 'vendor/node/deps/uv/uv.gyp:libuv', - 'vendor/node/deps/zlib/zlib.gyp:zlib', - # Build with breakpad support. -- 'vendor/breakpad/breakpad.gyp:breakpad_handler', -- 'vendor/breakpad/breakpad.gyp:breakpad_sender', -+ 'breakpad/breakpad.gyp:breakpad_handler', -+ 'breakpad/breakpad.gyp:breakpad_sender', - ], - }], # OS=="win" - ['OS=="mac" and mas_build==0', { -@@ -328,7 +323,7 @@ - # Make binary search for libraries under current directory, so we - # don't have to manually set $LD_LIBRARY_PATH: - # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable -- '-rpath \$$ORIGIN', -+ '-Wl,-rpath=\$$ORIGIN/', - # Make native module dynamic loading work. - '-rdynamic', - ], -@@ -339,10 +334,10 @@ - '-Wno-reserved-user-defined-literal', - ], - 'include_dirs': [ -- 'vendor/breakpad/src', -+ 'breakpad/src', - ], - 'dependencies': [ -- 'vendor/breakpad/breakpad.gyp:breakpad_client', -+ 'breakpad/breakpad.gyp:breakpad_client', - ], - }], # OS=="linux" - ], -@@ -350,6 +345,9 @@ - { - 'target_name': 'js2asar', - 'type': 'none', -+ 'dependencies': [ -+ 'nodebin' -+ ], - 'actions': [ - { - 'action_name': 'js2asar', -@@ -371,6 +369,7 @@ - 'action': [ - 'python', - 'tools/js2asar.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(_outputs)', - 'lib', - '<@(_inputs)', -@@ -381,6 +380,9 @@ - { - 'target_name': 'app2asar', - 'type': 'none', -+ 'dependencies': [ -+ 'nodebin' -+ ], - 'actions': [ - { - 'action_name': 'app2asar', -@@ -402,6 +404,7 @@ - 'action': [ - 'python', - 'tools/js2asar.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(_outputs)', - 'default_app', - '<@(_inputs)', -@@ -430,6 +433,36 @@ - } - ], - }, # target atom_js2c -+ { -+ 'target_name': 'nodebin', -+ 'type': 'executable', -+ 'sources': [ -+ 'vendor/node/src/node_main.cc', -+ ], -+ 'dependencies': [ -+ 'vendor/node/node.gyp:node', -+ ], -+ 'include_dirs': [ -+ '.', -+ 'vendor/native_mate', -+ # Include atom_natives.h. -+ '<(SHARED_INTERMEDIATE_DIR)', -+ # Include directories for uv and node. -+ 'vendor/node/src', -+ 'vendor/node/deps/uv/include', -+ # The `node.h` is using `#include"v8.h"`. -+ '<(libchromiumcontent_src_dir)/v8/include', -+ # The `node.h` is using `#include"ares.h"`. -+ 'vendor/node/deps/cares/include', -+ ], -+ 'link_settings': { -+ 'ldflags': [ -+ '-Wl,-rpath=\$$ORIGIN/', -+ # Make native module dynamic loading work. -+ '-rdynamic', -+ ], -+ }, -+ }, # target nodebin - ], - 'conditions': [ - ['OS=="mac"', { -diff --git a/filenames.gypi b/filenames.gypi -index 9e20582..c7960a9 100644 ---- a/filenames.gypi -+++ b/filenames.gypi -@@ -558,7 +558,6 @@ - 'chromium_src/extensions/browser/app_window/size_constraints.h', - 'chromium_src/extensions/common/url_pattern.cc', - 'chromium_src/extensions/common/url_pattern.h', -- 'chromium_src/library_loaders/libspeechd_loader.cc', - 'chromium_src/library_loaders/libspeechd.h', - 'chromium_src/net/test/embedded_test_server/stream_listen_socket.cc', - 'chromium_src/net/test/embedded_test_server/stream_listen_socket.h', -diff --git a/toolchain.gypi b/toolchain.gypi -index 1c5f8a7..2af11f5 100644 ---- a/toolchain.gypi -+++ b/toolchain.gypi -@@ -16,7 +16,7 @@ - 'arm_neon%': 1, - - # Abosulte path to source root. -- 'source_root%': '<!(node <(DEPTH)/tools/atom_source_root.js)', -+ 'source_root%': '<!(python <(DEPTH)/tools/atom_source_root.py)', - }, - - # Copy conditionally-set variables out one scope. -@@ -40,34 +40,6 @@ - 'mac_sdk%': '<!(python <(DEPTH)/tools/mac/find_sdk.py <(mac_sdk_min))', - }], - -- ['OS=="linux"', { -- 'variables': { -- # The system libdir used for this ABI. -- 'system_libdir%': 'lib', -- -- # Setting the path to sysroot. -- 'conditions': [ -- ['target_arch=="arm"', { -- # sysroot needs to be an absolute path otherwise it generates -- # incorrect results when passed to pkg-config -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot', -- }], -- ['target_arch=="ia32"', { -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot', -- }], -- ['target_arch=="x64"', { -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot', -- }], -- ], -- }, -- # Copy conditionally-set variables out one scope. -- 'sysroot%': '<(sysroot)', -- 'system_libdir%': '<(system_libdir)', -- -- # Redirect pkg-config to search from sysroot. -- 'pkg-config%': '<(source_root)/tools/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', -- }], -- - # Set default compiler flags depending on ARM version. - ['arm_version==6', { - 'arm_arch%': 'armv6', -@@ -136,23 +108,6 @@ - }, - }], - -- # Setup sysroot environment. -- ['OS=="linux" and target_arch in ["arm", "ia32", "x64"]', { -- 'target_defaults': { -- 'target_conditions': [ -- ['_toolset=="target"', { -- 'cflags': [ -- '--sysroot=<(sysroot)', -- ], -- 'ldflags': [ -- '--sysroot=<(sysroot)', -- '<!(<(source_root)/tools/linux/sysroot_ld_path.sh <(sysroot))', -- ], -- }] -- ], -- }, -- }], # sysroot -- - # Setup cross-compilation on Linux. - ['OS=="linux"', { - 'target_defaults': { -diff --git a/tools/atom_source_root.py b/tools/atom_source_root.py -new file mode 100644 -index 0000000..316e997 ---- /dev/null -+++ b/tools/atom_source_root.py -@@ -0,0 +1,5 @@ -+#!/usr/bin/env python -+ -+import os.path -+ -+print(os.path.abspath(os.path.dirname(os.path.dirname(__file__)))) -diff --git a/tools/get-endianness.py b/tools/get-endianness.py -new file mode 100644 -index 0000000..3150793 ---- /dev/null -+++ b/tools/get-endianness.py -@@ -0,0 +1,4 @@ -+#!/usr/bin/env python -+ -+import sys -+print(sys.byteorder) -diff --git a/tools/js2asar.py b/tools/js2asar.py -index adad175..ca76868 100755 ---- a/tools/js2asar.py -+++ b/tools/js2asar.py -@@ -11,13 +11,14 @@ SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__)) - - - def main(): -- archive = sys.argv[1] -- folder_name = sys.argv[2] -- source_files = sys.argv[3:] -+ node = sys.argv[1] -+ archive = sys.argv[2] -+ folder_name = sys.argv[3] -+ source_files = sys.argv[4:] - - output_dir = tempfile.mkdtemp() - copy_files(source_files, output_dir) -- call_asar(archive, os.path.join(output_dir, folder_name)) -+ call_asar(node, archive, os.path.join(output_dir, folder_name)) - shutil.rmtree(output_dir) - - -@@ -28,11 +29,11 @@ def copy_files(source_files, output_dir): - shutil.copy2(source_file, output_path) - - --def call_asar(archive, output_dir): -+def call_asar(node, archive, output_dir): - asar = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'asar') - if sys.platform in ['win32', 'cygwin']: - asar += '.cmd' -- subprocess.check_call([asar, 'pack', output_dir, archive]) -+ subprocess.check_call([node, asar, 'pack', output_dir, archive]) - - - def safe_mkdir(path): --- -2.7.3 - diff --git a/dev-util/electron/files/electron-1.6.15-vendor-breakpad.patch b/dev-util/electron/files/electron-1.6.15-vendor-breakpad.patch deleted file mode 100644 index 15a60c6f1481..000000000000 --- a/dev-util/electron/files/electron-1.6.15-vendor-breakpad.patch +++ /dev/null @@ -1,223 +0,0 @@ -From 6f067da77b786787c6a3c3253198b0516da79904 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 27 Nov 2017 17:26:03 -0500 -Subject: [PATCH] glibc-2.26 compatibility fix - ---- - .../linux/dump_writer_common/ucontext_reader.cc | 30 +++++++++++----------- - .../linux/dump_writer_common/ucontext_reader.h | 10 ++++---- - src/client/linux/handler/exception_handler.cc | 10 ++++---- - src/client/linux/handler/exception_handler.h | 2 +- - .../linux/microdump_writer/microdump_writer.cc | 2 +- - .../linux/minidump_writer/minidump_writer.cc | 2 +- - 6 files changed, 28 insertions(+), 28 deletions(-) - -diff --git a/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/client/linux/dump_writer_common/ucontext_reader.cc -index c80724dd..93b4d9f8 100644 ---- a/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -40,15 +40,15 @@ namespace google_breakpad { - - #if defined(__i386__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_ESP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_EIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -88,15 +88,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__x86_64) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RSP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[REG_RIP]; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - -@@ -145,15 +145,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__ARM_EABI__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.arm_pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - out->context_flags = MD_CONTEXT_ARM_FULL; - - out->iregs[0] = uc->uc_mcontext.arm_r0; -@@ -184,15 +184,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { - - #elif defined(__aarch64__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.sp; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs) { - out->context_flags = MD_CONTEXT_ARM64_FULL; - -@@ -210,15 +210,15 @@ void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc, - - #elif defined(__mips__) - --uintptr_t UContextReader::GetStackPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) { - return uc->uc_mcontext.gregs[MD_CONTEXT_MIPS_REG_SP]; - } - --uintptr_t UContextReader::GetInstructionPointer(const struct ucontext* uc) { -+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - return uc->uc_mcontext.pc; - } - --void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext *uc) { -+void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc) { - #if _MIPS_SIM == _ABI64 - out->context_flags = MD_CONTEXT_MIPS64_FULL; - #elif _MIPS_SIM == _ABIO32 -diff --git a/src/client/linux/dump_writer_common/ucontext_reader.h b/src/client/linux/dump_writer_common/ucontext_reader.h -index b6e77b4b..2369a9ad 100644 ---- a/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -41,21 +41,21 @@ namespace google_breakpad { - - // Wraps platform-dependent implementations of accessors to ucontext structs. - struct UContextReader { -- static uintptr_t GetStackPointer(const struct ucontext* uc); -+ static uintptr_t GetStackPointer(const ucontext_t* uc); - -- static uintptr_t GetInstructionPointer(const struct ucontext* uc); -+ static uintptr_t GetInstructionPointer(const ucontext_t* uc); - - // Juggle a arch-specific ucontext into a minidump format - // out: the minidump structure - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct _libc_fpstate* fp); - #elif defined(__aarch64__) -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc, -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); - #else -- static void FillCPUContext(RawContextCPU *out, const ucontext *uc); -+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc); - #endif - }; - -diff --git a/src/client/linux/handler/exception_handler.cc b/src/client/linux/handler/exception_handler.cc -index 148d61f9..9d53c11e 100644 ---- a/src/client/linux/handler/exception_handler.cc -+++ b/src/client/linux/handler/exception_handler.cc -@@ -439,9 +439,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { - // Fill in all the holes in the struct to make Valgrind happy. - memset(&g_crash_context_, 0, sizeof(g_crash_context_)); - memcpy(&g_crash_context_.siginfo, info, sizeof(siginfo_t)); -- memcpy(&g_crash_context_.context, uc, sizeof(struct ucontext)); -+ memcpy(&g_crash_context_.context, uc, sizeof(ucontext_t)); - #if defined(__aarch64__) -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - struct fpsimd_context* fp_ptr = - (struct fpsimd_context*)&uc_ptr->uc_mcontext.__reserved; - if (fp_ptr->head.magic == FPSIMD_MAGIC) { -@@ -450,9 +450,9 @@ bool ExceptionHandler::HandleSignal(int sig, siginfo_t* info, void* uc) { - } - #elif !defined(__ARM_EABI__) && !defined(__mips__) - // FP state is not part of user ABI on ARM Linux. -- // In case of MIPS Linux FP state is already part of struct ucontext -+ // In case of MIPS Linux FP state is already part of ucontext_t - // and 'float_state' is not a member of CrashContext. -- struct ucontext* uc_ptr = (struct ucontext*)uc; -+ ucontext_t* uc_ptr = (ucontext_t*)uc; - if (uc_ptr->uc_mcontext.fpregs) { - memcpy(&g_crash_context_.float_state, uc_ptr->uc_mcontext.fpregs, - sizeof(g_crash_context_.float_state)); -@@ -476,7 +476,7 @@ bool ExceptionHandler::SimulateSignalDelivery(int sig) { - // ExceptionHandler::HandleSignal(). - siginfo.si_code = SI_USER; - siginfo.si_pid = getpid(); -- struct ucontext context; -+ ucontext_t context; - getcontext(&context); - return HandleSignal(sig, &siginfo, &context); - } -diff --git a/src/client/linux/handler/exception_handler.h b/src/client/linux/handler/exception_handler.h -index 591c3108..846df772 100644 ---- a/src/client/linux/handler/exception_handler.h -+++ b/src/client/linux/handler/exception_handler.h -@@ -191,7 +191,7 @@ class ExceptionHandler { - struct CrashContext { - siginfo_t siginfo; - pid_t tid; // the crashing thread. -- struct ucontext context; -+ ucontext_t context; - #if !defined(__ARM_EABI__) && !defined(__mips__) - // #ifdef this out because FP state is not part of user ABI for Linux ARM. - // In case of MIPS Linux FP state is already part of struct -diff --git a/src/client/linux/microdump_writer/microdump_writer.cc b/src/client/linux/microdump_writer/microdump_writer.cc -index d459d9ec..759f432e 100644 ---- a/src/client/linux/microdump_writer/microdump_writer.cc -+++ b/src/client/linux/microdump_writer/microdump_writer.cc -@@ -416,7 +416,7 @@ class MicrodumpWriter { - - void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); } - -- const struct ucontext* const ucontext_; -+ const ucontext_t* const ucontext_; - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; - #endif -diff --git a/src/client/linux/minidump_writer/minidump_writer.cc b/src/client/linux/minidump_writer/minidump_writer.cc -index f407caa7..407c1e32 100644 ---- a/src/client/linux/minidump_writer/minidump_writer.cc -+++ b/src/client/linux/minidump_writer/minidump_writer.cc -@@ -1240,7 +1240,7 @@ class MinidumpWriter { - const int fd_; // File descriptor where the minidum should be written. - const char* path_; // Path to the file where the minidum should be written. - -- const struct ucontext* const ucontext_; // also from the signal handler -+ const ucontext_t* const ucontext_; // also from the signal handler - #if !defined(__ARM_EABI__) && !defined(__mips__) - const google_breakpad::fpstate_t* const float_state_; // ditto - #endif --- -2.14.3 - diff --git a/dev-util/electron/files/electron-1.6.15-vendor-brightray.patch b/dev-util/electron/files/electron-1.6.15-vendor-brightray.patch deleted file mode 100644 index 6acf412173ec..000000000000 --- a/dev-util/electron/files/electron-1.6.15-vendor-brightray.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 055fb62fc58ef7027b444dd235bc4781effa30d7 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 2 Oct 2017 15:22:51 -0400 -Subject: [PATCH] Gentoo build fixes - ---- - brightray.gyp | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++----- - brightray.gypi | 14 ++------- - 2 files changed, 88 insertions(+), 19 deletions(-) - -diff --git a/brightray.gyp b/brightray.gyp -index e60d17a..79e0618 100644 ---- a/brightray.gyp -+++ b/brightray.gyp -@@ -1,7 +1,7 @@ - { - 'variables': { - # The libraries brightray will be compiled to. -- 'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gconf-2.0 gmodule-2.0 nss' -+ 'linux_system_libraries': 'gtk+-2.0 dbus-1 x11 x11-xcb xcb xi xcursor xdamage xrandr xcomposite xext xfixes xrender xtst xscrnsaver gmodule-2.0 nss' - }, - 'includes': [ - 'filenames.gypi', -@@ -9,6 +9,11 @@ - 'targets': [ - { - 'target_name': 'brightray', -+ 'dependencies': [ -+ 'cups', -+ 'gconf', -+ 'icu', -+ ], - 'type': 'static_library', - 'include_dirs': [ - '.', -@@ -130,18 +135,33 @@ - }, { - 'link_settings': { - 'libraries': [ -- # Link with ffmpeg. -- '<(libchromiumcontent_dir)/libffmpeg.so', - # Following libraries are required by libchromiumcontent: -+ '-lFLAC', - '-lasound', -+ '-lavcodec', -+ '-lavformat', -+ '-lavutil', - '-lcap', -- '-lcups', -- '-lrt', -+ '-lcrypto', - '-ldl', -- '-lresolv', -+ '-lexpat', - '-lfontconfig', - '-lfreetype', -- '-lexpat', -+ '-lharfbuzz', -+ '-ljpeg', -+ '-lminizip', -+ '-lpng', -+ '-lre2', -+ '-lresolv', -+ '-lrt', -+ '-lsnappy', -+ '-lssl', -+ '-lvpx', -+ '-lwebp', -+ '-lwebpdemux', -+ '-lxml2', -+ '-lxslt', -+ '-lz', - ], - }, - }], -@@ -390,5 +410,64 @@ - }], # OS=="win" - ], - }, -+ { -+ 'target_name': 'gconf', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_gconf==1 and _toolset=="target"', { -+ 'direct_dependent_settings': { -+ 'cflags': [ -+ '<!@(<(pkg-config) --cflags gconf-2.0)', -+ ], -+ 'defines': [ -+ 'USE_GCONF', -+ ], -+ }, -+ 'link_settings': { -+ 'ldflags': [ -+ '<!@(<(pkg-config) --libs-only-L --libs-only-other gconf-2.0)', -+ ], -+ 'libraries': [ -+ '<!@(<(pkg-config) --libs-only-l gconf-2.0)', -+ ], -+ }, -+ }], -+ ], -+ }, -+ { -+ 'target_name': 'cups', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_cups==1', { -+ 'direct_dependent_settings': { -+ 'defines': [ -+ 'USE_CUPS', -+ ], -+ 'link_settings': { -+ 'libraries': [ -+ '-lcups', -+ ], -+ }, -+ }, -+ }], -+ ], -+ }, -+ { -+ 'target_name': 'icu', -+ 'type': 'none', -+ 'conditions': [ -+ ['use_system_icu==1', { -+ 'direct_dependent_settings': { -+ 'link_settings': { -+ 'libraries': [ -+ '-licui18n', -+ '-licuuc', -+ '-licudata', -+ ], -+ }, -+ }, -+ }], -+ ], -+ }, - ], - } -diff --git a/brightray.gypi b/brightray.gypi -index 064ae1a..95d6f14 100644 ---- a/brightray.gypi -+++ b/brightray.gypi -@@ -1,6 +1,6 @@ - { - 'includes': [ -- 'vendor/download/libchromiumcontent/filenames.gypi', -+ 'vendor/libchromiumcontent/dist/main/filenames.gypi', - ], - 'variables': { - 'libchromiumcontent_component%': 1, -@@ -14,7 +14,7 @@ - }, { - 'libchromiumcontent_dir%': '<(libchromiumcontent_static_libraries_dir)', - 'libchromiumcontent_libraries%': '<(libchromiumcontent_static_libraries)', -- 'libchromiumcontent_v8_libraries%': '<(libchromiumcontent_static_v8_libraries)', -+ 'libchromiumcontent_v8_libraries%': '<(libchromiumcontent_shared_v8_libraries)', - }], - ], - }, -@@ -235,22 +235,12 @@ - 'conditions': [ - ['OS=="linux"', { - 'cflags': [ -- '-O2', -- # Generate symbols, will be stripped later. -- '-g', -- # Don't emit the GCC version ident directives, they just end up -- # in the .comment section taking up binary size. -- '-fno-ident', - # Put data and code in their own sections, so that unused symbols - # can be removed at link time with --gc-sections. - '-fdata-sections', - '-ffunction-sections', - ], - 'ldflags': [ -- # Specifically tell the linker to perform optimizations. -- # See http://lwn.net/Articles/192624/ . -- '-Wl,-O1', -- '-Wl,--as-needed', - '-Wl,--gc-sections', - ], - }], # OS=="linux" --- -2.14.3 - diff --git a/dev-util/electron/files/electron-1.6.15-vendor-libchromiumcontent.patch b/dev-util/electron/files/electron-1.6.15-vendor-libchromiumcontent.patch deleted file mode 100644 index 9360646ff681..000000000000 --- a/dev-util/electron/files/electron-1.6.15-vendor-libchromiumcontent.patch +++ /dev/null @@ -1,202 +0,0 @@ -From 0352e8df546c58b85e79714f77c616832c8c72ac Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Fri, 28 Apr 2017 17:22:38 -0400 -Subject: [PATCH] Gentoo build fixes - ---- - chromiumcontent/BUILD.gn | 9 +++------ - chromiumcontent/build_libs.py | 2 +- - script/create-dist | 39 ++++++++++++++++++++++++++------------- - script/lib/config.py | 2 +- - 4 files changed, 31 insertions(+), 21 deletions(-) - -diff --git a/chromiumcontent/BUILD.gn b/chromiumcontent/BUILD.gn -index e4e4166..f88fab3 100644 ---- a/chromiumcontent/BUILD.gn -+++ b/chromiumcontent/BUILD.gn -@@ -343,12 +343,9 @@ if (is_electron_build && !is_component_build) { - } - } - -- static_library("v8") { -- complete_static_lib = true -- sources = [] -- if (defined(obj_v8)) { -- sources += obj_v8 -- } -+ shared_library("v8") { -+ deps = [ "//v8:v8", "//v8:v8_libplatform" ] -+ ldflags = [ "-Wl,-rpath=\$ORIGIN/" ] - } - - } else { -diff --git a/chromiumcontent/build_libs.py b/chromiumcontent/build_libs.py -index e10f320..716c5f2 100644 ---- a/chromiumcontent/build_libs.py -+++ b/chromiumcontent/build_libs.py -@@ -82,7 +82,7 @@ with open(args.out, 'w') as out: - "third_party/usrsctp", - "third_party/woff2", - "third_party/zlib", -- "tools", -+ "tools/battor_agent", - "ui", - "url", - ]) -diff --git a/script/create-dist b/script/create-dist -index aec75e5..cf2f62c 100755 ---- a/script/create-dist -+++ b/script/create-dist -@@ -45,7 +45,6 @@ COMPONENTS = ['static_library', 'shared_library'] - BINARIES = { - 'all': [ - 'content_shell.pak', -- 'icudtl.dat', - 'natives_blob.bin', - 'snapshot_blob.bin', - os.path.join('gen', 'blink', 'public', 'resources', 'blink_image_resources_200_percent.pak'), -@@ -59,7 +58,6 @@ BINARIES = { - 'libffmpeg.dylib', - ], - 'linux': [ -- 'libffmpeg.so', - ], - 'win32': [ - 'd3dcompiler_47.dll', -@@ -308,12 +306,11 @@ def main(): - - for component in COMPONENTS: - if args.component == 'all' or args.component == component: -- copy_binaries(target_arch, component, create_debug_archive) -+ copy_binaries(target_arch, component, create_debug_archive, -+ args.system_icu) - copy_generated_sources(target_arch, component) - copy_locales(target_arch, component) - -- copy_ffmpeg(target_arch) -- copy_sources() - generate_licenses() - if not args.no_zip: - create_zip(create_debug_archive) -@@ -331,6 +328,8 @@ def parse_args(): - help='static_library or shared_library or all') - parser.add_argument('--no_zip', action='store_true', - help='Do not create zip distribution') -+ parser.add_argument('--system-icu', action='store_true', dest='system_icu', -+ help='Use system icu.') - return parser.parse_args() - - -@@ -355,15 +354,17 @@ def check_create_debug_archive(target_arch): - def copy_with_blacklist(target_arch, src, dest): - if os.path.basename(src) in ARCH_BLACKLIST[target_arch]: - return -- shutil.copy2(src, dest) -+ link_or_copy(src, dest) - - --def copy_binaries(target_arch, component, create_debug_archive): -+def copy_binaries(target_arch, component, create_debug_archive, system_icu): - output_dir = get_output_dir(SOURCE_ROOT, target_arch, component) - target_dir = os.path.join(MAIN_DIR, component) - mkdir_p(target_dir) - - binaries = BINARIES['all'] + BINARIES[TARGET_PLATFORM] -+ if not system_icu: -+ binaries.append('icudtl.dat') - if component == 'shared_library': - binaries += BINARIES_SHARED_LIBRARY[TARGET_PLATFORM] - for binary in binaries: -@@ -371,7 +372,7 @@ def copy_binaries(target_arch, component, create_debug_archive): - - # Copy all static libraries from chromiumcontent - for library in glob.glob(os.path.join(output_dir, 'obj', 'chromiumcontent', '*.' + STATIC_LIBRARY_SUFFIX)): -- shutil.copy2(library, target_dir) -+ link_or_copy(library, target_dir) - - if component == 'shared_library': - match = '*.{0}'.format(SHARED_LIBRARY_SUFFIX) -@@ -396,7 +397,7 @@ def copy_binaries(target_arch, component, create_debug_archive): - for root, _, filenames in os.walk(output_dir): - for pdb in filenames: - if pdb.endswith('.pdb'): -- shutil.copy2(os.path.join(root, pdb), target_dir) -+ link_or_copy(os.path.join(root, pdb), target_dir) - - if TARGET_PLATFORM == 'linux': - if component == 'shared_library': -@@ -433,7 +434,7 @@ def copy_binaries(target_arch, component, create_debug_archive): - - ffmpeg_output_dir = get_output_dir(SOURCE_ROOT, target_arch, 'ffmpeg') - for binary in binaries: -- shutil.copy2(os.path.join(ffmpeg_output_dir, binary), target_dir) -+ link_or_copy(os.path.join(ffmpeg_output_dir, binary), target_dir) - - - def copy_generated_sources(target_arch, component): -@@ -452,7 +453,7 @@ def copy_locales(target_arch, component): - for src_file in glob.glob(os.path.join(src_dir, 'content_strings_*.pak')): - filename = os.path.basename(src_file) - new_name = re.sub('content_strings_', '', filename) -- shutil.copy2(src_file, os.path.join(target_dir, new_name)) -+ link_or_copy(src_file, os.path.join(target_dir, new_name)) - - def copy_sources(): - for include_path in INCLUDE_DIRS: -@@ -477,7 +478,7 @@ def copy_ffmpeg(target_arch): - - target_dir = os.path.join(MAIN_DIR, 'ffmpeg') - mkdir_p(target_dir) -- shutil.copy2(os.path.join(output_dir, binary), target_dir) -+ link_or_copy(os.path.join(output_dir, binary), target_dir) - - - -@@ -494,7 +495,7 @@ def copy_source_file(absolute_path, relative_to, destination): - relative_path = os.path.relpath(absolute_path, start=relative_to) - final_path = os.path.join(destination, relative_path) - mkdir_p(os.path.dirname(final_path)) -- shutil.copy2(absolute_path, final_path) -+ link_or_copy(absolute_path, final_path) - - - def copy_dir(relative_path, relative_to, destination): -@@ -531,6 +532,7 @@ def link_binary_to_debug_file(objcopy, binfile, symfile, dirname): - def run_strip(target_arch, filename, create_debug_archive): - # Static libraries are not stripped because it would remove - # all the symbols in it. -+ return - if filename.endswith('.a'): - return - -@@ -620,6 +622,17 @@ def rm_rf(path): - raise - - -+def link_or_copy(src, dst): -+ if os.path.isfile(src): -+ if os.path.isdir(dst): -+ dst = os.path.join(dst, os.path.basename(src)) -+ try: -+ os.link(src, dst) -+ except OSError: -+ shutil.copy2(src, dst) -+ else: -+ shutil.copy2(src, dst) -+ - def safe_unlink(path): - try: - os.unlink(path) -diff --git a/script/lib/config.py b/script/lib/config.py -index 3455161..195b2a1 100644 ---- a/script/lib/config.py -+++ b/script/lib/config.py -@@ -4,4 +4,4 @@ import os - - - def get_output_dir(source_root, target_arch, component): -- return os.path.join(source_root, 'src', 'out-' + target_arch, component) -+ return os.environ.get('CHROMIUM_BUILD_DIR') --- -2.13.6 - diff --git a/dev-util/electron/files/electron-1.6.15-vendor-node.patch b/dev-util/electron/files/electron-1.6.15-vendor-node.patch deleted file mode 100644 index 43e7c098f3bf..000000000000 --- a/dev-util/electron/files/electron-1.6.15-vendor-node.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 672445004bafb94ea14cbb89c12c205c731eb288 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Wed, 10 Feb 2016 14:45:13 -0500 -Subject: [PATCH] Build fixes - ---- - lib/internal/bootstrap_node.js | 2 ++ - node.gyp | 14 +++++++++----- - src/node_main.cc | 4 ++++ - 3 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/lib/internal/bootstrap_node.js b/lib/internal/bootstrap_node.js -index aee7261f23..b921843643 100644 ---- a/lib/internal/bootstrap_node.js -+++ b/lib/internal/bootstrap_node.js -@@ -39,7 +39,9 @@ - setupGlobalConsole(); - } - -+ if (!process.env._ELECTRON_BUILD_NO_ASAR) { - setupAsarSupport(); -+ } - - const _process = NativeModule.require('internal/process'); - -diff --git a/node.gyp b/node.gyp -index c0bc2d7d4c..e5920f6a33 100644 ---- a/node.gyp -+++ b/node.gyp -@@ -17,6 +17,7 @@ - 'node_shared_libuv%': 'false', - 'node_use_openssl%': 'true', - 'node_shared_openssl%': 'false', -+ 'node_v8_path%': 'deps/v8', - 'node_v8_options%': '', - 'node_enable_v8_vtunejit%': 'false', - 'node_core_target_name%': 'node', -@@ -146,6 +147,7 @@ - ], - - 'include_dirs': [ -+ '<(node_v8_path)/include', - 'src', - 'tools/msvs/genfiles', - 'deps/uv/src/ares', -@@ -261,6 +263,13 @@ - 'V8_DEPRECATION_WARNINGS=1', - ], - -+ 'link_settings': { -+ 'ldflags': [ -+ '-Wl,-rpath=\$$ORIGIN/', -+ # Make native module dynamic loading work. -+ '-rdynamic', -+ ], -+ }, - - 'conditions': [ - [ 'node_shared=="false"', { -@@ -950,11 +959,6 @@ - }] - ] - }], -- [ 'node_use_v8_platform=="true"', { -- 'dependencies': [ -- 'deps/v8/src/v8.gyp:v8_libplatform', -- ], -- }], - [ 'node_use_bundled_v8=="true"', { - 'dependencies': [ - 'deps/v8/src/v8.gyp:v8', -diff --git a/src/node_main.cc b/src/node_main.cc -index 16bda81ae6..2eb1d08369 100644 ---- a/src/node_main.cc -+++ b/src/node_main.cc -@@ -50,11 +50,15 @@ int wmain(int argc, wchar_t *wargv[]) { - } - #else - // UNIX -+#include <stdlib.h> - int main(int argc, char *argv[]) { - // Disable stdio buffering, it interacts poorly with printf() - // calls elsewhere in the program (e.g., any logging from V8.) - setvbuf(stdout, nullptr, _IONBF, 0); - setvbuf(stderr, nullptr, _IONBF, 0); -+#ifdef ELECTRON_NODE_BUILD_NO_ASAR -+ setenv("_ELECTRON_BUILD_NO_ASAR", "1", 1); -+#endif - return node::Start(argc, argv); - } - #endif --- -2.14.3 - diff --git a/dev-util/electron/files/electron-1.6.15.patch b/dev-util/electron/files/electron-1.6.15.patch deleted file mode 100644 index 9d74753fc6d3..000000000000 --- a/dev-util/electron/files/electron-1.6.15.patch +++ /dev/null @@ -1,556 +0,0 @@ -From 8aa9ca32e88f7b6e66ded532d3110f4e84e99a9b Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Mon, 8 Feb 2016 15:16:40 -0500 -Subject: [PATCH] electron build fixes - ---- - common.gypi | 70 ++++++++++++++++++++++++++++++++++----- - electron.gyp | 70 +++++++++++++++++++++++++++++++-------- - toolchain.gypi | 76 +++++++++++++++++-------------------------- - tools/ar-flags.py | 15 +++++++++ - tools/atom_source_root.py | 5 +++ - tools/browserify.py | 24 ++++++++++++++ - tools/get-endianness.py | 4 +++ - tools/js2asar.py | 13 ++++---- - tools/list-browserify-deps.py | 3 +- - 9 files changed, 204 insertions(+), 76 deletions(-) - create mode 100644 tools/ar-flags.py - create mode 100644 tools/atom_source_root.py - create mode 100644 tools/browserify.py - create mode 100644 tools/get-endianness.py - -diff --git a/common.gypi b/common.gypi -index 7c1bf366a..7892926eb 100644 ---- a/common.gypi -+++ b/common.gypi -@@ -2,6 +2,7 @@ - 'includes': [ - 'toolchain.gypi', - 'vendor/brightray/brightray.gypi', -+ 'vendor/node/common.gypi', - ], - 'variables': { - # Tell crashpad to build as external project. -@@ -11,31 +12,44 @@ - 'chromeos': 0, - # Reflects node's config.gypi. - 'component%': 'static_library', -- 'python': 'python', -+ 'python%': 'python', - 'openssl_fips': '', - 'openssl_no_asm': 1, -+ -+ 'host_arch': '<!(python <(DEPTH)/chromium/v8/gypfiles/detect_v8_host_arch.py)', -+ -+ # ICU configuration for Node. -+ # Note: the use of icu-system.gyp does not necessarily -+ # indicate that the system ICU will be used, it merely -+ # disables the use of the version bundled with Node. -+ 'icu_gyp_path': 'tools/icu/icu-system.gyp', -+ 'icu_small': 'false', -+ - 'use_openssl_def': 0, - 'OPENSSL_PRODUCT': 'libopenssl.a', -- 'node_release_urlbase': 'https://atom.io/download/atom-shell', -- 'node_byteorder': '<!(node <(DEPTH)/tools/get-endianness.js)', -+ 'node_release_urlbase': 'https://atom.io/download/electron', -+ 'node_byteorder': '<!(python <(DEPTH)/tools/get-endianness.py)', - 'node_target_type': 'shared_library', -+ 'node_module_version': '', - 'node_install_npm': 'false', - 'node_prefix': '', - 'node_shared': 'true', - 'node_shared_cares': 'false', -- 'node_shared_http_parser': 'false', -- 'node_shared_libuv': 'false', -- 'node_shared_openssl': 'false', - 'node_shared_v8': 'true', -- 'node_shared_zlib': 'false', -+ 'node_shared_http_parser': 'true', -+ # There are ABI-incompatible modifications to libuv -+ 'node_shared_libuv': 'false', -+ 'node_shared_openssl': 'true', -+ 'node_shared_zlib': 'true', - 'node_tag': '', - 'node_use_dtrace': 'false', - 'node_use_etw': 'false', - 'node_use_mdb': 'false', - 'node_use_openssl': 'true', - 'node_use_perfctr': 'false', -- 'node_use_v8_platform': 'false', -+ 'node_use_v8_platform': 'true', - 'node_use_bundled_v8': 'false', -+ 'node_v8_path': '<(DEPTH)/chromium/v8/', - 'node_enable_d8': 'false', - 'uv_library': 'static_library', - 'uv_parent_path': 'vendor/node/deps/uv', -@@ -44,10 +58,17 @@ - 'v8_postmortem_support': 'false', - 'v8_enable_i18n_support': 'false', - 'v8_inspector': 'false', -+ 'v8_host_byteorder': '<!(python <(DEPTH)/tools/get-endianness.py)', -+ 'v8_use_snapshot': 'true', -+ 'v8_use_external_startup_data': 1, - }, - # Settings to compile node under Windows. - 'target_defaults': { - 'target_conditions': [ -+ ['_target_name in ["icuuc", "icui18n"]', { -+ 'cflags_cc!': ['-fno-rtti'] -+ }], -+ - ['_target_name in ["libuv", "http_parser", "openssl", "openssl-cli", "cares", "node", "zlib"]', { - 'msvs_disabled_warnings': [ - 4003, # not enough actual parameters for macro 'V' -@@ -128,6 +149,20 @@ - ], - }], - ['_target_name=="node"', { -+ 'cflags!': [ -+ '-fvisibility=hidden', -+ '-fdata-sections', -+ '-ffunction-sections', -+ ], -+ 'cflags_cc!': [ -+ '-fvisibility-inlines-hidden', -+ ], -+ 'libraries': [ -+ '-lz', -+ '-lhttp_parser', -+ '-lcrypto', -+ '-lssl', -+ ], - 'include_dirs': [ - '<(libchromiumcontent_src_dir)', - '<(libchromiumcontent_src_dir)/third_party/icu/source/common', -@@ -167,7 +202,9 @@ - '-Wl,--no-whole-archive', - ], - }, { -- 'libraries': [ '<@(libchromiumcontent_v8_libraries)' ], -+ 'libraries': [ -+ '<@(libchromiumcontent_v8_libraries)', -+ ], - }], - ], - }], -@@ -228,6 +265,21 @@ - }], # OS=="win" - ], - }], -+ ['_target_name=="shell_runner_host_lib"', { -+ 'conditions': [ -+ ['icu_use_data_file_flag==1', { -+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE'], -+ }, { # else icu_use_data_file_flag !=1 -+ 'conditions': [ -+ ['OS=="win"', { -+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_SHARED'], -+ }, { -+ 'defines': ['ICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_STATIC'], -+ }], -+ ], -+ }], -+ ], -+ }], - ], - 'msvs_cygwin_shell': 0, # Strangely setting it to 1 would make building under cygwin fail. - 'msvs_disabled_warnings': [ -diff --git a/electron.gyp b/electron.gyp -index f82de1e1f..2c398fe75 100644 ---- a/electron.gyp -+++ b/electron.gyp -@@ -191,7 +191,7 @@ - }, { - 'copied_libraries': [ - '<(PRODUCT_DIR)/lib/libnode.so', -- '<(libchromiumcontent_dir)/libffmpeg.so', -+ '<@(libchromiumcontent_shared_v8_libraries)', - ], - }], - ], -@@ -244,8 +244,8 @@ - '<@(lib_sources)', - ], - 'include_dirs': [ -- '.', - 'chromium_src', -+ '.', - 'vendor/brightray', - 'vendor/native_mate', - # libicu headers shim. -@@ -255,7 +255,6 @@ - '<(SHARED_INTERMEDIATE_DIR)', - # Include directories for uv and node. - 'vendor/node/src', -- 'vendor/node/deps/http_parser', - 'vendor/node/deps/uv/include', - # The `node.h` is using `#include"v8.h"`. - '<(libchromiumcontent_src_dir)/v8/include', -@@ -344,11 +343,12 @@ - '<@(lib_sources_nss)', - ], - 'link_settings': { -+ 'libraries': [ '<@(libchromiumcontent_v8_libraries)' ], - 'ldflags': [ - # Make binary search for libraries under current directory, so we - # don't have to manually set $LD_LIBRARY_PATH: - # http://serverfault.com/questions/279068/cant-find-so-in-the-same-directory-as-the-executable -- '-rpath \$$ORIGIN', -+ '-Wl,-rpath=\$$ORIGIN/', - # Make native module dynamic loading work. - '-rdynamic', - ], -@@ -370,6 +370,9 @@ - { - 'target_name': 'js2asar', - 'type': 'none', -+ 'dependencies': [ -+ 'nodebin' -+ ], - 'actions': [ - { - 'action_name': 'js2asar', -@@ -391,6 +394,7 @@ - 'action': [ - 'python', - 'tools/js2asar.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(_outputs)', - 'lib', - '<@(_inputs)', -@@ -401,6 +405,9 @@ - { - 'target_name': 'app2asar', - 'type': 'none', -+ 'dependencies': [ -+ 'nodebin' -+ ], - 'actions': [ - { - 'action_name': 'app2asar', -@@ -422,6 +429,7 @@ - 'action': [ - 'python', - 'tools/js2asar.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(_outputs)', - 'default_app', - '<@(_inputs)', -@@ -447,6 +455,7 @@ - 'dependencies': [ - # depend on this target to ensure the '<(js2c_input_dir)' is created - 'atom_js2c_copy', -+ 'nodebin' - ], - 'variables': { - 'sandbox_args': [ -@@ -476,11 +485,9 @@ - '<(js2c_input_dir)/preload_bundle.js', - ], - 'action': [ -- 'npm', -- 'run', -- '--silent', -- 'browserify', -- '--', -+ 'python', -+ 'tools/browserify.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(sandbox_args)', - '-o', - '<@(_outputs)', -@@ -495,12 +502,11 @@ - '<(js2c_input_dir)/isolated_bundle.js', - ], - 'action': [ -- 'npm', -- 'run', -- '--silent', -- 'browserify', -- '--', -+ 'python', -+ 'tools/browserify.py', -+ '<(PRODUCT_DIR)/nodebin', - '<@(isolated_args)', -+ 'lib/isolated_renderer/init.js', - '-o', - '<@(_outputs)', - ], -@@ -535,6 +541,42 @@ - } - ], - }, # target atom_js2c -+ { -+ 'target_name': 'nodebin', -+ 'type': 'executable', -+ 'defines': [ -+ 'ELECTRON_NODE_BUILD_NO_ASAR' -+ ], -+ 'sources': [ -+ 'vendor/node/src/node_main.cc', -+ ], -+ 'dependencies': [ -+ 'vendor/node/node.gyp:node', -+ ], -+ 'include_dirs': [ -+ '.', -+ '<(node_v8_path)/include', -+ 'vendor/native_mate', -+ # Include atom_natives.h. -+ '<(SHARED_INTERMEDIATE_DIR)', -+ # Include directories for uv and node. -+ 'vendor/node/src', -+ 'vendor/node/deps/uv/include', -+ '<(libchromiumcontent_src_dir)', -+ # The `node.h` is using `#include"v8.h"`. -+ '<(libchromiumcontent_src_dir)/v8/include', -+ # The `node.h` is using `#include"ares.h"`. -+ 'vendor/node/deps/cares/include', -+ ], -+ 'link_settings': { -+ 'libraries': [ '<@(libchromiumcontent_v8_libraries)' ], -+ 'ldflags': [ -+ '-Wl,-rpath=\$$ORIGIN/', -+ # Make native module dynamic loading work. -+ '-rdynamic', -+ ], -+ }, -+ }, # target nodebin - ], - 'conditions': [ - ['OS=="mac"', { -diff --git a/toolchain.gypi b/toolchain.gypi -index 1c5f8a713..c20ed1a0f 100644 ---- a/toolchain.gypi -+++ b/toolchain.gypi -@@ -16,7 +16,7 @@ - 'arm_neon%': 1, - - # Abosulte path to source root. -- 'source_root%': '<!(node <(DEPTH)/tools/atom_source_root.js)', -+ 'source_root%': '<!(python <(DEPTH)/tools/atom_source_root.py)', - }, - - # Copy conditionally-set variables out one scope. -@@ -40,34 +40,6 @@ - 'mac_sdk%': '<!(python <(DEPTH)/tools/mac/find_sdk.py <(mac_sdk_min))', - }], - -- ['OS=="linux"', { -- 'variables': { -- # The system libdir used for this ABI. -- 'system_libdir%': 'lib', -- -- # Setting the path to sysroot. -- 'conditions': [ -- ['target_arch=="arm"', { -- # sysroot needs to be an absolute path otherwise it generates -- # incorrect results when passed to pkg-config -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_arm-sysroot', -- }], -- ['target_arch=="ia32"', { -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_i386-sysroot', -- }], -- ['target_arch=="x64"', { -- 'sysroot%': '<(source_root)/vendor/debian_wheezy_amd64-sysroot', -- }], -- ], -- }, -- # Copy conditionally-set variables out one scope. -- 'sysroot%': '<(sysroot)', -- 'system_libdir%': '<(system_libdir)', -- -- # Redirect pkg-config to search from sysroot. -- 'pkg-config%': '<(source_root)/tools/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)" "<(system_libdir)"', -- }], -- - # Set default compiler flags depending on ARM version. - ['arm_version==6', { - 'arm_arch%': 'armv6', -@@ -136,23 +108,6 @@ - }, - }], - -- # Setup sysroot environment. -- ['OS=="linux" and target_arch in ["arm", "ia32", "x64"]', { -- 'target_defaults': { -- 'target_conditions': [ -- ['_toolset=="target"', { -- 'cflags': [ -- '--sysroot=<(sysroot)', -- ], -- 'ldflags': [ -- '--sysroot=<(sysroot)', -- '<!(<(source_root)/tools/linux/sysroot_ld_path.sh <(sysroot))', -- ], -- }] -- ], -- }, -- }], # sysroot -- - # Setup cross-compilation on Linux. - ['OS=="linux"', { - 'target_defaults': { -@@ -179,6 +134,35 @@ - 'ldflags': [ - '-m64', - ], -+ 'conditions': [ -+ ['use_lto==1 and clang==0', { -+ 'cflags': [ -+ '-fno-fat-lto-objects', -+ '-fuse-linker-plugin', -+ '-flto=4', -+ '--param=lto-partitions=1', -+ ], -+ 'ldflags': [ -+ '-fno-fat-lto-objects', -+ '-fuse-linker-plugin', -+ '-flto=4', -+ '--param=lto-partitions=1', -+ ], -+ 'arflags': [ -+ '<!@(python <(DEPTH)/tools/ar-flags.py)', -+ ] -+ }], -+ ['use_lto==1 and clang==1', { -+ 'cflags': [ -+ '-flto', -+ '-fwhole-program-vtables' -+ ], -+ 'ldflags': [ -+ '-flto', -+ '-fwhole-program-vtables' -+ ], -+ }], -+ ], - }], # target_arch=="x64" and _toolset=="target" - ['target_arch=="arm" and _toolset=="target"', { - 'conditions': [ -diff --git a/tools/ar-flags.py b/tools/ar-flags.py -new file mode 100644 -index 000000000..80b338a6e ---- /dev/null -+++ b/tools/ar-flags.py -@@ -0,0 +1,15 @@ -+#!/usr/bin/env python -+ -+import os -+import subprocess -+ -+if __name__ == '__main__': -+ cc = os.environ.get('CC', '/usr/bin/cc') -+ gcc_version = subprocess.check_output( -+ [cc, '-dumpversion'], universal_newlines=True).strip(' \n') -+ -+ lto_plugin = os.path.join( -+ '/usr/libexec/gcc/x86_64-pc-linux-gnu/', gcc_version, -+ 'liblto_plugin.so') -+ -+ print('--plugin={}'.format(lto_plugin)) -diff --git a/tools/atom_source_root.py b/tools/atom_source_root.py -new file mode 100644 -index 000000000..316e99701 ---- /dev/null -+++ b/tools/atom_source_root.py -@@ -0,0 +1,5 @@ -+#!/usr/bin/env python -+ -+import os.path -+ -+print(os.path.abspath(os.path.dirname(os.path.dirname(__file__)))) -diff --git a/tools/browserify.py b/tools/browserify.py -new file mode 100644 -index 000000000..15472c953 ---- /dev/null -+++ b/tools/browserify.py -@@ -0,0 +1,24 @@ -+#!/usr/bin/env python -+ -+import os -+import subprocess -+import sys -+ -+SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__)) -+ -+ -+def main(): -+ node = sys.argv[1] -+ args = sys.argv[2:] -+ -+ call_browserify(node, args) -+ -+ -+def call_browserify(node, args): -+ browserify = os.path.join( -+ SOURCE_ROOT, 'node_modules', '.bin', 'browserify') -+ subprocess.check_call([node, browserify] + args) -+ -+ -+if __name__ == '__main__': -+ sys.exit(main()) -diff --git a/tools/get-endianness.py b/tools/get-endianness.py -new file mode 100644 -index 000000000..31507936f ---- /dev/null -+++ b/tools/get-endianness.py -@@ -0,0 +1,4 @@ -+#!/usr/bin/env python -+ -+import sys -+print(sys.byteorder) -diff --git a/tools/js2asar.py b/tools/js2asar.py -index adad1751e..ca7686893 100755 ---- a/tools/js2asar.py -+++ b/tools/js2asar.py -@@ -11,13 +11,14 @@ SOURCE_ROOT = os.path.dirname(os.path.dirname(__file__)) - - - def main(): -- archive = sys.argv[1] -- folder_name = sys.argv[2] -- source_files = sys.argv[3:] -+ node = sys.argv[1] -+ archive = sys.argv[2] -+ folder_name = sys.argv[3] -+ source_files = sys.argv[4:] - - output_dir = tempfile.mkdtemp() - copy_files(source_files, output_dir) -- call_asar(archive, os.path.join(output_dir, folder_name)) -+ call_asar(node, archive, os.path.join(output_dir, folder_name)) - shutil.rmtree(output_dir) - - -@@ -28,11 +29,11 @@ def copy_files(source_files, output_dir): - shutil.copy2(source_file, output_path) - - --def call_asar(archive, output_dir): -+def call_asar(node, archive, output_dir): - asar = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'asar') - if sys.platform in ['win32', 'cygwin']: - asar += '.cmd' -- subprocess.check_call([asar, 'pack', output_dir, archive]) -+ subprocess.check_call([node, asar, 'pack', output_dir, archive]) - - - def safe_mkdir(path): -diff --git a/tools/list-browserify-deps.py b/tools/list-browserify-deps.py -index c25007d2a..bbd921bc6 100755 ---- a/tools/list-browserify-deps.py -+++ b/tools/list-browserify-deps.py -@@ -9,7 +9,8 @@ BROWSERIFY = os.path.join(SOURCE_ROOT, 'node_modules', '.bin', 'browserify') - if sys.platform == 'win32': - BROWSERIFY += '.cmd' - --deps = subprocess.check_output([BROWSERIFY, '--list'] + sys.argv[1:]) -+deps = subprocess.check_output([BROWSERIFY, '--list'] + sys.argv[1:], -+ universal_newlines=True) - for dep in deps.split('\n'): - if dep: - dep = os.path.relpath(dep, SOURCE_ROOT) --- -2.14.3 - diff --git a/dev-util/electron/files/electron-system-icu-r0.patch b/dev-util/electron/files/electron-system-icu-r0.patch deleted file mode 100644 index 859e351c9060..000000000000 --- a/dev-util/electron/files/electron-system-icu-r0.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 065c936e74d629b51f5258fb3b58899bd5857b53 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Sun, 29 Oct 2017 16:38:40 -0400 -Subject: [PATCH] system-icu support - ---- - electron.gyp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/electron.gyp b/electron.gyp -index 43f3ffb51..2c398fe75 100644 ---- a/electron.gyp -+++ b/electron.gyp -@@ -200,7 +200,6 @@ - 'files': [ - '<@(copied_libraries)', - '<(libchromiumcontent_dir)/locales', -- '<(libchromiumcontent_dir)/icudtl.dat', - '<(libchromiumcontent_dir)/blink_image_resources_200_percent.pak', - '<(libchromiumcontent_dir)/content_resources_200_percent.pak', - '<(libchromiumcontent_dir)/content_shell.pak', -@@ -249,6 +248,9 @@ - '.', - 'vendor/brightray', - 'vendor/native_mate', -+ # libicu headers shim. -+ '<(SHARED_INTERMEDIATE_DIR)/shim_headers/icui18n_shim', -+ '<(SHARED_INTERMEDIATE_DIR)/shim_headers/icuuc_shim', - # Include atom_natives.h. - '<(SHARED_INTERMEDIATE_DIR)', - # Include directories for uv and node. --- -2.14.3 - diff --git a/dev-util/electron/files/electron-vendor-node-external-snapshots-r0.patch b/dev-util/electron/files/electron-vendor-node-external-snapshots-r0.patch deleted file mode 100644 index d3fce0868cd4..000000000000 --- a/dev-util/electron/files/electron-vendor-node-external-snapshots-r0.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 820cb5ce8e1aa08e68fe0f2e3cbbe74972e7af84 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Sat, 11 Jun 2016 18:27:19 -0400 -Subject: [PATCH] Add support for external V8 snapshots - ---- - src/node.cc | 86 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 86 insertions(+) - -diff --git a/src/node.cc b/src/node.cc -index 961abc2..4dac94b 100644 ---- a/src/node.cc -+++ b/src/node.cc -@@ -4188,6 +4188,90 @@ Environment* CreateEnvironment(Isolate* isolate, - return env; - } - -+#include <sys/mman.h> -+ -+const char kProcSelfExe[] = "/proc/self/exe"; -+const char kNativesFileName[] = "natives_blob.bin"; -+const char kSnapshotFileName[] = "snapshot_blob.bin"; -+const char *g_mapped_natives = nullptr; -+const char *g_mapped_snapshot = nullptr; -+ -+static char* SnapshotPath(const char* filename) { -+ char *path; -+ char *dir; -+ ssize_t r; -+ -+ path = reinterpret_cast<char*>(malloc(4096 + strlen(filename) + 2)); -+ if (path == nullptr) { -+ fprintf(stderr, "out of memory\n"); -+ ABORT(); -+ } -+ -+ r = readlink(kProcSelfExe, path, 4096 + 1); -+ if (r == -1) { -+ perror("could not determine node executable directory"); -+ ABORT(); -+ } -+ -+ path[r] = '\0'; -+ -+ dir = strrchr(path, '/'); -+ -+ strcpy(dir + 1, filename); -+ -+ return path; -+} -+ -+static void LoadV8Snapshot(const char* name, const char** addr, size_t *size) { -+ char *path = SnapshotPath(name); -+ int fd; -+ struct stat sb; -+ -+ fd = open(path, O_RDONLY); -+ -+ if (fd == -1) { -+ fprintf(stderr, "could not open snapshot file '%s': %s\n", -+ path, sys_errlist[errno]); -+ ABORT(); -+ } -+ -+ if (fstat(fd, &sb) == -1) { -+ fprintf(stderr, "could not stat snapshot file '%s': %s\n", -+ path, sys_errlist[errno]); -+ ABORT(); -+ } -+ -+ *size = sb.st_size; -+ -+ *addr = reinterpret_cast<const char*>( -+ mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0)); -+ if (*addr == MAP_FAILED) { -+ fprintf(stderr, "could not read snapshot file '%s': %s\n", -+ path, sys_errlist[errno]); -+ ABORT(); -+ } -+ -+ close(fd); -+ free(path); -+} -+ -+static void LoadV8Snapshots() { -+ size_t natives_size; -+ size_t snapshot_size; -+ -+ LoadV8Snapshot(kNativesFileName, &g_mapped_natives, &natives_size); -+ LoadV8Snapshot(kSnapshotFileName, &g_mapped_snapshot, &snapshot_size); -+ -+ v8::StartupData natives; -+ natives.data = g_mapped_natives; -+ natives.raw_size = natives_size; -+ V8::SetNativesDataBlob(&natives); -+ -+ v8::StartupData snapshot; -+ snapshot.data = g_mapped_snapshot; -+ snapshot.raw_size = snapshot_size; -+ V8::SetSnapshotDataBlob(&snapshot); -+} - - // Entry point for new node instances, also called directly for the main - // node instance. -@@ -4301,6 +4385,8 @@ int Start(int argc, char** argv) { - const char** exec_argv; - Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv); - -+ LoadV8Snapshots(); -+ - #if HAVE_OPENSSL - #ifdef NODE_FIPS_MODE - // In the case of FIPS builds we should make sure --- -2.7.3 - diff --git a/dev-util/electron/files/electron-vendor-node-external-snapshots-r2.patch b/dev-util/electron/files/electron-vendor-node-external-snapshots-r2.patch deleted file mode 100644 index b3cd18c2fe2b..000000000000 --- a/dev-util/electron/files/electron-vendor-node-external-snapshots-r2.patch +++ /dev/null @@ -1,117 +0,0 @@ -From da7d4d995b31fcdc94158bbc4adc01bf9bab78a9 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus <elvis@magic.io> -Date: Sat, 11 Jun 2016 18:27:19 -0400 -Subject: [PATCH] Add support for external V8 snapshots - ---- - src/node.cc | 87 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 87 insertions(+) - -diff --git a/src/node.cc b/src/node.cc -index 66233d451..96e4e22d6 100644 ---- a/src/node.cc -+++ b/src/node.cc -@@ -4493,6 +4493,91 @@ inline int Start(Isolate* isolate, IsolateData* isolate_data, - return exit_code; - } - -+#include <sys/mman.h> -+ -+const char kProcSelfExe[] = "/proc/self/exe"; -+const char kNativesFileName[] = "natives_blob.bin"; -+const char kSnapshotFileName[] = "snapshot_blob.bin"; -+const char *g_mapped_natives = nullptr; -+const char *g_mapped_snapshot = nullptr; -+ -+static char* SnapshotPath(const char* filename) { -+ char *path; -+ char *dir; -+ ssize_t r; -+ -+ path = reinterpret_cast<char*>(malloc(4096 + strlen(filename) + 2)); -+ if (path == nullptr) { -+ fprintf(stderr, "out of memory\n"); -+ ABORT(); -+ } -+ -+ r = readlink(kProcSelfExe, path, 4096 + 1); -+ if (r == -1) { -+ perror("could not determine node executable directory"); -+ ABORT(); -+ } -+ -+ path[r] = '\0'; -+ -+ dir = strrchr(path, '/'); -+ -+ strcpy(dir + 1, filename); -+ -+ return path; -+} -+ -+static void LoadV8Snapshot(const char* name, const char** addr, size_t *size) { -+ char *path = SnapshotPath(name); -+ int fd; -+ struct stat sb; -+ -+ fd = open(path, O_RDONLY); -+ -+ if (fd == -1) { -+ fprintf(stderr, "could not open snapshot file '%s': %s\n", -+ path, sys_errlist[errno]); -+ ABORT(); -+ } -+ -+ if (fstat(fd, &sb) == -1) { -+ fprintf(stderr, "could not stat snapshot file '%s': %s\n", -+ path, sys_errlist[errno]); -+ ABORT(); -+ } -+ -+ *size = sb.st_size; -+ -+ *addr = reinterpret_cast<const char*>( -+ mmap(NULL, sb.st_size, PROT_READ, MAP_PRIVATE, fd, 0)); -+ if (*addr == MAP_FAILED) { -+ fprintf(stderr, "could not read snapshot file '%s': %s\n", -+ path, sys_errlist[errno]); -+ ABORT(); -+ } -+ -+ close(fd); -+ free(path); -+} -+ -+static void LoadV8Snapshots() { -+ size_t natives_size; -+ size_t snapshot_size; -+ -+ LoadV8Snapshot(kNativesFileName, &g_mapped_natives, &natives_size); -+ LoadV8Snapshot(kSnapshotFileName, &g_mapped_snapshot, &snapshot_size); -+ -+ v8::StartupData natives; -+ natives.data = g_mapped_natives; -+ natives.raw_size = natives_size; -+ V8::SetNativesDataBlob(&natives); -+ -+ v8::StartupData snapshot; -+ snapshot.data = g_mapped_snapshot; -+ snapshot.raw_size = snapshot_size; -+ V8::SetSnapshotDataBlob(&snapshot); -+} -+ - inline int Start(uv_loop_t* event_loop, - int argc, const char* const* argv, - int exec_argc, const char* const* exec_argv) { -@@ -4557,6 +4642,8 @@ int Start(int argc, char** argv) { - const char** exec_argv; - Init(&argc, const_cast<const char**>(argv), &exec_argc, &exec_argv); - -+ LoadV8Snapshots(); -+ - #if HAVE_OPENSSL - if (const char* extra = secure_getenv("NODE_EXTRA_CA_CERTS")) - crypto::UseExtraCaCerts(extra); --- -2.11.1 - diff --git a/dev-util/electron/metadata.xml b/dev-util/electron/metadata.xml index bb2475cf47a7..94de2f288070 100644 --- a/dev-util/electron/metadata.xml +++ b/dev-util/electron/metadata.xml @@ -11,7 +11,6 @@ </maintainer> <longdescription>Electron is a cross platform application development framework based on web technologies based on Chromium</longdescription> <use> - <flag name="hidpi">Enable support for high-resolution screens (high dots per inch)</flag> <flag name="lto">Build with link time optimization enabled</flag> <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag> <flag name="proprietary-codecs">Enable proprietary codecs like H.264, MP3</flag> @@ -20,6 +19,7 @@ </use> <upstream> <remote-id type="github">elprans/asar</remote-id> + <remote-id type="github">elprans/gentoo-electron-patches</remote-id> <remote-id type="github">elprans/grit</remote-id> <remote-id type="github">elprans/node-browserify</remote-id> </upstream> |