Date: Wednesday, October 24, 2018 @ 12:27:50 Author: tensor5 Revision: 398813
upgpkg: atom 1.32.0-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-restart.patch atom/trunk/use-system-apm.patch atom/trunk/use-system-electron.patch ---------------------------+ PKGBUILD | 10 +++++----- fix-restart.patch | 2 +- use-system-apm.patch | 2 +- use-system-electron.patch | 44 +++++++++++++++++--------------------------- 4 files changed, 24 insertions(+), 34 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-10-24 12:22:03 UTC (rev 398812) +++ PKGBUILD 2018-10-24 12:27:50 UTC (rev 398813) @@ -1,7 +1,7 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=atom -pkgver=1.31.2 +pkgver=1.32.0 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') @@ -22,15 +22,15 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('baff1b23e03c638584d01817bda15503e66eff1c231c3952670c94b345588628' +sha256sums=('abb1a091fa493f186749d50c9444e762ed46f57c39055d022a50e166c7ffa8c6' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153' 'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2' 'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205' - '1f48c84f30ffefaef7235d8231af7357b801d66de9f09921d0ee0dd5849595ca' + 'cbac8d28e32a32760cd6b16d313e05e32af57bfdea1c248636e1b1ae74e4e92c' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' - '32e27c6245237a794b15eaf7dbfb81196455865af8ed9157aca763ed21a2fef3' - 'a6e34b5f35183fb5f12000fc9f9948cb6dff0a50909f65c8bc87b149d3d81b00') + '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806' + '25ffc77d9d0f89a598041f5c823f5e65a662681f570f3894cb74aca7306e1026') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: fix-restart.patch =================================================================== --- fix-restart.patch 2018-10-24 12:22:03 UTC (rev 398812) +++ fix-restart.patch 2018-10-24 12:27:50 UTC (rev 398813) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -1350,7 +1350,7 @@ +@@ -1356,7 +1356,7 @@ } restart () { Modified: use-system-apm.patch =================================================================== --- use-system-apm.patch 2018-10-24 12:22:03 UTC (rev 398812) +++ use-system-apm.patch 2018-10-24 12:27:50 UTC (rev 398813) @@ -15,7 +15,7 @@ ) --- a/src/package-manager.js +++ b/src/package-manager.js -@@ -167,13 +167,7 @@ +@@ -169,13 +169,7 @@ return configPath || this.apmPath } Modified: use-system-electron.patch =================================================================== --- use-system-electron.patch 2018-10-24 12:22:03 UTC (rev 398812) +++ use-system-electron.patch 2018-10-24 12:27:50 UTC (rev 398813) @@ -4,9 +4,9 @@ "url": "https://github.com/atom/atom/issues"; }, "license": "MIT", -- "electronVersion": "2.0.7", +- "electronVersion": "2.0.9", "dependencies": { - "@atom/nsfw": "^1.0.18", + "@atom/nsfw": "1.0.18", "@atom/source-map-support": "^0.3.4", --- a/script/build +++ b/script/build @@ -107,7 +107,7 @@ } --- a/script/lib/generate-startup-snapshot.js +++ b/script/lib/generate-startup-snapshot.js -@@ -80,7 +80,7 @@ +@@ -89,7 +89,7 @@ } else if (process.platform === 'win32') { nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe') } else { @@ -116,7 +116,7 @@ } childProcess.execFileSync( nodeBundledInElectronPath, -@@ -88,6 +88,7 @@ +@@ -97,6 +97,7 @@ {env: Object.assign({}, process.env, {ELECTRON_RUN_AS_NODE: 1})} ) @@ -124,7 +124,7 @@ const generatedStartupBlobPath = path.join(CONFIG.buildOutputPath, 'snapshot_blob.bin') console.log(`Generating startup blob at "${generatedStartupBlobPath}"`) childProcess.execFileSync( -@@ -105,5 +106,6 @@ +@@ -114,5 +115,6 @@ console.log(`Moving generated startup blob into "${startupBlobDestinationPath}"`) fs.unlinkSync(startupBlobDestinationPath) fs.renameSync(generatedStartupBlobPath, startupBlobDestinationPath) @@ -154,36 +154,26 @@ name: null } } ---- a/src/main-process/start.js -+++ b/src/main-process/start.js -@@ -107,7 +107,7 @@ function handleStartupEventWithSquirrel () { - function setupCompileCache () { - const CompileCache = require('../compile-cache') - CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME) -- CompileCache.install(process.resourcesPath, require) -+ CompileCache.install('/usr/lib/atom', require) + function getConfig () { +--- a/src/module-cache.js ++++ b/src/module-cache.js +@@ -227,7 +227,7 @@ } - function getConfig () { ---- a/src/module-cache.coffee -+++ b/src/module-cache.coffee -@@ -195,7 +195,7 @@ resolveModulePath = (relativePath, parentModule) -> - return - - registerBuiltins = (devMode) -> -- if devMode or not cache.resourcePath.startsWith("#{process.resourcesPath}#{path.sep}") -+ if devMode or not cache.resourcePath.startsWith("/usr/lib/atom") - fs = require 'fs-plus' - atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js') - cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath) + function registerBuiltins (devMode) { +- if (devMode || !cache.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) { ++ if (devMode || !cache.resourcePath.startsWith('/usr/lib/atom/')) { + const fs = require('fs-plus') + const atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js') + if (fs.isFileSync(atomJsPath)) { cache.builtins.atom = atomJsPath } --- a/src/package-manager.js +++ b/src/package-manager.js -@@ -808,7 +808,7 @@ module.exports = class PackageManager { +@@ -825,7 +825,7 @@ module.exports = class PackageManager { } isBundledPackagePath (packagePath) { - if (this.devMode && !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) { -+ if (this.devMode && this.resourcePath !== '/usr/lib/atom') { ++ if (this.devMode && !this.resourcePath.startsWith('/usr/lib/atom/')) { return false }
