Date: Sunday, May 21, 2017 @ 06:00:08 Author: tensor5 Revision: 228855
upgpkg: atom 1.17.0-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch atom/trunk/use-system-apm.patch atom/trunk/use-system-electron.patch ---------------------------+ PKGBUILD | 13 +++++++------ fix-license-path.patch | 4 ++-- fix-restart.patch | 2 +- use-system-apm.patch | 2 +- use-system-electron.patch | 43 +++++++++++++++++++++++++++---------------- 5 files changed, 38 insertions(+), 26 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-05-21 05:48:17 UTC (rev 228854) +++ PKGBUILD 2017-05-21 06:00:08 UTC (rev 228855) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini <tens...@gmail.com> pkgname=atom -pkgver=1.16.0 +pkgver=1.17.0 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('i686' 'x86_64') @@ -21,14 +21,14 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('6cd5389813018027f0d6c2e652ff64cfc947b69d8648cdfe34116ee78996e007' +sha256sums=('f9ccf2aa45b82bbf42a6a7fbbe5a3b7fdda99d76e77af8dee949fbcc419e94c6' '2148436adf17ec1970adc344fccf3782645375cd93e62a696a55f5b11fe98032' 'ab638bb8ef2b27f24433738299b9714a53ebabdecf7b01e8d9df6a9ecee77ec2' - '9d2b8076178c081ca9dc36dcddf91066a5f0cac1f213523632fc484969e35ff7' - '80bbac038202298ec61395ee8494042ef37ca4ca39ee3f8af62523c36a3605ac' + 'a81012ab62df63390e35478399e16b0d2ff5a42c2527d43865df441e025bdf36' + 'ed1dce5009f1ae775e678d9e48fa2c655e64764465df0c43b8631c4f337ae1a9' '32fb830b89bd6079120bf7380a69f94c02aa366608b0d0b6c7123e06b878400c' - '822e1629ff754af3225bc3c1c9301b4459a67c79e016fd57cc122644d571e24b' - '53395e3d2058c6d0ad1364aa480893c218c2fafb0830e57fe935b1c2d3e790fe') + '13bf5f35b0cf92f4420bd1e21587f8804b851290725a9d5e751b720711bc1224' + '51d961bfa9447c6f3e04adbeeec2e59f8c5403b975f9408d44db994b3d0246e3') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -98,6 +98,7 @@ -or -name "doc" -prune -exec rm -r '{}' \; \ -or -name "html" -prune -exec rm -r '{}' \; \ -or -name "man" -prune -exec rm -r '{}' \; \ + -or -name "scripts" -prune -exec rm -r '{}' \; \ -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \ -or -path "*/task-lists/src" -prune -exec rm -r '{}' \; } Modified: fix-license-path.patch =================================================================== --- fix-license-path.patch 2017-05-21 05:48:17 UTC (rev 228854) +++ fix-license-path.patch 2017-05-21 06:00:08 UTC (rev 228855) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.coffee +++ b/src/main-process/atom-application.coffee -@@ -255,7 +255,7 @@ +@@ -262,7 +262,7 @@ @openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap') @openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets') @openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet') @@ -11,7 +11,7 @@ unless @quitting --- a/src/workspace.js +++ b/src/workspace.js -@@ -558,7 +558,7 @@ +@@ -1046,7 +1046,7 @@ // Open Atom's license in the active pane. openLicense () { Modified: fix-restart.patch =================================================================== --- fix-restart.patch 2017-05-21 05:48:17 UTC (rev 228854) +++ fix-restart.patch 2017-05-21 06:00:08 UTC (rev 228855) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.coffee +++ b/src/main-process/atom-application.coffee -@@ -805,7 +805,7 @@ +@@ -821,7 +821,7 @@ @restart() restart: -> Modified: use-system-apm.patch =================================================================== --- use-system-apm.patch 2017-05-21 05:48:17 UTC (rev 228854) +++ use-system-apm.patch 2017-05-21 06:00:08 UTC (rev 228855) @@ -1,6 +1,6 @@ --- a/src/package-manager.coffee +++ b/src/package-manager.coffee -@@ -140,12 +140,7 @@ +@@ -145,12 +145,7 @@ return configPath if configPath return @apmPath if @apmPath? Modified: use-system-electron.patch =================================================================== --- use-system-electron.patch 2017-05-21 05:48:17 UTC (rev 228854) +++ use-system-electron.patch 2017-05-21 06:00:08 UTC (rev 228855) @@ -4,10 +4,10 @@ "url": "https://github.com/atom/atom/issues" }, "license": "MIT", -- "electronVersion": "1.3.13", +- "electronVersion": "1.3.15", "dependencies": { "async": "0.2.6", - "atom-keymap": "7.1.22", + "atom-keymap": "8.1.1", --- a/script/build +++ b/script/build @@ -2,10 +2,6 @@ @@ -21,7 +21,7 @@ // Needed so we can require src/module-cache.coffee during generateModuleCache require('coffee-script/register') require('colors') -@@ -23,7 +19,6 @@ +@@ -24,7 +20,6 @@ .wrap(yargs.terminalWidth()) .argv @@ -29,7 +29,15 @@ const cleanOutputDirectory = require('./lib/clean-output-directory') const codeSignOnMac = require('./lib/code-sign-on-mac') const compressArtifacts = require('./lib/compress-artifacts') -@@ -48,7 +43,6 @@ +@@ -36,7 +31,6 @@ + const generateAPIDocs = require('./lib/generate-api-docs') + const generateMetadata = require('./lib/generate-metadata') + const generateModuleCache = require('./lib/generate-module-cache') +-const generateStartupSnapshot = require('./lib/generate-startup-snapshot') + const installApplication = require('./lib/install-application') + const packageApplication = require('./lib/package-application') + const prebuildLessCache = require('./lib/prebuild-less-cache') +@@ -51,7 +45,6 @@ process.exit(1) }) @@ -36,12 +44,13 @@ -checkChromedriverVersion() cleanOutputDirectory() copyAssets() - transpileBabelPaths() -@@ -60,46 +54,3 @@ + transpilePackagesWithCustomTranspilerPaths() +@@ -64,47 +57,3 @@ generateMetadata() generateAPIDocs() dumpSymbols() - .then(packageApplication) +- .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath)) - .then(packagedAppPath => { - if (process.platform === 'darwin') { - if (argv.codeSign) { @@ -78,8 +87,8 @@ - console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray) - } - -- if (argv.install) { -- installApplication(packagedAppPath) +- if (argv.install != null) { +- installApplication(packagedAppPath, argv.install) - } else { - console.log('Skipping installation. Specify the --install option to install Atom'.gray) - } @@ -86,17 +95,19 @@ - }) --- a/script/package.json +++ b/script/package.json -@@ -8,7 +8,6 @@ +@@ -8,9 +8,6 @@ "colors": "1.1.2", "csslint": "1.0.2", "donna": "1.0.13", - "electron-chromedriver": "~1.3", +- "electron-link": "0.0.22", +- "electron-mksnapshot": "~1.3", "electron-packager": "7.3.0", "electron-winstaller": "2.5.1", "fs-extra": "0.30.0", --- a/src/module-cache.coffee +++ b/src/module-cache.coffee -@@ -194,7 +194,7 @@ +@@ -195,7 +195,7 @@ return registerBuiltins = (devMode) -> @@ -107,7 +118,7 @@ cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath) --- a/src/package-manager.coffee +++ b/src/package-manager.coffee -@@ -544,7 +544,7 @@ +@@ -608,7 +608,7 @@ isBundledPackagePath: (packagePath) -> if @devMode @@ -118,12 +129,12 @@ packagePath?.startsWith(@resourcePathWithTrailingSlash) --- a/static/index.js +++ b/static/index.js -@@ -24,7 +24,7 @@ - // Normalize to make sure drive letter case is consistent on Windows +@@ -23,7 +23,7 @@ process.resourcesPath = path.normalize(process.resourcesPath) -- var devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith(process.resourcesPath + path.sep) -+ var devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith('/usr/lib/atom') + setupAtomHome() +- const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith(process.resourcesPath + path.sep) ++ const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith('/usr/lib/atom') + useSnapshot = !devMode && typeof snapshotResult !== 'undefined' if (devMode) { - setupDeprecatedPackages()