Skip to content

Commit fccb575

Browse files
tagattietagattie
committed
Update to v1.41.0.
1 parent 037d0e3 commit fccb575

19 files changed

+426
-182
lines changed

‎editors/atom/Makefile‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
# $FreeBSD$
22

33
PORTNAME= atom
4-
DISTVERSION= 1.39.0.g20190522
4+
DISTVERSIONPREFIX= v
5+
DISTVERSION= 1.41.0
56
CATEGORIES= editors
67
MASTER_SITES= https://nodejs.org/dist/v${APM_NODE_VER}/:node
78
DISTFILES= node-v${APM_NODE_VER}${EXTRACT_SUFX}:node
@@ -13,7 +14,6 @@ LICENSE= MIT
1314
LICENSE_FILE= ${WRKSRC}/LICENSE.md
1415

1516
EXTRACT_DEPENDS= zip:archivers/zip \
16-
git:devel/git \
1717
electron:devel/electron4
1818
BUILD_DEPENDS= ${UNZIP_CMD}:archivers/unzip \
1919
rg:textproc/ripgrep \
@@ -42,12 +42,10 @@ TEST_DEPENDS= bash:shells/bash
4242
USES= desktop-file-utils gnome jpeg localbase:ldflags python:2.7 \
4343
shebangfix
4444

45-
# USE_GITHUB= yes
46-
GH_TAGNAME= 00362ccd0adbc211c38627f0055e3ff5001f5db9
47-
WRKSRC= ${WRKDIR}/${PORTNAME}
45+
USE_GITHUB= yes
4846

49-
APM_NODE_VER= 10.11.0
50-
ELECTRON_CACHE_VER= 4.2.0 # version specified in ${WRKSRC}/package.json
47+
APM_NODE_VER= 10.2.1
48+
ELECTRON_CACHE_VER= 4.2.7 # version specified in ${WRKSRC}/package.json
5149
ELECTRON_TARGET_VER= 4.2.12 # version of port "devel/electron4"
5250

5351
BINARY_ALIAS= python=${PYTHON_CMD}
@@ -59,14 +57,7 @@ USE_LDCONFIG= ${DATADIR}
5957

6058
SHEBANG_FILES= atom.sh
6159

62-
DATADIR= ${PREFIX}/share/atom-dev
63-
6460
post-extract:
65-
# clone atom repository & checkout electron-4 branch
66-
# (this is a temorary workaround since atom version with "-dev" \
67-
# suffix requires the source directory is a git repo to be built)
68-
cd ${WRKDIR} && git clone https://github.com/atom/atom.git
69-
cd ${WRKSRC} && git checkout ${GH_TAGNAME}
7061
# create electron distribution zip archives
7162
${MKDIR} ${WRKDIR}/electron-dist
7263
cd ${LOCALBASE}/share/electron && \

‎editors/atom/distinfo‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1-
TIMESTAMP = 1573807696
2-
SHA256 (node-v10.11.0.tar.gz) = f721552552fb11ef99aba290fc6e696a8647adc98d643db6651e81ed07c4037e
3-
SIZE (node-v10.11.0.tar.gz) = 36198226
1+
TIMESTAMP = 1574054699
2+
SHA256 (node-v10.2.1.tar.gz) = dcdba29f6b933969d6a8a36ea91cfd44bcb500a1e582a3273ac3d4d930e721e4
3+
SIZE (node-v10.2.1.tar.gz) = 35757099
4+
SHA256 (atom-atom-v1.41.0_GH0.tar.gz) = 4a440909462c461cbec9b82b5f97bd21719a34f0ab59f2d859df85a40246c949
5+
SIZE (atom-atom-v1.41.0_GH0.tar.gz) = 11877243

‎editors/atom/files/patch-script_build‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1-
--- script/build.orig 2019-05-22 03:44:37 UTC
1+
--- script/build.orig 2019-10-21 17:33:40 UTC
22
+++ script/build
3-
@@ -66,7 +66,7 @@ process.env.ELECTRON_VERSION = CONFIG.appMetadata.elec
3+
@@ -68,7 +68,7 @@ process.env.ELECTRON_VERSION = CONFIG.appMetadata.elec
44
let binariesPromise = Promise.resolve()
55

