diff options
| author |   Elvis Pranskevichus <elvis@magic.io> | 2018-01-25 21:24:05 -0500 |
|---|---|---|
| committer |   Patrice Clement <monsieurp@gentoo.org> | 2018-01-26 09:51:05 +0100 |
| commit | c529068f7efb4fada01c878c3a75d70091f3435a (patch) | |
| tree | f4997673ee6cc79e4d0df8390e87320537c0cac3 /dev-util | |
| parent | app-editors/atom: version bump to 1.23.3 and 1.24-beta3. (diff) | |
| download | gentoo-c529068f7efb4fada01c878c3a75d70091f3435a.tar.gz gentoo-c529068f7efb4fada01c878c3a75d70091f3435a.tar.bz2 gentoo-c529068f7efb4fada01c878c3a75d70091f3435a.zip | |
dev-util/electron: version bump to 1.6.16.
Closes: https://bugs.gentoo.org/645576
Closes: https://github.com/gentoo/gentoo/pull/6966
Package-Manager: Portage-2.3.19, Repoman-2.3.6
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/electron/Manifest | 4 | ||||
| -rw-r--r-- | dev-util/electron/electron-1.6.16.ebuild (renamed from dev-util/electron/electron-1.6.15.ebuild) | 26 |
2 files changed, 9 insertions, 21 deletions
diff --git a/dev-util/electron/Manifest b/dev-util/electron/Manifest index d0decfa7188e..5ed6dd3216c0 100644 --- a/dev-util/electron/Manifest +++ b/dev-util/electron/Manifest @@ -1,7 +1,7 @@ DIST asar-0.13.0.tar.gz 1622264 BLAKE2B 018bccc3d2b54040fe7c6e6c1ecfbe0ab4d52554feab78fae41a09d35b7e934720cba45f77239eda46d746390c4f072b3e0eecdf7f0953882d6f27cb940de018 SHA512 619b59e9576a185905b455b780630188ce32aed72b424c69967a7bf15236d1edf2f5d92f7dde972599679c88fe0a80f05295a3d82b2ae0944be08d332a659aee DIST browserify-14.0.0.tar.gz 1847439 BLAKE2B 50d84f51d8640fa881751339e1d37f04d6ba3ea5aa17222c1e9a29bc805ade5f14ce95bb97fb494e0a1a71e6a5da672566aeb0fbbea4b48d9ad19d20405a0b11 SHA512 fea8219ab2c5b422c15cc8c305a8aa0396f3de46c8d602eb4976af1d2b0a043214f808e3fa8e31cae0ad7c76d9ddc38239d0208911105f9c851efddfaf96b0c7 DIST chromium-56.0.2924.87.tar.xz 514429808 BLAKE2B 96e688230266f00917c6a6ebfaeb9b4e1cbe882a6bd907034a339d7a7b36fe97b451978898fb910938a36e47a9e25fb88117fe764dae759127d391e902533b47 SHA512 1c154004a9bca73e2491c73520a5f7d5c50c5b9d66e8e2660bf46585dd9b6ad3db706a9d824356f319794fa790bc3918ae6199843bcba717b9e74efbf26882c9 -DIST electron-1.6.15.tar.gz 4943663 BLAKE2B 867964e23bea77b0892febcc47198bf783f0021df842c40c94c2159abca75ca45cac345323bb2735a9ddc935bedba62126d5afe9ad9e0fc031abefbaf444d441 SHA512 e6e7519db6d272d151e5618976a69feb11c35f1845561d152c64b474696f3835644b232b020df00166f80913b2c492e6e8cefce1a96494a2bb92096936e18958 +DIST electron-1.6.16.tar.gz 4957555 BLAKE2B c72433ed076bc6b68b81b136db4dcf1a0fe17f16c7859e5176c215d86164f0c3d531310d8edbee9f52038722aa6dbc7934d9d9a5511bcb978bb9c255122f1794 SHA512 f657aae526defa8526948c89b8667475d1fb27f1884a1a4655773052cf3b3578483d3d51e35e6aa077579c3023056eec5d2a06f24a2c4013ca078fb82f850182 DIST electron-breakpad-e35167de7516448fcc2bf687ad580b9d8b6aedc2.tar.gz 5161275 BLAKE2B a8414bb2876031f71e5c0c9263cf7ee03c4af9d8dee2890bb4c39c82869282bc20b4c2807068ab72bcb96e71559dbea083ca27b9cddbc991bf1dc7e6c16a5dc3 SHA512 dce89f5976ddac0f87f70f11cc5fdf44a29198b302ed6eecd2c7530ccb33613563ef2ce797b7187c986d3b900b212eede8530e1e8f3b6a88ac727ff9623dd333 DIST electron-brightray-909c49265493bd095c27cefd999567be2107899a.tar.gz 98022 BLAKE2B a90ab9d0480c1d1f7d5f40ccf9bf8f4568175c9662bc47f9754a293018d6cc8930cf6e104aea57f660893c44837b3f48ddaacc3bdc2bcf347f1a60f93a987f4a SHA512 e1df1159a97c87e1edce9ea896d790e3004cc836d879385cdc5324c1961209ebf884fb7771861f4c6bf86b50ff1d8818540555bbcc77bf10987e0a68cd855127 DIST electron-chromium-breakpad-c566c50d81f7b1edeaee9f11f5d07bda858d6b64.tar.gz 1141356 BLAKE2B 6a16d29639c668a6360514ed56373f4da5396650ba63d3aa7a3bca66a89ef1b2244bbe4a2e02ea0439f999c872bbb12e0d1289051c49cebf3d931ae7255b83b7 SHA512 9fb07facb147d401655cefea103cb1499de9ca27093c756a3b5d6ff1117a288ac491fedf01df61775ce6590e852e942cf7db1e135d6d30e94188283a53dd8e10 @@ -9,5 +9,5 @@ DIST electron-grit-9536fb6429147d27ef1563088341825db0a893cd.tar.gz 378461 BLAKE2 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-9b1683e7000481ec6214eafa3eef7ac4594eb410.tar.gz 46194500 BLAKE2B 36537f40a597f9ed969abe385de8cf58fd2f48526021461ab5feb0e061a2dc0d4a49109191254e69b685101f6aa79d1c870091f0eae251ba8b3bc0b3e6a975e6 SHA512 f258cf5597154e976e1e4c0b81f6b63e9b344e4a28492137b80d59dc841490d4ad69e6bab2456a6334a42e51dfe2862cc389e837a4baac90a698ff60e5b08ab4 -DIST electron-patches-1.6.15.tar.gz 28591 BLAKE2B 98654829e882874f4470d7bdb906f7cebde6c61c28568c06650464ecd8779cafd028b03711c063445387dd158804a7b9bac5aca836f56f2285b50fcaf3ee56b0 SHA512 c18e53bdf86246376fdac505481e4aa364438b703a47fb82b695d874dabf9a945df5381042b1a0cef102142f0482db51017a031647f8f8ffde3e8d1f629e2f9f +DIST electron-patches-1.6.16.tar.gz 28592 BLAKE2B bd64ff7ad03a8ecb9422702cc33746d57464228a3ee7ae7fa9ecc30ad5507a8cb2db71caf5f6700cfe1d963e9957d50c1e5c784e148aaabc11aef9d90d2508f0 SHA512 b53b5f88532a0898878abac71b36c410c3734da871266703932238f707e54a4f6af92cc4792dc645ba02069ec5e9e548317e0e121556210f69dfbb63d5a1fa03 DIST electron-pdf-viewer-a050a339cfeabcfb5f07c313161d2ee27b6c3a39.tar.gz 38431 BLAKE2B 962b1eeaa74544d57a5664fc6965b9f43e6d94671a08be024bb3001d7cf7e3ee02b2c63c2074e2ed4d6484dc5db7515cb170bf7432a8d11ccf595716e5c4500e SHA512 a028b67c0644d4ddcfc5aee4e2abb305648eb666082ea2c151cb6b9b3972503093cadb32b102aa19b04c8e863c2ac55bb20cccbf2abbf7832f9cfd3c3618612e diff --git a/dev-util/electron/electron-1.6.15.ebuild b/dev-util/electron/electron-1.6.16.ebuild index d4467b022301..58491cdd5640 100644 --- a/dev-util/electron/electron-1.6.15.ebuild +++ b/dev-util/electron/electron-1.6.16.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -8,7 +8,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr sv sw ta te th tr uk vi zh-CN zh-TW" -inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib \ +inherit check-reqs chromium-2 gnome2-utils flag-o-matic multilib \ multiprocessing pax-utils portability python-any-r1 toolchain-funcs \ versionator virtualx xdg-utils @@ -259,7 +259,7 @@ _unnest_patches() { | while read -r path; do relpath="$(dirname ${path})" out="${_s}/__${relpath////_}_$(basename ${path})" - sed -r -e "s|^([-+]{3}) [ab]/(.*)$|\1 ${relpath}/\2|g" \ + sed -r -e "s|^([-+]{3}) ([ab])/(.*)$|\1 \2/${relpath}/\3|g" \ "${_s}/${path}" > "${out}" || die done } @@ -349,27 +349,15 @@ src_prepare() { sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js || die sed -i -e "s|\"lib\"|\"${LIBDIR}\"|" deps/npm/lib/npm.js || die - cd "${CHROMIUM_S}" || die - # Apply libcc Chromium patches. + cd "${CHROMIUM_S}" || die _unnest_patches "${LIBCC_S}/patches" - - EPATCH_SOURCE="${LIBCC_S}/patches" \ - EPATCH_SUFFIX="patch" \ - EPATCH_FORCE="yes" \ - EPATCH_MULTI_MSG="Applying libchromiumcontent patches..." \ - epatch - - cd "${S}" || die + eapply "${LIBCC_S}/patches" # Apply Gentoo patches + cd "${S}" || die _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 + eapply "${WORKDIR}/${PATCHES_P}/${PV}" # Merge chromiumcontent component into chromium source tree. mkdir -p "${CHROMIUM_S}/chromiumcontent" || die |