Date: Monday, October 16, 2017 @ 20:57:22 Author: tensor5 Revision: 263105
upgpkg: atom 1.21.1-1 Modified: atom/trunk/PKGBUILD atom/trunk/symbols-view-use-system-ctags.patch atom/trunk/use-system-apm.patch atom/trunk/use-system-electron.patch -------------------------------------+ PKGBUILD | 10 ++--- symbols-view-use-system-ctags.patch | 2 - use-system-apm.patch | 29 +++++++------- use-system-electron.patch | 66 +++++++++++++++++++++++++++------- 4 files changed, 74 insertions(+), 33 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-16 19:58:38 UTC (rev 263104) +++ PKGBUILD 2017-10-16 20:57:22 UTC (rev 263105) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=atom -pkgver=1.20.1 +pkgver=1.21.1 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('i686' 'x86_64') @@ -22,14 +22,14 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('0577ff9df069f8c290fb73b387ea88f8af1fae8b4a40c5ad7cf97af824584b11' +sha256sums=('537cbb6be91d3bd2a7b6372c14b95b8ae07ee8bc06d608bcab8a3dc93a6cc88d' 'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba' '7f4f86387d226fcd452f0b97579dadc3eac217a77485228dbf4facf3391b6198' '951bbc248c9ae4ef3ef712e0caeb728a8577b12e4593870569de15e570a71c4c' '646f81b0621a86eff3bb1f229eeb92b2f33bac41b3324424a6de06a780a8a22d' - '9bed08e8bbb96ecb0063a4603478f5f4ea8409a45dc565b2df00839fd3cd2c85' - 'bb1469f02cef5c1363d9add8eb7af6eab503023d5a56f76dc868b70be1b77e01' - 'f5aa3efafe796bd07b8221746a4fe693dcefbe5861a4e4cf49f7679516422123') + '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' + 'c120739911ce6a455a642c97d4d7de0956abee4d94bfc338f8a13f771a2d381c' + '13ee051e304cb8e612d5e910dc9a3e73b5d993df9afce2f2d22d2d24a9e938c7') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: symbols-view-use-system-ctags.patch =================================================================== --- symbols-view-use-system-ctags.patch 2017-10-16 19:58:38 UTC (rev 263104) +++ symbols-view-use-system-ctags.patch 2017-10-16 20:57:22 UTC (rev 263105) @@ -1,6 +1,6 @@ --- a/lib/tag-generator.js +++ b/lib/tag-generator.js -@@ -81,7 +81,7 @@ export default class TagGenerator { +@@ -79,7 +79,7 @@ export default class TagGenerator { generate() { let tags = {}; const packageRoot = this.getPackageRoot(); Modified: use-system-apm.patch =================================================================== --- use-system-apm.patch 2017-10-16 19:58:38 UTC (rev 263104) +++ use-system-apm.patch 2017-10-16 20:57:22 UTC (rev 263105) @@ -13,19 +13,20 @@ ['--loglevel=error', 'install'], {env: installEnv, cwd: packagePath, stdio: 'inherit'} ) ---- a/src/package-manager.coffee -+++ b/src/package-manager.coffee -@@ -147,12 +147,7 @@ - return configPath if configPath - return @apmPath if @apmPath? +--- a/src/package-manager.js ++++ b/src/package-manager.js +@@ -165,13 +165,7 @@ + return configPath || this.apmPath + } -- commandName = 'apm' -- commandName += '.cmd' if process.platform is 'win32' -- apmRoot = path.join(process.resourcesPath, 'app', 'apm') -- @apmPath = path.join(apmRoot, 'bin', commandName) -- unless fs.isFileSync(@apmPath) -- @apmPath = path.join(apmRoot, 'node_modules', 'atom-package-manager', 'bin', commandName) -+ @apmPath = '/usr/lib/node_modules/atom-package-manager/bin/apm' - @apmPath +- const commandName = process.platform === 'win32' ? 'apm.cmd' : 'apm' +- const apmRoot = path.join(process.resourcesPath, 'app', 'apm') +- this.apmPath = path.join(apmRoot, 'bin', commandName) +- if (!fs.isFileSync(this.apmPath)) { +- this.apmPath = path.join(apmRoot, 'node_modules', 'atom-package-manager', 'bin', commandName) +- } +- return this.apmPath ++ return '/usr/lib/node_modules/atom-package-manager/bin/apm' + } - # Public: Get the paths being used to look for packages. + // Public: Get the paths being used to look for packages. Modified: use-system-electron.patch =================================================================== --- use-system-electron.patch 2017-10-16 19:58:38 UTC (rev 263104) +++ use-system-electron.patch 2017-10-16 20:57:22 UTC (rev 263105) @@ -4,7 +4,7 @@ "url": "https://github.com/atom/atom/issues"; }, "license": "MIT", -- "electronVersion": "1.6.9", +- "electronVersion": "1.6.15", "dependencies": { "@atom/source-map-support": "^0.3.4", "async": "0.2.6", @@ -116,11 +116,31 @@ "csslint": "1.0.2", "donna": "1.0.16", - "electron-chromedriver": "~1.6", -- "electron-link": "0.1.0", +- "electron-link": "0.1.1", - "electron-mksnapshot": "~1.6", "electron-packager": "7.3.0", - "electron-winstaller": "2.6.2", - "fs-extra": "0.30.0", + "electron-winstaller": "2.6.3", + "fs-admin": "^0.1.5", +--- a/src/compile-cache.js ++++ b/src/compile-cache.js +@@ -121,7 +121,7 @@ + return { + column, + line: row, +- source: path.join(resourcesPath, 'app', 'static', relativePath), ++ source: path.join(resourcesPath, 'static', relativePath), + name: null + } + } +--- a/src/main-process/start.js ++++ b/src/main-process/start.js +@@ -85,5 +85,5 @@ + function setupCompileCache () { + const CompileCache = require('../compile-cache') + CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME) +- CompileCache.install(process.resourcesPath, require) ++ CompileCache.install('/usr/lib/atom', require) + } --- a/src/module-cache.coffee +++ b/src/module-cache.coffee @@ -195,7 +195,7 @@ @@ -132,17 +152,28 @@ fs = require 'fs-plus' atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js') cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath) ---- a/src/package-manager.coffee -+++ b/src/package-manager.coffee -@@ -610,7 +610,7 @@ +--- a/src/package-manager.js ++++ b/src/package-manager.js +@@ -802,7 +802,7 @@ + } - isBundledPackagePath: (packagePath) -> - if @devMode -- return false unless @resourcePath.startsWith("#{process.resourcesPath}#{path.sep}") -+ return false unless @resourcePath.startsWith("/usr/lib/atom") + isBundledPackagePath (packagePath) { +- if (this.devMode && !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) { ++ if (this.devMode && this.resourcePath !== '/usr/lib/atom') { + return false + } - @resourcePathWithTrailingSlash ?= "#{@resourcePath}#{path.sep}" - packagePath?.startsWith(@resourcePathWithTrailingSlash) +--- a/src/task-bootstrap.js ++++ b/src/task-bootstrap.js +@@ -3,7 +3,7 @@ + + const CompileCache = require('./compile-cache') + CompileCache.setCacheDirectory(compileCachePath) +-CompileCache.install(`${process.resourcesPath}`, require) ++CompileCache.install('/usr/lib/atom', require) + + const setupGlobals = function () { + global.attachEvent = function () {} --- a/static/index.js +++ b/static/index.js @@ -23,7 +23,7 @@ @@ -154,3 +185,12 @@ useSnapshot = !devMode && typeof snapshotResult !== 'undefined' if (devMode) { +@@ -90,7 +90,7 @@ + function setupWindow () { + const CompileCache = useSnapshot ? snapshotResult.customRequire('../src/compile-cache.js') : require('../src/compile-cache') + CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME) +- CompileCache.install(process.resourcesPath, require) ++ CompileCache.install('/usr/lib/atom', require) + + const ModuleCache = useSnapshot ? snapshotResult.customRequire('../src/module-cache.js') : require('../src/module-cache') + ModuleCache.register(getWindowLoadSettings())
