| 1 |
commit: 2614f489c95624b45b9c5e573887a4a6baeb3326 |
| 2 |
Author: Elvis Pranskevichus <elvis <AT> magic <DOT> io> |
| 3 |
AuthorDate: Wed Feb 1 15:31:09 2017 +0000 |
| 4 |
Commit: Mikhail Pukhlikov <cynede <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 8 12:40:37 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2614f489 |
| 7 |
|
| 8 |
app-editors/atom: Version bump to 1.12.7, 1.13.1 |
| 9 |
|
| 10 |
Package-Manager: portage-2.3.3 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/3761 |
| 12 |
|
| 13 |
app-editors/atom/Manifest | 6 ++++-- |
| 14 |
.../atom/{atom-1.12.2.ebuild => atom-1.12.7.ebuild} | 5 +++-- |
| 15 |
.../atom/{atom-1.12.2.ebuild => atom-1.13.1.ebuild} | 14 +++++++++----- |
| 16 |
app-editors/atom/files/atom-1.13-apm-path.patch | 16 ++++++++++++++++ |
| 17 |
app-editors/atom/files/atom-fix-app-restart.patch | 12 ++++++++++++ |
| 18 |
5 files changed, 44 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
diff --git a/app-editors/atom/Manifest b/app-editors/atom/Manifest |
| 21 |
index 0e8e0bf35e..0186079974 100644 |
| 22 |
--- a/app-editors/atom/Manifest |
| 23 |
+++ b/app-editors/atom/Manifest |
| 24 |
@@ -1,8 +1,10 @@ |
| 25 |
DIST asar-0.12.1.tar.gz 1016626 SHA256 731714f0036318fe0878b517391a01977954bb088d4dbc7dd98682ff1e03c0e7 SHA512 fc64be9b11215426d405f7acd7adf6c0eead3135b0012baf6d168a13c77675058a4e2c60682928ac014e4bef4538d452ad745d1e87dd315387997a19e04718a7 WHIRLPOOL d73b8bb459724bb3b011de312171519c1f1954a94ce1bb0a20eb9877c168baa82a15786d3ab420d5b3d32ce8a11333e85f844b43c21cbd56c3b019e73774388e |
| 26 |
-DIST atom-1.12.2.rpm 84876214 SHA256 bcf95d7a8f4105c016d2940540d7c8db9bf0948a7dc8b5411294bd0fac48ec15 SHA512 a63af5e0da6ce0e9cc70c47da55b13fe463903c27a7df4e7ce311f08ed16fb4e04712678479661febcdf70afa400e3a8235d540bacaf4078e92b1e3d42fdfc11 WHIRLPOOL 4d6793741496cc240da18540bb74751b193e293a2df14c365c8fed2a2672422f87b36c5faf324790cc45951c8006a4b482656e8c8d3fd46d723c12c8ca073b4e |
| 27 |
+DIST atom-1.12.7.rpm 84755598 SHA256 8eaa5426c9209efc91969e3f3b1535f2c1895daf6259c07cbd595dd0a599553f SHA512 f2d582eb916e95373a08a1e56b89492f52547ab853fae7975b8193ee5d0a23dfc86bcaf9de5b53bc0dbd955c784abfede5b162fb6ef5ee0f7424fc0882da848c WHIRLPOOL aa029e8ef519f475b0a9a9f592cb685b4f15f4c257774c7ca644ed69bf50128bce4c382581b133e7c43438f690ed6b3d791ad379109b96a8ef9893ef93e0ad98 |
| 28 |
+DIST atom-1.13.1.rpm 86119349 SHA256 593fa81abb3a3a8c89713de1fb9d7d3dd4e4b34211de69fee67469b63be98f01 SHA512 57e587441fbc5ed7864d54f067386a54e854c761b3ad577e07d58253d693c90de934af98e1dc16bf1b645a7b87e9169d0a869509c0192103ddede51a1d8b95d6 WHIRLPOOL 51b8ce72c4b9b01ca8afc3ae5a548e0dbf437fc629305acf357c6de44a05b20a7d8736c89d78cd1cb84fe22109445e5d9d773e0d50e321fcdabca015f64a55a7 |
| 29 |
+DIST atom-buffer-offset-index-9588080533c9d0a8a71ee1cfd98596f485940e91.tar.gz 5558 SHA256 ea940264e4d6f2b5ad319c50e7e4ece64e1fd4d1f790c847dedf0a5bc4e9b2c9 SHA512 ebcfa7057c9db85a7884cbb19fa561821fc883bbd6a5d0186fcf68782697a7c7677e019334b44b3477d26e1febccb3a7690dc3390dcb55ca838e176f390b11b7 WHIRLPOOL 1c438ec18c2fcf1c7b1a11421eb9944a2fd90f920dc4dc5cf0b8c5300f9f285cc993689312a23b9882f13316956077bf9994173c0b1c9cd54c6f5ccdd667d16f |
| 30 |
DIST atom-cached-run-in-this-context-0.4.1.tar.gz 3855 SHA256 5487e7641d5031e652deeef8bebe2d3af4e4d2b89989dd8700bf14e33843ce89 SHA512 dca2a6c77bb94e704aa99b405ae017bf0c56ce536a7246a8feaf133722556d444fb684cd6b9b475abcd0b946a42073a9fc0d61f5141b564320ac023ab2fbf79d WHIRLPOOL 573d0f703989f31109854f0eb324d6b1364e93cd057c4cfe20409415dee3101964cacabc246d4df43124dad881d8fec8575c6bbb23ba98698e6c73cf3c5614d4 |
| 31 |
DIST atom-git-utils-4.1.2.tar.gz 36492 SHA256 fd627647742359946d3b8f88bc91dd4d68a047dcba5bfafbd690e1a20afeb908 SHA512 d1f0a5bbd6b059131ccf4ab92174d80caddbb254ea6d0676a5ce71d7dba55d60c86ed1c412862b9d104a5f6deb2671facad84841f9644afb9b37416b743e917a WHIRLPOOL 4ee4620b0208a30f848167fffce05c5999d38bf5a3e50567e6bcf295fdafc7861e870346cfeb28a61392e7a737e100f90ae1dbd25066469926e3148006e02937 |
| 32 |
-DIST atom-keyboard-layout-2.0.1.tar.gz 18561 SHA256 057d01745b5cfb47381aa89d64344d4c1576d3b490756a25e3f616bfc68f6516 SHA512 f5b90c1c83574cd2cb49c82d11fabadb58ec41d34b5b6ea17b28b8a34b22ed9ce1afb1602cf1d3d28ba79e3cebcb60d8659201eea4c5294e0db2b29d7632b07a WHIRLPOOL a859b0d364b9059f4482b52f049e9a420bf356e00a5cfe5b657fbd0e1868fd6cd2bf39846560b88c9763e1ebc54fb7acb025a67af21182b00c3f83b380f4443f |
| 33 |
+DIST atom-keyboard-layout-2.0.7.tar.gz 18687 SHA256 3fb6c702c07d4d7116d73e5ed457f8dd2b07a99eafb7da830c032545d6da1f1e SHA512 96a10dad193d2e870e518eb863e4bf758e1efa86c4e377a3dcb818b5f51d42eaab9211732eddac106b7d4dddf6d9ebe80fb4a16ca24c647a0599a3a92e2c4591 WHIRLPOOL 01c28f7dadb8961ed6480a6ca2f9fab6c7e78436317b12f2731e130af405a456ea21719c0a409aa87248eaee956792fc37dcb040d900e2acc5005917c0f4666c |
| 34 |
DIST atom-marker-index-4.0.1.tar.gz 18433 SHA256 ecb6a5294088feb2a2b8ae71845dc262e1ab551a6a75e9ac99b05807b62b2d4a SHA512 2f5639ac0fef1a9d735dc10b464a046ee78f8cf7ecd8a6705232c319958a46056146bd91a0bf421aa0c6da39106f6deacaedaa40c442c0c08f0e6fbfd938b3ea WHIRLPOOL ccbd0f6a515b97a1fcf460f13388206ab3ccee364264203fa6d6ad3d6e68a4e06bad5f38ce19008d2a5f79d2becb14a459cbd016f0daaea48c5387c21ad1bb77 |
| 35 |
DIST atom-node-ctags-3.0.0.tar.gz 15062 SHA256 40605012d06d4dcbfc369862b57900b6963613e2e4ee3b37fea21693b2b418a7 SHA512 6f7277a0ff872991c365f811c635fd881c3e466c20219d8a7bdaf6fec7c26c5feaa7ae2118691a8d52ceb3ecfda6d795bf39dfda7f8df5a6d02388575a010f87 WHIRLPOOL 2cff81d2ca405a615e5c7d284785f129f8fcd968998c68a42af1ca2e6d76a6fcb404a92f3c0d20220567b28593448b91657db6df8bce19de1f2eedbfe2959140 |
| 36 |
DIST atom-node-keytar-3.0.2.tar.gz 5718 SHA256 16af03d2a7876e3008f82d35e913753384655bc181e93cb771639b6d5a2439bf SHA512 f08ec6e50071e6e8995244607144009eaa8fd61a1724c80c40ccfb497e2b4682b30d6a091de9480b78f49ceb11f1a655e12ccb6b43d3df34f7e089585381697a WHIRLPOOL 69b10619531bedb839c61c1b29d18d1a0bf4e468ed05ebd58db349010b8de555673f45bdf98c4ad252aaa960b47faa00d952470e9b3545a0e1e189bbb3e49ded |
| 37 |
|
| 38 |
diff --git a/app-editors/atom/atom-1.12.2.ebuild b/app-editors/atom/atom-1.12.7.ebuild |
| 39 |
similarity index 98% |
| 40 |
copy from app-editors/atom/atom-1.12.2.ebuild |
| 41 |
copy to app-editors/atom/atom-1.12.7.ebuild |
| 42 |
index 4c9b026e95..19991e7199 100644 |
| 43 |
--- a/app-editors/atom/atom-1.12.2.ebuild |
| 44 |
+++ b/app-editors/atom/atom-1.12.7.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2016 Gentoo Foundation |
| 47 |
+# Copyright 1999-2017 Gentoo Foundation |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
# $Id$ |
| 50 |
|
| 51 |
@@ -34,7 +34,7 @@ MARKER_INDEX_V=4.0.1 |
| 52 |
NODE_KEYTAR_V=3.0.2 |
| 53 |
|
| 54 |
# atom-keymap dependency |
| 55 |
-KEYBOARD_LAYOUT_V=2.0.1 |
| 56 |
+KEYBOARD_LAYOUT_V=2.0.7 |
| 57 |
|
| 58 |
# symbols-view dependency |
| 59 |
NODE_CTAGS_V=3.0.0 |
| 60 |
@@ -265,6 +265,7 @@ src_prepare() { |
| 61 |
|
| 62 |
eapply "${FILESDIR}/atom-apm-path.patch" |
| 63 |
eapply "${FILESDIR}/atom-license-path.patch" |
| 64 |
+ eapply "${FILESDIR}/atom-fix-app-restart.patch" |
| 65 |
|
| 66 |
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \ |
| 67 |
"${S}/build/app/src/config-schema.js" || die |
| 68 |
|
| 69 |
diff --git a/app-editors/atom/atom-1.12.2.ebuild b/app-editors/atom/atom-1.13.1.ebuild |
| 70 |
similarity index 96% |
| 71 |
rename from app-editors/atom/atom-1.12.2.ebuild |
| 72 |
rename to app-editors/atom/atom-1.13.1.ebuild |
| 73 |
index 4c9b026e95..84c2ee311f 100644 |
| 74 |
--- a/app-editors/atom/atom-1.12.2.ebuild |
| 75 |
+++ b/app-editors/atom/atom-1.13.1.ebuild |
| 76 |
@@ -1,4 +1,4 @@ |
| 77 |
-# Copyright 1999-2016 Gentoo Foundation |
| 78 |
+# Copyright 1999-2017 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
# $Id$ |
| 81 |
|
| 82 |
@@ -25,16 +25,17 @@ NODE_ONIGURUMA_V=6.1.0 |
| 83 |
NODE_PATHWATCHER_V=6.5.0 |
| 84 |
NODE_RUNAS_V=3.1.1 |
| 85 |
SCROLLBAR_STYLE_V=3.2.0 |
| 86 |
-SPELL_CHECK_V=0.68.4 |
| 87 |
+SPELL_CHECK_V=0.68.5 |
| 88 |
|
| 89 |
-# textbuffer dependency |
| 90 |
+# text-buffer dependencies |
| 91 |
+BUFFER_OFFSET_INDEX_V=9588080533c9d0a8a71ee1cfd98596f485940e91 |
| 92 |
MARKER_INDEX_V=4.0.1 |
| 93 |
|
| 94 |
# apm dependency |
| 95 |
NODE_KEYTAR_V=3.0.2 |
| 96 |
|
| 97 |
# atom-keymap dependency |
| 98 |
-KEYBOARD_LAYOUT_V=2.0.1 |
| 99 |
+KEYBOARD_LAYOUT_V=2.0.7 |
| 100 |
|
| 101 |
# symbols-view dependency |
| 102 |
NODE_CTAGS_V=3.0.0 |
| 103 |
@@ -53,6 +54,7 @@ SRC_URI=" |
| 104 |
https://github.com/atom/node-ctags/archive/v${NODE_CTAGS_V}.tar.gz -> atom-node-ctags-${NODE_CTAGS_V}.tar.gz |
| 105 |
https://github.com/atom/git-utils/archive/v${GIT_UTILS_V}.tar.gz -> atom-git-utils-${GIT_UTILS_V}.tar.gz |
| 106 |
https://github.com/atom/keyboard-layout/archive/v${KEYBOARD_LAYOUT_V}.tar.gz -> atom-keyboard-layout-${KEYBOARD_LAYOUT_V}.tar.gz |
| 107 |
+ https://github.com/atom/buffer-offset-index/archive/${BUFFER_OFFSET_INDEX_V}.tar.gz -> atom-buffer-offset-index-${BUFFER_OFFSET_INDEX_V}.tar.gz |
| 108 |
https://github.com/atom/marker-index/archive/v${MARKER_INDEX_V}.tar.gz -> atom-marker-index-${MARKER_INDEX_V}.tar.gz |
| 109 |
https://github.com/atom/node-keytar/archive/v${NODE_KEYTAR_V}.tar.gz -> atom-node-keytar-${NODE_KEYTAR_V}.tar.gz |
| 110 |
https://github.com/atom/node-nslog/archive/v${NODE_NSLOG_V}.tar.gz -> atom-node-nslog-${NODE_NSLOG_V}.tar.gz |
| 111 |
@@ -76,6 +78,7 @@ BINMODS=" |
| 112 |
scrollbar-style |
| 113 |
node-spellchecker |
| 114 |
marker-index |
| 115 |
+ buffer-offset-index |
| 116 |
" |
| 117 |
|
| 118 |
RESTRICT="mirror" |
| 119 |
@@ -263,8 +266,9 @@ src_prepare() { |
| 120 |
|
| 121 |
cd "${S}" || die |
| 122 |
|
| 123 |
- eapply "${FILESDIR}/atom-apm-path.patch" |
| 124 |
+ eapply "${FILESDIR}/atom-1.13-apm-path.patch" |
| 125 |
eapply "${FILESDIR}/atom-license-path.patch" |
| 126 |
+ eapply "${FILESDIR}/atom-fix-app-restart.patch" |
| 127 |
|
| 128 |
sed -i -e "s|{{ATOM_SUFFIX}}|${suffix}|g" \ |
| 129 |
"${S}/build/app/src/config-schema.js" || die |
| 130 |
|
| 131 |
diff --git a/app-editors/atom/files/atom-1.13-apm-path.patch b/app-editors/atom/files/atom-1.13-apm-path.patch |
| 132 |
new file mode 100644 |
| 133 |
index 0000000000..0dcb7914c6 |
| 134 |
--- /dev/null |
| 135 |
+++ b/app-editors/atom/files/atom-1.13-apm-path.patch |
| 136 |
@@ -0,0 +1,16 @@ |
| 137 |
+diff --git a/build/app/src/config-schema.js b/build/app/src/config-schema.js |
| 138 |
+index 1307db6..d6a1ba4 100644 |
| 139 |
+--- a/build/app/src/config-schema.js |
| 140 |
++++ b/build/app/src/config-schema.js |
| 141 |
+@@ -21,6 +21,11 @@ var configSchema = { |
| 142 |
+ core: { |
| 143 |
+ type: 'object', |
| 144 |
+ properties: { |
| 145 |
++ apmPath: { |
| 146 |
++ type: 'string', |
| 147 |
++ 'default': '/usr/bin/apm{{ATOM_SUFFIX}}', |
| 148 |
++ description: 'Path to apm executable.' |
| 149 |
++ }, |
| 150 |
+ ignoredNames: { |
| 151 |
+ type: 'array', |
| 152 |
+ 'default': ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db'], |
| 153 |
|
| 154 |
diff --git a/app-editors/atom/files/atom-fix-app-restart.patch b/app-editors/atom/files/atom-fix-app-restart.patch |
| 155 |
new file mode 100644 |
| 156 |
index 0000000000..1bfa1ed429 |
| 157 |
--- /dev/null |
| 158 |
+++ b/app-editors/atom/files/atom-fix-app-restart.patch |
| 159 |
@@ -0,0 +1,12 @@ |
| 160 |
+diff --git a/atom-application.js.orig b/atom-application.js |
| 161 |
+index 92d985f..9a120e6 100644 |
| 162 |
+--- a/build/app/src/main-process/atom-application.js |
| 163 |
++++ b/build/app/src/main-process/atom-application.js |
| 164 |
+@@ -1178,6 +1178,7 @@ |
| 165 |
+ AtomApplication.prototype.restart = function() { |
| 166 |
+ var args; |
| 167 |
+ args = []; |
| 168 |
++ args.push("--app=" + this.resourcePath); |
| 169 |
+ if (this.safeMode) { |
| 170 |
+ args.push("--safe"); |
| 171 |
+ } |
Archives