diff options
author | Hiroki Tagato <tagattie@FreeBSD.org> | 2020-05-25 06:52:10 +0000 |
---|---|---|
committer | Hiroki Tagato <tagattie@FreeBSD.org> | 2020-05-25 06:52:10 +0000 |
commit | bc50cd6c1d97201088ddf504a885e62d84f4e8f4 (patch) | |
tree | 1829a9dd6f85b1ca6c3987879f17bde8772548cf /editors/atom/files | |
parent | Upgrade to 1.4.5 (diff) |
Update to 1.47.0
Approved by: mentors (implicit)
Changelog: https://github.com/atom/atom/releases/tag/v1.47.0
Notes
Notes:
svn path=/head/; revision=536441
Diffstat (limited to 'editors/atom/files')
8 files changed, 24 insertions, 35 deletions
diff --git a/editors/atom/files/atom/patch-node__modules_github_package.json b/editors/atom/files/atom/patch-node__modules_github_package.json index f3ed8e55d84f..7545f4d4a844 100644 --- a/editors/atom/files/atom/patch-node__modules_github_package.json +++ b/editors/atom/files/atom/patch-node__modules_github_package.json @@ -1,6 +1,6 @@ ---- node_modules/github/package.json.orig 2020-03-17 05:46:57 UTC +--- node_modules/github/package.json.orig 2020-05-22 08:46:19 UTC +++ node_modules/github/package.json -@@ -215,7 +215,6 @@ +@@ -214,7 +214,6 @@ "dedent-js": "1.0.1", "electron-devtools-installer": "2.2.4", "electron-link": "0.4.1", diff --git a/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.coffee b/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.coffee index fa21f1011779..1c2916469a15 100644 --- a/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.coffee +++ b/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.coffee @@ -1,10 +1,10 @@ ---- node_modules/spell-check/lib/locale-checker.coffee.orig 2020-05-09 06:41:08 UTC +--- node_modules/spell-check/lib/locale-checker.coffee.orig 2020-05-18 17:31:39 UTC +++ node_modules/spell-check/lib/locale-checker.coffee -@@ -78,6 +78,7 @@ class LocaleChecker - searchPaths.push "/usr/share/hunspell" - searchPaths.push "/usr/share/myspell" - searchPaths.push "/usr/share/myspell/dicts" -+ searchPaths.push "/usr/local/share/hunspell" +@@ -73,6 +73,7 @@ class LocaleChecker + searchPaths.push "/usr/share/hunspell" + searchPaths.push "/usr/share/myspell" + searchPaths.push "/usr/share/myspell/dicts" ++ searchPaths.push "/usr/local/share/hunspell" - # OS X uses the following paths. - if env.isDarwin() + if env.isDarwin() + searchPaths.push "/" diff --git a/editors/atom/files/patch-package.json b/editors/atom/files/patch-package.json index 928c324ab84e..14607eee4e07 100644 --- a/editors/atom/files/patch-package.json +++ b/editors/atom/files/patch-package.json @@ -1,4 +1,4 @@ ---- package.json.orig 2020-04-22 18:42:32 UTC +--- package.json.orig 2020-05-18 19:34:10 UTC +++ package.json @@ -76,7 +76,7 @@ "incompatible-packages": "file:packages/incompatible-packages", @@ -8,4 +8,4 @@ + "jasmine-tagged": "file:../jasmine-tagged", "key-path-helpers": "^0.4.0", "keybinding-resolver": "https://www.atom.io/api/packages/keybinding-resolver/versions/0.39.0/tarball", - "language-c": "https://www.atom.io/api/packages/language-c/versions/0.60.18/tarball", + "language-c": "https://www.atom.io/api/packages/language-c/versions/0.60.19/tarball", diff --git a/editors/atom/files/patch-script_package.json b/editors/atom/files/patch-script_package.json index f1d14351d6a0..d365860ad457 100644 --- a/editors/atom/files/patch-script_package.json +++ b/editors/atom/files/patch-script_package.json @@ -1,12 +1,12 @@ ---- script/package.json.orig 2019-12-13 19:07:42 UTC +--- script/package.json.orig 2020-05-18 19:34:10 UTC +++ script/package.json @@ -10,9 +10,7 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16", -- "electron-chromedriver": "^4.2.0", - "electron-link": "0.4.0", -- "electron-mksnapshot": "^4.2.0", +- "electron-chromedriver": "^5.0.0", + "electron-link": "0.4.1", +- "electron-mksnapshot": "^5.0.0", "electron-packager": "12.2.0", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0", diff --git a/editors/atom/files/patch-script_test b/editors/atom/files/patch-script_test index 610bafd60c13..7bde6f8301cb 100644 --- a/editors/atom/files/patch-script_test +++ b/editors/atom/files/patch-script_test @@ -1,4 +1,4 @@ ---- script/test.orig 2019-12-13 19:07:42 UTC +--- script/test.orig 2020-05-18 19:34:10 UTC +++ script/test @@ -51,7 +51,7 @@ if (process.platform === 'darwin') { const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, '*.app')) @@ -9,7 +9,7 @@ const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, 'atom-*', 'atom')) assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`) executablePath = executablePaths[0] -@@ -215,7 +215,7 @@ function testSuitesForPlatform (platform) { +@@ -222,7 +222,7 @@ function testSuitesForPlatform (platform) { case 'win32': suites = (process.arch === 'x64') ? [runCoreMainProcessTests, runCoreRenderProcessTests] : [runCoreMainProcessTests] break diff --git a/editors/atom/files/patch-src_main-process_atom-window.js b/editors/atom/files/patch-src_main-process_atom-window.js index 490df1c0904e..303078987b64 100644 --- a/editors/atom/files/patch-src_main-process_atom-window.js +++ b/editors/atom/files/patch-src_main-process_atom-window.js @@ -1,6 +1,6 @@ ---- src/main-process/atom-window.js.orig 2019-10-21 17:33:40 UTC +--- src/main-process/atom-window.js.orig 2020-05-18 19:34:10 UTC +++ src/main-process/atom-window.js -@@ -53,7 +53,7 @@ module.exports = class AtomWindow extends EventEmitter +@@ -54,7 +54,7 @@ module.exports = class AtomWindow extends EventEmitter // Don't set icon on Windows so the exe's ico will be used as window and // taskbar's icon. See https://github.com/atom/atom/issues/4811 for more. diff --git a/editors/atom/files/patch-src_text-editor-component.js b/editors/atom/files/patch-src_text-editor-component.js index 88091c60e55f..a416279fa2f2 100644 --- a/editors/atom/files/patch-src_text-editor-component.js +++ b/editors/atom/files/patch-src_text-editor-component.js @@ -1,6 +1,6 @@ ---- src/text-editor-component.js.orig 2019-10-21 17:33:40 UTC +--- src/text-editor-component.js.orig 2020-05-18 19:34:10 UTC +++ src/text-editor-component.js -@@ -1809,7 +1809,7 @@ module.exports = class TextEditorComponent { +@@ -1812,7 +1812,7 @@ module.exports = class TextEditorComponent { // the paste event. And since we don't use the `paste` event for any // behavior in Atom, we can no-op the event to eliminate this issue. // See https://github.com/atom/atom/pull/15183#issue-248432413. @@ -9,7 +9,7 @@ } didTextInput(event) { -@@ -1973,7 +1973,7 @@ module.exports = class TextEditorComponent { +@@ -1976,7 +1976,7 @@ module.exports = class TextEditorComponent { // On Linux, pasting happens on middle click. A textInput event with the // contents of the selection clipboard will be dispatched by the browser // automatically on mouseup. @@ -18,7 +18,7 @@ model.insertText(clipboard.readText('selection')); return; } -@@ -2843,7 +2843,7 @@ module.exports = class TextEditorComponent { +@@ -2846,7 +2846,7 @@ module.exports = class TextEditorComponent { didChangeSelectionRange() { const { model } = this.props; diff --git a/editors/atom/files/script/patch-script_node__modules_os-homedir_index.js b/editors/atom/files/script/patch-script_node__modules_os-homedir_index.js deleted file mode 100644 index 3b18e2187ed6..000000000000 --- a/editors/atom/files/script/patch-script_node__modules_os-homedir_index.js +++ /dev/null @@ -1,11 +0,0 @@ ---- script/node_modules/os-homedir/index.js.orig 2019-12-27 05:38:53 UTC -+++ script/node_modules/os-homedir/index.js -@@ -14,7 +14,7 @@ function homedir() { - return home || (user ? '/Users/' + user : null); - } - -- if (process.platform === 'linux') { -+ if (process.platform === 'linux' || process.platform === 'freebsd') { - return home || (process.getuid() === 0 ? '/root' : (user ? '/home/' + user : null)); - } - |