66
if (!argv.existingBinaries) {
77
- checkChromedriverVersion()
8-
+// checkChromedriverVersion()
8+
+ // checkChromedriverVersion()
99
cleanOutputDirectory()
1010
copyAssets()
1111
transpilePackagesWithCustomTranspilerPaths()
12+
@@ -88,7 +88,7 @@ if (!argv.existingBinaries) {
13+
if (!argv.generateApiDocs) {
14+
binariesPromise
15+
.then(packageApplication)
16+
- .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath))
17+
+ // .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath))
18+
.then(packagedAppPath => {
19+
switch (process.platform) {
20+
case 'darwin': {

‎editors/atom/files/patch-script_lib_dump-symbols.js‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
1-
--- script/lib/dump-symbols.js.orig 2019-05-22 03:44:37 UTC
1+
--- script/lib/dump-symbols.js.orig 2019-10-21 17:33:40 UTC
22
+++ script/lib/dump-symbols.js
3-
@@ -6,8 +6,8 @@ const path = require('path')
3+
@@ -6,9 +6,9 @@ const path = require('path');
44

5-
const CONFIG = require('../config')
6-
module.exports = function () {
5+
const CONFIG = require('../config');
6+
module.exports = function() {
77
- if (process.platform === 'win32') {
8-
- console.log('Skipping symbol dumping because minidump is not supported on Windows'.gray)
98
+ if (process.platform === 'win32' || process.platform === 'freebsd') {
10-
+ console.log('Skipping symbol dumping because minidump is not supported on Windows or FreeBSD'.gray)
11-
return Promise.resolve()
12-
} else {
13-
console.log(`Dumping symbols in ${CONFIG.symbolsPath}`)
9+
console.log(
10+
- 'Skipping symbol dumping because minidump is not supported on Windows'
11+
+ 'Skipping symbol dumping because minidump is not supported on Windows or FreeBSD'
12+
.gray
13+
);
14+
return Promise.resolve();

‎editors/atom/files/patch-script_lib_package-application.js‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
1-
--- script/lib/package-application.js.orig 2019-05-22 03:44:37 UTC
1+
--- script/lib/package-application.js.orig 2019-10-21 17:33:40 UTC
22
+++ script/lib/package-application.js
3-
@@ -46,7 +46,7 @@ module.exports = function () {
4-
if (process.platform === 'darwin') {
5-
bundledResourcesPath = path.join(packagedAppPath, 'Contents', 'Resources')
6-
setAtomHelperVersion(packagedAppPath)
3+
@@ -66,7 +66,7 @@ module.exports = function() {
4+
'Resources'
5+
);
6+
setAtomHelperVersion(packagedAppPath);
77
- } else if (process.platform === 'linux') {
88
+ } else if (process.platform === 'linux' || process.platform === 'freebsd') {
9-
bundledResourcesPath = path.join(packagedAppPath, 'resources')
10-
chmodNodeFiles(packagedAppPath)
9+
bundledResourcesPath = path.join(packagedAppPath, 'resources');
10+
chmodNodeFiles(packagedAppPath);
1111
} else {
12-
@@ -75,7 +75,7 @@ function copyNonASARResources (packagedAppPath, bundle
13-
}
14-
if (process.platform === 'darwin') {
15-
fs.copySync(path.join(CONFIG.repositoryRootPath, 'resources', 'mac', 'file.icns'), path.join(bundledResourcesPath, 'file.icns'))
12+
@@ -118,7 +118,7 @@ function copyNonASARResources(packagedAppPath, bundled
13+
path.join(CONFIG.repositoryRootPath, 'resources', 'mac', 'file.icns'),
14+
path.join(bundledResourcesPath, 'file.icns')
15+
);
1616
- } else if (process.platform === 'linux') {
1717
+ } else if (process.platform === 'linux' || process.platform === 'freebsd') {
18-
fs.copySync(path.join(CONFIG.repositoryRootPath, 'resources', 'app-icons', CONFIG.channel, 'png', '1024.png'), path.join(packagedAppPath, 'atom.png'))
19-
} else if (process.platform === 'win32') {
20-
[ 'atom.cmd', 'atom.sh', 'atom.js', 'apm.cmd', 'apm.sh', 'file.ico', 'folder.ico' ]
21-
@@ -141,7 +141,7 @@ function renamePackagedAppDir (packageOutputDirPath) {
22-
packagedAppPath = path.join(CONFIG.buildOutputPath, appBundleName)
23-
if (fs.existsSync(packagedAppPath)) fs.removeSync(packagedAppPath)
24-
fs.renameSync(path.join(packageOutputDirPath, appBundleName), packagedAppPath)
18+
fs.copySync(
19+
path.join(
20+
CONFIG.repositoryRootPath,
21+
@@ -234,7 +234,7 @@ function renamePackagedAppDir(packageOutputDirPath) {
22+
path.join(packageOutputDirPath, appBundleName),
23+
packagedAppPath
24+
);
2525
- } else if (process.platform === 'linux') {
2626
+ } else if (process.platform === 'linux' || process.platform === 'freebsd') {
27-
const appName = CONFIG.channel !== 'stable' ? `atom-${CONFIG.channel}` : 'atom'
28-
let architecture
29-
if (HOST_ARCH === 'ia32') {
27+
const appName =
28+
CONFIG.channel !== 'stable' ? `atom-${CONFIG.channel}` : 'atom';
29+
let architecture;

‎editors/atom/files/patch-script_package.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
--- script/package.json.orig 2019-05-22 03:44:37 UTC
1+
--- script/package.json.orig 2019-10-21 17:33:40 UTC
22
+++ script/package.json
3-
@@ -10,10 +10,10 @@
3+
@@ -10,10 +10,9 @@
44
"coffeelint": "1.15.7",
55
"colors": "1.1.2",
66
"donna": "1.0.16",
7-
- "electron-chromedriver": "^4.0.0",
7+
- "electron-chromedriver": "^4.2.0",
88
"electron-link": "0.4.0",
9-
"electron-mksnapshot": "^4.2.0",
9+
- "electron-mksnapshot": "^4.2.0",
1010
"electron-packager": "12.2.0",
11-
+ "electron-rebuild": "^1.8.4",
12-
"electron-winstaller": "2.6.4",
11+
+ "electron-rebuild": "^1.8.6",
12+
"@atom/electron-winstaller": "0.0.1",
1313
"eslint": "^5.16.0",
1414
"eslint-config-prettier": "^4.2.0",
15-
@@ -31,7 +31,6 @@
15+
@@ -31,7 +30,6 @@
1616
"legal-eagle": "0.14.0",
1717
"lodash.startcase": "4.4.0",
1818
"lodash.template": "4.4.0",

‎editors/atom/files/patch-script_test‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
--- script/test.orig 2019-05-22 03:44:37 UTC
1+
--- script/test.orig 2019-10-21 17:33:40 UTC
22
+++ script/test
3-
@@ -50,7 +50,7 @@ if (process.platform === 'darwin') {
3+
@@ -51,7 +51,7 @@ if (process.platform === 'darwin') {
44
const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, '*.app'))
55
assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`)
66
executablePath = path.join(executablePaths[0], 'Contents', 'MacOS', path.basename(executablePaths[0], '.app'))
@@ -9,7 +9,7 @@
99
const executablePaths = glob.sync(path.join(CONFIG.buildOutputPath, 'atom-*', 'atom'))
1010
assert(executablePaths.length === 1, `More than one application to run tests against was found. ${executablePaths.join(',')}`)
1111
executablePath = executablePaths[0]
12-
@@ -207,6 +207,7 @@ function testSuitesForPlatform (platform) {
12+
@@ -216,6 +216,7 @@ function testSuitesForPlatform (platform) {
1313
suites = (process.arch === 'x64') ? [runCoreMainProcessTests, runCoreRenderProcessTests] : [runCoreMainProcessTests]
1414
break
1515
case 'linux':

‎editors/atom/files/patch-spec_main-process_atom-application.test.js‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
--- spec/main-process/atom-application.test.js.orig 2019-11-16 08:38:38 UTC
2+
+++ spec/main-process/atom-application.test.js
3+
@@ -1107,7 +1107,7 @@ describe('AtomApplication', function() {
4+
});
5+
6+
describe('when closing the last window', function() {
7+
- if (process.platform === 'linux' || process.platform === 'win32') {
8+
+ if (process.platform === 'linux' || process.platform === 'freebsd' || process.platform === 'win32') {
9+
it('quits the application', async function() {
10+
const [w] = await scenario.launch(parseCommandLine(['a']));
11+
scenario.getApplication(0).removeWindow(w);

‎editors/atom/files/patch-src_atom-paths.js‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
--- src/atom-paths.js.orig 2019-05-22 03:44:37 UTC
1+
--- src/atom-paths.js.orig 2019-10-21 17:33:40 UTC
22
+++ src/atom-paths.js
3-
@@ -15,7 +15,8 @@ const hasWriteAccess = (dir) => {
4-
const getAppDirectory = () => {
5-
switch (process.platform) {
6-
case 'darwin':
7-
- return process.execPath.substring(0, process.execPath.indexOf('.app') + 4)
8-
+ return process.execPath.substring(0, process.execPath.indexOf('.app') + 4)
3+
@@ -19,6 +19,7 @@ const getAppDirectory = () => {
4+
0,
5+
process.execPath.indexOf('.app') + 4
6+
);
97
+ case 'freebsd':
108
case 'linux':
119
case 'win32':
12-
return path.join(process.execPath, '..')
10+
return path.join(process.execPath, '..');

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
--- src/config-schema.js.orig 2019-05-22 03:44:37 UTC
1+
--- src/config-schema.js.orig 2019-10-21 17:33:40 UTC
22
+++ src/config-schema.js
3-
@@ -558,11 +558,11 @@ const configSchema = {
3+
@@ -614,12 +614,12 @@ const configSchema = {
44
}
5-
}
5+
};
66

77
-if (['win32', 'linux'].includes(process.platform)) {
88
+if (['win32', 'linux', 'freebsd'].includes(process.platform)) {
99
configSchema.core.properties.autoHideMenuBar = {
1010
type: 'boolean',
1111
default: false,
12-
- description: 'Automatically hide the menu bar and toggle it by pressing Alt. This is only supported on Windows & Linux.'
13-
+ description: 'Automatically hide the menu bar and toggle it by pressing Alt. This is only supported on Windows, Linux & FreeBSD.'
14-
}
12+
description:
13+
- 'Automatically hide the menu bar and toggle it by pressing Alt. This is only supported on Windows & Linux.'
14+
+ 'Automatically hide the menu bar and toggle it by pressing Alt. This is only supported on Windows, Linux & FreeBSD.'
15+
};
1516
}
1617

0 commit comments

Comments
 (0)