Skip to content

Commit f34f4df

Browse files
tagattietagattie
committed
Update to v1.52.0.
- Remove version lock of python dependency. - Update electron dependency to 6.
1 parent 42ba430 commit f34f4df

11 files changed

+788
-2680
lines changed

‎editors/atom/Makefile‎

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

33
PORTNAME= atom
44
DISTVERSIONPREFIX= v
5-
DISTVERSION= 1.51.0
5+
DISTVERSION= 1.52.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

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

7070
BINARY_ALIAS= python=${PYTHON_CMD}
7171

@@ -181,10 +181,10 @@ clean-backup:
181181

182182
do-build:
183183
# setup download cache for electron-packager
184-
${MKDIR} ${WRKSRC}/electron
184+
${MKDIR} ${WRKDIR}/.cache/electron/httpsgithub.comelectronelectronreleasesdownloadv${ELECTRON_VER}electron-v${ELECTRON_VER}-freebsd-x64.zip
185185
cd ${LOCALBASE}/share/electron${ELECTRON_VER_MAJOR} && \
186-
zip -q -r ${WRKSRC}/electron/electron-v${ELECTRON_VER}-freebsd-x64.zip .
187-
cd ${WRKSRC}/electron && \
186+
zip -q -r ${WRKDIR}/.cache/electron/httpsgithub.comelectronelectronreleasesdownloadv${ELECTRON_VER}electron-v${ELECTRON_VER}-freebsd-x64.zip/electron-v${ELECTRON_VER}-freebsd-x64.zip .
187+
cd ${WRKDIR}/.cache/electron/httpsgithub.comelectronelectronreleasesdownloadv${ELECTRON_VER}electron-v${ELECTRON_VER}-freebsd-x64.zip && \
188188
${SHA256} -r *-v${ELECTRON_VER}-freebsd-*.zip | \
189189
${SED} -e 's/ / */' > SHASUMS256.txt-${ELECTRON_VER}
190190
# build atom

‎editors/atom/distinfo‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
TIMESTAMP = 1613219572
2-
SHA256 (node-v10.20.1.tar.gz) = ea39a70b715bfbd0281979c95a5b81136ffdc0e5bf66b1fd7dc3ef3473ce2c5a
3-
SIZE (node-v10.20.1.tar.gz) = 47181867
1+
TIMESTAMP = 1613392922
2+
SHA256 (node-v12.4.0.tar.gz) = cf39befb8ea486363cac6f297d8f451fd0d5dd8ad21dca51e9c2ea86b242baa0
3+
SIZE (node-v12.4.0.tar.gz) = 49167965
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.51.0.tar.gz) = acd10d782e86bcf999f5928a7169489693ce3fa22ab41dfb6a005c56d90e9346
7-
SIZE (atom-npm-cache-1.51.0.tar.gz) = 54824849
8-
SHA256 (atom-apm-cache-1.51.0.tar.gz) = 9df1721e3c14cc9a12e69af886ee320d204d1ebd595958a2541a0c73c4922121
9-
SIZE (atom-apm-cache-1.51.0.tar.gz) = 113427609
10-
SHA256 (atom-atom-v1.51.0_GH0.tar.gz) = 7e6852c4e3ae8938a7c145d22629772fa88f3775378d7fd7eaf4cbccd707ebc3
11-
SIZE (atom-atom-v1.51.0_GH0.tar.gz) = 11977039
6+
SHA256 (atom-npm-cache-1.52.0.tar.gz) = 195dfc3e2c8cadcc549cdeefa7fa32707bfbf505742e10b9b313094cc8a8b3eb
7+
SIZE (atom-npm-cache-1.52.0.tar.gz) = 57771075
8+
SHA256 (atom-apm-cache-1.52.0.tar.gz) = 35630f719f8ca8fae0c290c7ebe844506b6e3163e15b558f1ba5d65c29a16799
9+
SIZE (atom-apm-cache-1.52.0.tar.gz) = 113429614
10+
SHA256 (atom-atom-v1.52.0_GH0.tar.gz) = 1cf65454995fd14316feadfe74d25ec1688bc454b18d4f19a89d22339e33817c
11+
SIZE (atom-atom-v1.52.0_GH0.tar.gz) = 11976619

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

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎editors/atom/files/node/patch-configure.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- configure.py.orig 2020-06-16 06:19:09 UTC
1+
--- configure.py.orig 2019-06-04 11:57:27 UTC
22
+++ configure.py
3-
@@ -705,7 +705,7 @@ def get_nasm_version(asm):
3+
@@ -699,7 +699,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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
--- script/package.json.orig 2020-08-07 15:33:29 UTC
1+
--- script/package.json.orig 2020-10-09 14:47:49 UTC
22
+++ script/package.json
33
@@ -12,9 +12,7 @@
44
"coffeelint": "1.15.7",
55
"colors": "1.1.2",
66
"donna": "1.0.16",
77
- "electron-chromedriver": "^9.0.0",
8-
"electron-link": "0.4.1",
8+
"electron-link": "^0.4.3",
99
- "electron-mksnapshot": "^9.0.2",
10-
"electron-packager": "12.2.0",
10+
"electron-packager": "^15.0.0",
1111
"eslint": "^5.16.0",
1212
"eslint-config-prettier": "^4.2.0",
1313
@@ -32,7 +30,6 @@

