Update to v1.56.0.

tagattie · tagattie · commit 537e42e63ea0 · 2021-04-28T20:40:45.000+09:00
diff --git a/editors/atom/Makefile b/editors/atom/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	atom
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.55.0
+DISTVERSION=	1.56.0
 CATEGORIES=	editors
 MASTER_SITES=	https://nodejs.org/dist/v${APM_NODE_VER}/:node \
 		https://github.com/tagattie/FreeBSD-Atom/releases/download/v1.42.0/:jasmine_tagged \
@@ -40,6 +40,7 @@ LIB_DEPENDS=	libatk-bridge-2.0.so:accessibility/at-spi2-atk \
 		libre2.so:devel/re2 \
 		liblcms2.so:graphics/lcms2 \
 		libdrm.so:graphics/libdrm \
+		libpng16.so:graphics/png \
 		libwebp.so:graphics/webp \
 		libavcodec.so:multimedia/ffmpeg \
 		libvpx.so:multimedia/libvpx \
@@ -61,7 +62,7 @@ USES=		desktop-file-utils gl gnome jpeg localbase:ldflags pkgconfig \
 
 USE_GITHUB=	yes
 
-.include "${.CURDIR}/../../devel/electron6/Makefile.version"
+.include "${.CURDIR}/../../devel/electron9/Makefile.version"
 # See ${WRKSRC}/apm/node_modules/atom-package-manager/BUNDLED_NODE_VERSION for APM_NODE_VER
 APM_NODE_VER=	12.4.0
 
@@ -207,6 +208,9 @@ do-install:
 		${FIND} . -type f -name '*.node' -exec ${STRIP_CMD} {} ';'
 	cd ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked && \
 		${FIND} . -type f -name '*.node' -exec ${STRIP_CMD} {} ';'
+	# remove left-out temporary files generated by strip command
+	cd ${STAGEDIR}${DATADIR}/resources/app.asar.unpacked && \
+		${FIND} . -type f -name 'ecp.*' -delete
 
 do-test:
 	# Note: Xvfb or something similar is necessary for headless testing
diff --git a/editors/atom/distinfo b/editors/atom/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1615702840
+TIMESTAMP = 1619526326
 SHA256 (node-v12.4.0.tar.gz) = cf39befb8ea486363cac6f297d8f451fd0d5dd8ad21dca51e9c2ea86b242baa0
 SIZE (node-v12.4.0.tar.gz) = 49167965
 SHA256 (jasmine-tagged-1.1.4.tar.gz) = 8988597858ddf9e9ba3333a19d8651691c8384117bf2e362e8a5ba193ed47585
 SIZE (jasmine-tagged-1.1.4.tar.gz) = 3071259
-SHA256 (atom-npm-cache-1.55.0.tar.gz) = 001676687a7bab868e6c200fb279eb06d3494fd996a149c98eb59c31da667627
-SIZE (atom-npm-cache-1.55.0.tar.gz) = 50572079
-SHA256 (atom-apm-cache-1.55.0.tar.gz) = adfc703c9b268bffe775942ff57d6a10ff0a8c0d3956582f5f3bb601799fc820
-SIZE (atom-apm-cache-1.55.0.tar.gz) = 116325472
-SHA256 (atom-atom-v1.55.0_GH0.tar.gz) = 50f7f77decf16d51b4620976a2d1c2d4c3cd256dbaebef41d2f3eed800d9a4f5
-SIZE (atom-atom-v1.55.0_GH0.tar.gz) = 11995968
+SHA256 (atom-npm-cache-1.56.0.tar.gz) = e8d3a1ccf5323483e483aead904112d007e5bf566dafc4b19d4df7dd8b497e53
+SIZE (atom-npm-cache-1.56.0.tar.gz) = 50705627
+SHA256 (atom-apm-cache-1.56.0.tar.gz) = f58b291b95122f6c8bb39dcfa89119b9be2d61305ac8270aeea8f47e900c73f8
+SIZE (atom-apm-cache-1.56.0.tar.gz) = 120333955
+SHA256 (atom-atom-v1.56.0_GH0.tar.gz) = 6e2c401c681314333e1756235df1d4d7a4d5b79d7179073621de6bb7ddc7ee1d
+SIZE (atom-atom-v1.56.0_GH0.tar.gz) = 12009366
diff --git 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	2021-02-19 11:15:39 UTC
+--- node_modules/github/package.json.orig	2021-04-27 12:34:26 UTC
 +++ node_modules/github/package.json
