Skip to content

Commit 17ed7af

Browse files
committed
Update to v1.48.0.
- Remove version lock of python dependency.
1 parent 8ebacf9 commit 17ed7af

10 files changed

+996
-558
lines changed

editors/atom/Makefile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
PORTNAME= atom
44
DISTVERSIONPREFIX= v
5-
DISTVERSION= 1.47.0
5+
DISTVERSION= 1.48.0
66
CATEGORIES= editors
77
MASTER_SITES= https://nodejs.org/dist/v${APM_NODE_VER}/:node \
88
https://github.com/tagattie/FreeBSD-Atom/releases/download/v1.42.0/:jasmine_tagged \
@@ -59,13 +59,13 @@ RUN_DEPENDS= git:devel/git \
5959
TEST_DEPENDS= bash:shells/bash
6060

6161
USES= desktop-file-utils gl gnome jpeg localbase:ldflags pkgconfig \
62-
python:2.7 shebangfix xorg
62+
python shebangfix xorg
6363

6464
USE_GITHUB= yes
6565

6666
.include "${.CURDIR}/../../devel/electron5/Makefile.version"
6767
# See ${WRKSRC}/apm/node_modules/atom-package-manager/BUNDLED_NODE_VERSION for APM_NODE_VER
68-
APM_NODE_VER= 10.2.1
68+
APM_NODE_VER= 10.20.1
6969

7070
BINARY_ALIAS= python=${PYTHON_CMD}
7171

@@ -80,7 +80,6 @@ USE_LDCONFIG= ${DATADIR}
8080
SHEBANG_FILES= atom.sh
8181
SHEBANG_FILES_APM= apm/node_modules/atom-package-manager/bin/apm \
8282
apm/node_modules/atom-package-manager/bin/npm \
83-
apm/node_modules/atom-package-manager/bin/python-interceptor.sh \
8483
apm/node_modules/atom-package-manager/script/postinstall.sh \
8584
apm/node_modules/atom-package-manager/node_modules/npm/configure \
8685
apm/node_modules/atom-package-manager/node_modules/npm/lib/utils/completion.sh \

editors/atom/distinfo

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
TIMESTAMP = 1590137023
2-
SHA256 (node-v10.2.1.tar.gz) = dcdba29f6b933969d6a8a36ea91cfd44bcb500a1e582a3273ac3d4d930e721e4
3-
SIZE (node-v10.2.1.tar.gz) = 35757099
1+
TIMESTAMP = 1592293794
2+
SHA256 (node-v10.20.1.tar.gz) = ea39a70b715bfbd0281979c95a5b81136ffdc0e5bf66b1fd7dc3ef3473ce2c5a
3+
SIZE (node-v10.20.1.tar.gz) = 47181867
44
SHA256 (jasmine-tagged-1.1.4.tar.gz) = 8988597858ddf9e9ba3333a19d8651691c8384117bf2e362e8a5ba193ed47585
55
SIZE (jasmine-tagged-1.1.4.tar.gz) = 3071259
6-
SHA256 (atom-npm-cache-1.47.0.tar.gz) = c48d8734ea6edfdebd67cbd832e17b1dac23a30c0712b2e4c7ee4485fd7c80eb
7-
SIZE (atom-npm-cache-1.47.0.tar.gz) = 44975239
8-
SHA256 (atom-apm-cache-1.47.0.tar.gz) = 5d6abc0e44ea18dd8a5bbd7ac9c623a43c01b43139edb7c5914be893a14146df
9-
SIZE (atom-apm-cache-1.47.0.tar.gz) = 107773992
10-
SHA256 (atom-atom-v1.47.0_GH0.tar.gz) = 7a20d938ac3960497935d8fe46ea9e08f2d7fa5308ff6a8a0b48c8af73f846d6
11-
SIZE (atom-atom-v1.47.0_GH0.tar.gz) = 11943320
6+
SHA256 (atom-npm-cache-1.48.0.tar.gz) = 0fa90aabf0dae2d27947204b2a582c9adb8a779ee0b9653aac5cdc250ef6a5bc
7+
SIZE (atom-npm-cache-1.48.0.tar.gz) = 52247716
8+
SHA256 (atom-apm-cache-1.48.0.tar.gz) = 7ebd39b57102ce08c9a7a0ffe427aeecc2d69e9e799cf1efd75008d6de93d8eb
9+
SIZE (atom-apm-cache-1.48.0.tar.gz) = 108042065
10+
SHA256 (atom-atom-v1.48.0_GH0.tar.gz) = 107dda1915a8bbf0c7d0dfd9637ca15d6c0032ae260d82db5327a041d12c4465
11+
SIZE (atom-atom-v1.48.0_GH0.tar.gz) = 11943695