‎editors/atom/files/patch-script_test‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
--- script/test.orig 2020-05-18 19:34:10 UTC
1+
--- script/test.orig 2020-10-09 14:47:49 UTC
22
+++ script/test
3-
@@ -51,7 +51,7 @@ if (process.platform === 'darwin') {
3+
@@ -56,7 +56,7 @@ if (process.platform === 'darwin') {
44
const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, '*.app'))
5-
assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`)
5+
assertExecutablePaths(executablePaths)
66
executablePath = path.join(executablePaths[0], 'Contents', 'MacOS', path.basename(executablePaths[0], '.app'))
77
-} else if (process.platform === 'linux') {
88
+} else if (process.platform === 'linux' || process.platform === 'freebsd') {
99
const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, 'atom-*', 'atom'))
10-
assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`)
10+
assertExecutablePaths(executablePaths)
1111
executablePath = executablePaths[0]
12-
@@ -222,7 +222,7 @@ function testSuitesForPlatform (platform) {
12+
@@ -227,7 +227,7 @@ function testSuitesForPlatform (platform) {
1313
case 'win32':
1414
suites = (process.arch === 'x64') ? [runCoreMainProcessTests, runCoreRenderProcessTests] : [runCoreMainProcessTests]
1515
break

‎editors/atom/files/patch-src_crash-reporter-start.js‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
--- src/crash-reporter-start.js.orig 2019-10-21 17:33:40 UTC
1+
--- src/crash-reporter-start.js.orig 2020-10-09 14:47:49 UTC
22
+++ src/crash-reporter-start.js
3-
@@ -1,15 +1,2 @@
3+
@@ -1,17 +1,2 @@
44
module.exports = function(params) {
55
- const { crashReporter } = require('electron');
66
- const os = require('os');
77
- const platformRelease = os.release();
88
- const arch = os.arch();
99
- const { uploadToServer, releaseChannel } = params;
1010
-
11+
- const parsedUploadToServer = uploadToServer !== null ? uploadToServer : false;
12+
-
1113
- crashReporter.start({
1214
- productName: 'Atom',
1315
- companyName: 'GitHub',
1416
- submitURL: 'https://atom.io/crash_reports',
15-
- uploadToServer,
17+
- parsedUploadToServer,
1618
- extra: { platformRelease, arch, releaseChannel }
1719
- });
1820
};

‎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-06-10 09:38:09 UTC
1+
--- src/main-process/atom-window.js.orig 2020-10-09 14:47:49 UTC
22
+++ src/main-process/atom-window.js
3-
@@ -55,7 +55,7 @@ module.exports = class AtomWindow extends EventEmitter
3+
@@ -56,7 +56,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/script/patch-script_node__modules_electron-packager_ignore.js‎ renamed to ‎editors/atom/files/script/patch-script_node__modules_electron-packager_src_copy-filter.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- script/node_modules/electron-packager/ignore.js.orig 2019-12-27 05:37:51 UTC
2-
+++ script/node_modules/electron-packager/ignore.js
3-
@@ -19,7 +19,7 @@ function generateIgnores (opts) {
1+
--- script/node_modules/electron-packager/src/copy-filter.js.orig 2021-02-15 12:21:54 UTC
2+
+++ script/node_modules/electron-packager/src/copy-filter.js
3+
@@ -21,7 +21,7 @@ function populateIgnoredPaths (opts) {
44
} else {
55
opts.ignore = [].concat(DEFAULT_IGNORES)
66
}

‎editors/atom/files/script/patch-script_node__modules_electron-packager_targets.js‎ renamed to ‎editors/atom/files/script/patch-script_node__modules_electron-packager_src_targets.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
1-
--- script/node_modules/electron-packager/targets.js.orig 1985-10-26 08:15:00 UTC
2-
+++ script/node_modules/electron-packager/targets.js
3-
@@ -5,9 +5,10 @@ const downloadArch = require('electron-download/lib/ar
1+
--- script/node_modules/electron-packager/src/targets.js.orig 2021-02-15 12:23:04 UTC
2+
+++ script/node_modules/electron-packager/src/targets.js
3+
@@ -5,10 +5,11 @@ const { getHostArch } = require('@electron/get')
44
const semver = require('semver')
55

66
const officialArchs = ['ia32', 'x64', 'armv7l', 'arm64', 'mips64el']
77
-const officialPlatforms = ['darwin', 'linux', 'mas', 'win32']
8-
+const officialPlatforms = ['darwin', 'freebsd', 'linux', 'mas', 'win32']
8+
+const officialPlatforms = ['darwin', 'linux', 'freebsd', 'mas', 'win32']
99
const officialPlatformArchCombos = {
1010
darwin: ['x64'],
11-
+ freebsd: ['x64'],
1211
linux: ['ia32', 'x64', 'armv7l', 'arm64', 'mips64el'],
12+
+ freebsd: ['x64'],
1313
mas: ['x64'],
14-
win32: ['ia32', 'x64']
15-
@@ -21,6 +22,7 @@ const linuxArchBuildVersions = {
16-
// Maps to module filename for each platform (lazy-required if used)
14+
win32: ['ia32', 'x64', 'arm64']
15+
}
16+
@@ -27,6 +28,7 @@ const buildVersions = {
1717
const osModules = {
1818
darwin: './mac',
19-
+ freebsd: './linux',
2019
linux: './linux',
20+
+ freebsd: './linux',
2121
mas: './mac', // map to darwin
2222
win32: './win32'
23+
}

0 commit comments

Comments
 (0)