Date: Wednesday, May 15, 2019 @ 04:16:43 Author: tensor5 Revision: 467257
upgpkg: atom 1.37.0-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch atom/trunk/use-system-electron.patch ---------------------------+ PKGBUILD | 13 +++++++------ fix-license-path.patch | 2 +- fix-restart.patch | 4 ++-- use-system-electron.patch | 25 +++++++------------------ 4 files changed, 17 insertions(+), 27 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-05-15 03:22:02 UTC (rev 467256) +++ PKGBUILD 2019-05-15 04:16:43 UTC (rev 467257) @@ -1,7 +1,7 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=atom -pkgver=1.36.1 +pkgver=1.37.0 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') @@ -26,19 +26,19 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('3fa6f0d86f3108a55b38c00e5d94da8ca6ceea74ae2a5aa263ef5bfb50eca0d8' +sha256sums=('52b498d3a0e2d524d6b74738a21e7ab2f5ef899e4fcc251a8ccbd4796a3d6c21' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' '971e4575884a0d1bf4683b5c6402a3d6059e41345cc09db83df5a0a30ad41bb6' '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153' '75a672adc0237ea8c93ff67d8296eb73b87792b7b58cdaef7bf596fb6edd073f' '3ce4f665a1e3484bb408a665500a8f99d8afb5e3cd9d70374c5f9f4a37176e42' - 'b38f7538d1506bd11bf57cc5a2919b2d29fb39a8811a0bf8e7fdd68e6c144296' - 'd3bd6c952ba0853811ebd3a2f268e3be796a41b8f26650c5b6489ff7cac3749c' + 'a83101948752153d0f357798b9651a5262232ec3dce5f4eb5cc136a5e0b6f929' + '2219fed30a0aca7dbed3b5f4781be23aecf965c42e5fcec0b34c9611bad11ae0' '9073d3947f11e21788f0931021e4f41d01e3651cc99f2b3320626f478e26c491' '4033929dde0b81bb6f174cc4c79050474afaf85b54b928bfe13e05059448ebb1' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806' - '95cddeae2be0a9e54d29122f5716687e48b4a270b3207f7caf0b351cde158980') + '0d6c12bdbe1cfae67df0b4c8948068277aa68b1c490f39d9a03fde53fd6ecd3f') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -65,6 +65,7 @@ rm package-lock.json ATOM_RESOURCE_PATH="${PWD}" \ + npm_config_build_from_source=true \ npm_config_target=$(< /usr/lib/electron/version) \ apm install @@ -83,7 +84,7 @@ cd script npm install # Set ELECTRON_VERSION (see use-system-electron.patch) - env ELECTRON_VERSION=$(< /usr/lib/electron/version) ./build + env ELECTRON_VERSION=$(< /usr/lib/electron/version) ./build --no-bootstrap } package() { Modified: fix-license-path.patch =================================================================== --- fix-license-path.patch 2019-05-15 03:22:02 UTC (rev 467256) +++ fix-license-path.patch 2019-05-15 04:16:43 UTC (rev 467257) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -553,7 +553,7 @@ +@@ -572,7 +572,7 @@ this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap') this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets') this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet') Modified: fix-restart.patch =================================================================== --- fix-restart.patch 2019-05-15 03:22:02 UTC (rev 467256) +++ fix-restart.patch 2019-05-15 04:16:43 UTC (rev 467257) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -1603,7 +1603,7 @@ +@@ -1625,7 +1625,7 @@ } restart () { @@ -8,4 +8,4 @@ + const args = ['/usr/lib/atom/atom'] if (this.safeMode) args.push('--safe') if (this.logFile != null) args.push(`--log-file=${this.logFile}`) - if (this.socketPath != null) args.push(`--socket-path=${this.socketPath}`) + if (this.userDataDir != null) args.push(`--user-data-dir=${this.userDataDir}`) Modified: use-system-electron.patch =================================================================== --- use-system-electron.patch 2019-05-15 03:22:02 UTC (rev 467256) +++ use-system-electron.patch 2019-05-15 04:16:43 UTC (rev 467257) @@ -10,18 +10,7 @@ "@atom/source-map-support": "^0.3.4", --- a/script/build +++ b/script/build -@@ -2,10 +2,6 @@ - - 'use strict' - --// Run bootstrap first to ensure all the dependencies used later in this script --// are installed. --require('./bootstrap') -- - // Needed so we can require src/module-cache.coffee during generateModuleCache - require('coffee-script/register') - require('colors') -@@ -28,7 +24,6 @@ +@@ -32,7 +32,6 @@ .wrap(yargs.terminalWidth()) .argv @@ -29,7 +18,7 @@ const cleanOutputDirectory = require('./lib/clean-output-directory') const codeSignOnMac = require('./lib/code-sign-on-mac') const codeSignOnWindows = require('./lib/code-sign-on-windows') -@@ -57,12 +52,11 @@ +@@ -61,12 +60,11 @@ }) const CONFIG = require('./config') @@ -43,7 +32,7 @@ cleanOutputDirectory() copyAssets() transpilePackagesWithCustomTranspilerPaths() -@@ -81,67 +75,5 @@ +@@ -85,67 +83,5 @@ if (!argv.generateApiDocs) { binariesPromise @@ -113,7 +102,7 @@ } --- a/script/lib/generate-startup-snapshot.js +++ b/script/lib/generate-startup-snapshot.js -@@ -89,7 +89,7 @@ +@@ -90,7 +90,7 @@ } else if (process.platform === 'win32') { nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe') } else { @@ -122,7 +111,7 @@ } childProcess.execFileSync( nodeBundledInElectronPath, -@@ -97,6 +97,7 @@ +@@ -98,6 +98,7 @@ {env: Object.assign({}, process.env, {ELECTRON_RUN_AS_NODE: 1})} ) @@ -130,7 +119,7 @@ const generatedStartupBlobPath = path.join(CONFIG.buildOutputPath, 'snapshot_blob.bin') console.log(`Generating startup blob at "${generatedStartupBlobPath}"`) childProcess.execFileSync( -@@ -114,5 +115,6 @@ +@@ -115,5 +116,6 @@ console.log(`Moving generated startup blob into "${startupBlobDestinationPath}"`) fs.unlinkSync(startupBlobDestinationPath) fs.renameSync(generatedStartupBlobPath, startupBlobDestinationPath) @@ -139,7 +128,7 @@ } --- a/script/package.json +++ b/script/package.json -@@ -8,9 +8,7 @@ +@@ -9,9 +9,7 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16",