editors/atom/files/atom/patch-node__modules_github_test_git-strategies.test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- node_modules/github/test/git-strategies.test.js.orig 2020-04-22 18:35:27 UTC
1+
--- node_modules/github/test/git-strategies.test.js.orig 2020-02-26 21:07:14 UTC
22
+++ node_modules/github/test/git-strategies.test.js
3-
@@ -1536,7 +1536,7 @@ import * as reporterProxy from '../lib/reporter-proxy'
3+
@@ -1535,7 +1535,7 @@ import * as reporterProxy from '../lib/reporter-proxy'
44
assert.match(options.env.DISPLAY, /^.+$/);
55
assert.match(options.env.SSH_ASKPASS, /git-askpass-atom\.sh$/);
66
assert.match(options.env.GIT_ASKPASS, /git-askpass-atom\.sh$/);

editors/atom/files/node/patch-common.gypi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- common.gypi.orig 2020-05-09 05:51:01 UTC
1+
--- common.gypi.orig 2020-04-12 11:55:35 UTC
22
+++ common.gypi
3-
@@ -455,15 +455,6 @@
3+
@@ -509,15 +509,6 @@
44
'libraries': [ '-lelf' ],
55
}],
66
['OS=="freebsd"', {

editors/atom/files/node/patch-configure renamed to editors/atom/files/node/patch-configure.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- configure.orig 2020-05-09 05:50:03 UTC
2-
+++ configure
3-
@@ -668,7 +668,7 @@ def get_nasm_version(asm):
1+
--- configure.py.orig 2020-06-16 06:19:09 UTC
2+
+++ configure.py
3+
@@ -705,7 +705,7 @@ def get_nasm_version(asm):
44

55
def get_llvm_version(cc):
66
return get_version_helper(

editors/atom/files/patch-script_package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- script/package.json.orig 2020-05-18 19:34:10 UTC
1+
--- script/package.json.orig 2020-06-10 09:38:09 UTC
22
+++ script/package.json
33
@@ -10,9 +10,7 @@
44
"coffeelint": "1.15.7",
@@ -17,4 +17,4 @@
1717
- "minidump": "0.9.0",
1818
"mkdirp": "0.5.1",
1919
"normalize-package-data": "2.3.5",
20-
"npm": "6.2.0",
20+
"npm": "6.14.4",

editors/atom/files/patch-src_config-schema.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- src/config-schema.js.orig 2019-10-21 17:33:40 UTC
1+
--- src/config-schema.js.orig 2020-06-10 09:38:09 UTC
22
+++ src/config-schema.js
3-
@@ -614,12 +614,12 @@ const configSchema = {
3+
@@ -620,12 +620,12 @@ const configSchema = {
44
}
55
};
66

editors/atom/files/patch-src_main-process_atom-window.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- src/main-process/atom-window.js.orig 2020-05-18 19:34:10 UTC
1+
--- src/main-process/atom-window.js.orig 2020-06-10 09:38:09 UTC
22
+++ src/main-process/atom-window.js
3-
@@ -54,7 +54,7 @@ module.exports = class AtomWindow extends EventEmitter
3+
@@ -55,7 +55,7 @@ module.exports = class AtomWindow extends EventEmitter
44

55
// Don't set icon on Windows so the exe's ico will be used as window and
66
// taskbar's icon. See https://github.com/atom/atom/issues/4811 for more.

editors/atom/files/patch-src_text-editor-component.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
--- src/text-editor-component.js.orig 2020-05-18 19:34:10 UTC
1+
--- src/text-editor-component.js.orig 2020-06-10 09:38:09 UTC
22
+++ src/text-editor-component.js
33
@@ -1812,7 +1812,7 @@ module.exports = class TextEditorComponent {
44
// the paste event. And since we don't use the `paste` event for any
@@ -18,7 +18,7 @@
1818
model.insertText(clipboard.readText('selection'));
1919
return;
2020
}
21-
@@ -2846,7 +2846,7 @@ module.exports = class TextEditorComponent {
21+
@@ -2848,7 +2848,7 @@ module.exports = class TextEditorComponent {
2222
didChangeSelectionRange() {
2323
const { model } = this.props;
2424

0 commit comments

Comments
 (0)