-@@ -215,7 +215,6 @@
+@@ -216,7 +216,6 @@
      "dedent-js": "1.0.1",
      "electron-devtools-installer": "3.1.1",
      "electron-link": "0.4.3",
diff --git a/editors/atom/files/atom/patch-node__modules_spell-check_lib_checker-env.coffee b/editors/atom/files/atom/patch-node__modules_spell-check_lib_checker-env.coffee
diff --git a/editors/atom/files/atom/patch-node__modules_spell-check_lib_checker-env.js b/editors/atom/files/atom/patch-node__modules_spell-check_lib_checker-env.js
@@ -0,0 +1,10 @@
+--- node_modules/spell-check/lib/checker-env.js.orig	2021-04-28 06:40:37 UTC
++++ node_modules/spell-check/lib/checker-env.js
+@@ -1,6 +1,6 @@
+ module.exports = {
+     isLinux() {
+-        return /linux/.test(process.platform);
++        return /(linux|freebsd)/.test(process.platform);
+     },
+     isWindows() {
+         return /win32/.test(process.platform);
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
diff --git a/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.js b/editors/atom/files/atom/patch-node__modules_spell-check_lib_locale-checker.js
@@ -0,0 +1,10 @@
+--- node_modules/spell-check/lib/locale-checker.js.orig	2021-04-28 06:41:59 UTC
++++ node_modules/spell-check/lib/locale-checker.js
+@@ -114,6 +114,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');
+             }
+ 
+             if (env.isDarwin()) {
diff --git a/editors/atom/files/atom/patch-node__modules_text-buffer_lib_text-buffer.js b/editors/atom/files/atom/patch-node__modules_text-buffer_lib_text-buffer.js
diff --git a/editors/atom/files/patch-package.json b/editors/atom/files/patch-package.json
@@ -1,6 +1,6 @@
---- package.json.orig	2020-05-18 19:34:10 UTC
+--- package.json.orig	2021-04-09 16:13:53 UTC
 +++ package.json
-@@ -76,7 +76,7 @@
+@@ -77,7 +77,7 @@
      "incompatible-packages": "file:packages/incompatible-packages",
      "jasmine-json": "~0.0",
      "jasmine-reporters": "1.1.0",
diff --git a/editors/atom/files/patch-script_package.json b/editors/atom/files/patch-script_package.json
@@ -1,11 +1,11 @@
---- script/package.json.orig	2020-11-06 18:27:28 UTC
+--- script/package.json.orig	2021-04-09 16:13:53 UTC
 +++ script/package.json
 @@ -12,9 +12,7 @@
      "coffeelint": "1.15.7",
      "colors": "1.1.2",
      "donna": "1.0.16",
 -    "electron-chromedriver": "^9.0.0",
-     "electron-link": "^0.4.3",
+     "electron-link": "^0.6.0",
 -    "electron-mksnapshot": "^9.0.2",
      "electron-packager": "^15.0.0",
      "eslint": "^5.16.0",
diff --git a/editors/atom/files/patch-script_test b/editors/atom/files/patch-script_test
@@ -1,4 +1,4 @@
---- script/test.orig	2021-01-13 18:29:23 UTC
+--- script/test.orig	2021-04-09 16:13:53 UTC
 +++ script/test
 @@ -69,7 +69,7 @@ if (process.platform === 'darwin') {
      'MacOS',
@@ -9,7 +9,7 @@
    const executablePaths = glob.sync(
      path.join(CONFIG.buildOutputPath, 'atom-*', 'atom')
    );
-@@ -243,7 +243,7 @@ function runCoreMainProcessTests(callback) {
+@@ -244,7 +244,7 @@ function runCoreMainProcessTests(callback) {
      testPath
    ];
  
@@ -18,7 +18,7 @@
      testArguments.push('--no-sandbox');
    }
  
-@@ -396,7 +396,7 @@ function requestedTestSuites(platform) {
+@@ -397,7 +397,7 @@ function requestedTestSuites(platform) {
    // Operating system overrides:
    coreMain =
      coreMain ||
diff --git a/editors/atom/files/patch-src_main-process_atom-window.js b/editors/atom/files/patch-src_main-process_atom-window.js
@@ -1,11 +1,11 @@
---- src/main-process/atom-window.js.orig	2020-10-09 14:47:49 UTC
+--- src/main-process/atom-window.js.orig	2021-04-09 16:13:53 UTC
 +++ src/main-process/atom-window.js
-@@ -56,7 +56,7 @@ module.exports = class AtomWindow extends EventEmitter
+@@ -67,7 +67,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.
--    if (process.platform === 'linux') options.icon = ICON_PATH;
-+    if (process.platform === 'linux' || process.platform === 'freebsd') options.icon = ICON_PATH;
+-    if (process.platform === 'linux')
++    if (process.platform === 'linux' || process.platform === 'freebsd')
+       options.icon = nativeImage.createFromPath(ICON_PATH);
      if (this.shouldAddCustomTitleBar()) options.titleBarStyle = 'hidden';
      if (this.shouldAddCustomInsetTitleBar())
-       options.titleBarStyle = 'hiddenInset';
diff --git 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	2021-01-13 18:29:23 UTC
+--- src/text-editor-component.js.orig	2021-04-09 16:13:53 UTC
 +++ src/text-editor-component.js
-@@ -1806,7 +1806,7 @@ module.exports = class TextEditorComponent {
+@@ -1797,7 +1797,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,16 +9,16 @@
    }
  
    didTextInput(event) {
-@@ -1970,7 +1970,7 @@ module.exports = class TextEditorComponent {
-       // On Linux, pasting happens on middle click. A textInput event with the
+@@ -1962,7 +1962,7 @@ module.exports = class TextEditorComponent {
        // contents of the selection clipboard will be dispatched by the browser
-       // automatically on mouseup.
--      if (platform === 'linux' && this.isInputEnabled())
-+      if ((platform === 'linux' || platform === 'freebsd') && this.isInputEnabled())
-         model.insertText(clipboard.readText('selection'));
-       return;
-     }
-@@ -2837,7 +2837,7 @@ module.exports = class TextEditorComponent {
+       // automatically on mouseup if editor.selectionClipboard is set to true.
+       if (
+-        platform === 'linux' &&
++        (platform === 'linux' || platform === 'freebsd') &&
+         this.isInputEnabled() &&
+         atom.config.get('editor.selectionClipboard')
+       )
+@@ -2832,7 +2832,7 @@ module.exports = class TextEditorComponent {
    didChangeSelectionRange() {
      const { model } = this.props;
  
diff --git a/editors/atom/pkg-plist b/editors/atom/pkg-plist
@@ -10,6 +10,8 @@ share/applications/atom.desktop
 %%DATADIR%%/icudtl.dat
 %%DATADIR%%/libEGL.so
 %%DATADIR%%/libGLESv2.so
+%%DATADIR%%/libvk_swiftshader.so
+%%DATADIR%%/libvulkan.so
 %%DATADIR%%/locales/am.pak
 %%DATADIR%%/locales/ar.pak
 %%DATADIR%%/locales/bg.pak
@@ -63,7 +65,6 @@ share/applications/atom.desktop
 %%DATADIR%%/locales/vi.pak
 %%DATADIR%%/locales/zh-CN.pak
 %%DATADIR%%/locales/zh-TW.pak
-%%DATADIR%%/natives_blob.bin
 %%DATADIR%%/resources.pak
 %%DATADIR%%/resources/LICENSE.md
 %%DATADIR%%/resources/app.asar
@@ -72,6 +73,10 @@ share/applications/atom.desktop
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/@atom/watcher/build/Release/watcher.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/ctags/build/Release/ctags.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/fs-admin/build/Release/fs_admin.node
+%%DATADIR%%/resources/app.asar.unpacked/node_modules/fswin/electron/ia32/fswin.node
+%%DATADIR%%/resources/app.asar.unpacked/node_modules/fswin/electron/x64/fswin.node
+%%DATADIR%%/resources/app.asar.unpacked/node_modules/fswin/node/ia32/fswin.node
+%%DATADIR%%/resources/app.asar.unpacked/node_modules/fswin/node/x64/fswin.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/git-utils/build/Release/git.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/github/bin/git-askpass-atom.js
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/github/bin/git-askpass-atom.sh
@@ -81,6 +86,7 @@ share/applications/atom.desktop
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/github/bin/linux-ssh-wrapper.sh
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/keyboard-layout/build/Release/keyboard-layout-manager.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/keytar/build/Release/keytar.node
+%%DATADIR%%/resources/app.asar.unpacked/node_modules/language-rust-bundled/node_modules/tree-sitter-rust/build/Release/tree_sitter_rust_binding.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/nslog/build/Release/nslog.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/oniguruma/build/Release/onig_scanner.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/pathwatcher/build/Release/pathwatcher.node
@@ -115,12 +121,10 @@ share/applications/atom.desktop
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/tree-sitter-python/build/Release/tree_sitter_python_binding.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/tree-sitter-regex/build/Release/tree_sitter_regex_binding.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/tree-sitter-ruby/build/Release/tree_sitter_ruby_binding.node
-%%DATADIR%%/resources/app.asar.unpacked/node_modules/tree-sitter-rust/build/Release/tree_sitter_rust_binding.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/tree-sitter-typescript/build/Release/tree_sitter_tsx_binding.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/tree-sitter-typescript/build/Release/tree_sitter_typescript_binding.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/tree-sitter/build/Release/tree_sitter_runtime_binding.node
 %%DATADIR%%/resources/app.asar.unpacked/node_modules/vscode-ripgrep/bin/rg
-%%DATADIR%%/resources/app.asar.unpacked/node_modules/whats-my-line/node_modules/superstring/build/Release/superstring.node
 %%DATADIR%%/resources/app.asar.unpacked/resources/atom.png
 %%DATADIR%%/resources/app/apm/.github/no-response.yml
 %%DATADIR%%/resources/app/apm/BUNDLED_NODE_VERSION
@@ -6338,12 +6342,12 @@ share/applications/atom.desktop
 %%DATADIR%%/resources/app/apm/templates/theme/styles/colors.less
 %%DATADIR%%/resources/app/apm/templates/theme/styles/syntax-variables.less
 %%DATADIR%%/resources/app/atom.sh
-%%DATADIR%%/resources/electron.asar
 %%DATADIR%%/snapshot_blob.bin
 %%DATADIR%%/swiftshader/libEGL.so
 %%DATADIR%%/swiftshader/libGLESv2.so
 %%DATADIR%%/v8_context_snapshot.bin
 %%DATADIR%%/version
+%%DATADIR%%/vk_swiftshader_icd.json
 share/icons/hicolor/1024x1024/apps/atom.png
 share/icons/hicolor/128x128/apps/atom.png
 share/icons/hicolor/16x16/apps/atom.png
