Date: Friday, August 3, 2018 @ 12:46:52 Author: tensor5 Revision: 367533
upgpkg: atom 1.29.0-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-atom-sh.patch atom/trunk/fix-license-path.patch atom/trunk/use-system-electron.patch ---------------------------+ PKGBUILD | 23 +------- fix-atom-sh.patch | 13 +--- fix-license-path.patch | 2 use-system-electron.patch | 116 +++++++++++++++++++++++--------------------- 4 files changed, 71 insertions(+), 83 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2018-08-03 11:27:05 UTC (rev 367532) +++ PKGBUILD 2018-08-03 12:46:52 UTC (rev 367533) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini <[email protected]> pkgname=atom -pkgver=1.28.2 +pkgver=1.29.0 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') @@ -23,15 +23,15 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('913dbb9fe64d8e6579e367b98adfc98f96cc89ff0de5fddc1107b2be5808c77e' +sha256sums=('0877984f5b68b14c1804647d505f4eb64a4353a69a9fd925e31d9cb89d50d178' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' '866f19de9184287da459b0f9e8b79d0eeb72ba4e6c2a803ba29f74a33976deda' - 'd8d77adebd7bd4eaf024988c68c30dc6b968044f7a6381227d13b6d77fa2b442' - '0f3fc6c435be47c3de78033544cd23a07c6a059aad94921174f7be0796a8b663' + '681f3d8e19b92548ca3a2929a13c84ef42af5a8e89bea79aba66dab30916caa6' + 'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205' 'b9533bd31e9329d63abc5ec87b237761c73d0586485288925ba723fb34b3b933' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b' - 'd7ba0bb018c40d5a7e7237e532b92c224d8fa1d05dbc0fdd85d1f26248553ec3') + '3022ed1aad7eb0590a5b9477c742b513c5ac024985607ac4a90ddd66b63b1003') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -41,19 +41,6 @@ patch -Np1 -i "${srcdir}"/use-system-apm.patch patch -Np1 -i "${srcdir}"/fix-license-path.patch patch -Np1 -i "${srcdir}"/fix-restart.patch - - # Workaround for Node 10 - sed -e 's|"electron-link": "0.2.0"|"electron-link": "../../electron-link"|' \ - -i script/package.json - cd .. - git clone https://github.com/atom/electron-link.git - cd electron-link - git checkout v0.2.0 - sed -e 's/"leveldown": "^1.6.0"/"leveldown": "^2.0.1"/' -i package.json - npm install - npx babel src -d lib - cd node_modules/levelup - sed -e 's/"leveldown": "^1.1.0"/"leveldown": "^2.0.1"/' -i package.json } build() { Modified: fix-atom-sh.patch =================================================================== --- fix-atom-sh.patch 2018-08-03 11:27:05 UTC (rev 367532) +++ fix-atom-sh.patch 2018-08-03 12:46:52 UTC (rev 367533) @@ -27,9 +27,9 @@ export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true while getopts ":wtfvh-:" opt; do -@@ -59,85 +38,22 @@ - exec 2> /dev/null - fi +@@ -62,82 +41,19 @@ + ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" + mkdir -p "$ATOM_HOME" -if [ $OS == 'Mac' ]; then - if [ -L "$0" ]; then @@ -91,14 +91,9 @@ - ;; - esac - -- ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" -- mkdir -p "$ATOM_HOME" +- : ${TMPDIR:=/tmp} +ATOM_PATH="/usr/lib/atom/atom" -- : ${TMPDIR:=/tmp} -+ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" -+mkdir -p "$ATOM_HOME" - - [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom" - - if [ $EXPECT_OUTPUT ]; then Modified: fix-license-path.patch =================================================================== --- fix-license-path.patch 2018-08-03 11:27:05 UTC (rev 367532) +++ fix-license-path.patch 2018-08-03 12:46:52 UTC (rev 367533) @@ -11,7 +11,7 @@ for (let window of this.getAllWindows()) { --- a/src/workspace.js +++ b/src/workspace.js -@@ -1124,7 +1124,7 @@ +@@ -1132,7 +1132,7 @@ // Open Atom's license in the active pane. openLicense () { Modified: use-system-electron.patch =================================================================== --- use-system-electron.patch 2018-08-03 11:27:05 UTC (rev 367532) +++ use-system-electron.patch 2018-08-03 12:46:52 UTC (rev 367533) @@ -21,7 +21,7 @@ // Needed so we can require src/module-cache.coffee during generateModuleCache require('coffee-script/register') require('colors') -@@ -26,7 +22,6 @@ +@@ -27,7 +23,6 @@ .wrap(yargs.terminalWidth()) .argv @@ -29,7 +29,7 @@ const cleanOutputDirectory = require('./lib/clean-output-directory') const cleanPackageLock = require('./lib/clean-package-lock') const codeSignOnMac = require('./lib/code-sign-on-mac') -@@ -60,7 +55,6 @@ +@@ -61,7 +56,6 @@ if (!argv.existingBinaries) { cleanPackageLock() @@ -37,68 +37,74 @@ cleanOutputDirectory() copyAssets() transpilePackagesWithCustomTranspilerPaths() -@@ -76,61 +70,4 @@ - } +@@ -80,67 +74,5 @@ - binariesPromise -- .then(packageApplication) - .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath)) -- .then(packagedAppPath => { -- switch (process.platform) { -- case 'darwin': { -- if (argv.codeSign) { -- codeSignOnMac(packagedAppPath) -- } else { -- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray) + if (!argv.generateApiDocs) { + binariesPromise +- .then(packageApplication) + .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath)) +- .then(packagedAppPath => { +- switch (process.platform) { +- case 'darwin': { +- if (argv.codeSign) { +- codeSignOnMac(packagedAppPath) +- } else { +- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray) +- } +- break - } -- } -- case 'win32': { -- if (argv.codeSign) { -- const executablesToSign = [ path.join(packagedAppPath, 'Atom.exe') ] +- case 'win32': { +- if (argv.codeSign) { +- const executablesToSign = [ path.join(packagedAppPath, 'Atom.exe') ] +- if (argv.createWindowsInstaller) { +- executablesToSign.push(path.join(__dirname, 'node_modules', 'electron-winstaller', 'vendor', 'Update.exe')) +- } +- codeSignOnWindows(executablesToSign) +- } else { +- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray) +- } - if (argv.createWindowsInstaller) { -- executablesToSign.push(path.join(__dirname, 'node_modules', 'electron-winstaller', 'vendor', 'Update.exe')) +- return createWindowsInstaller(packagedAppPath) +- .then((installerPath) => { +- argv.codeSign && codeSignOnWindows([installerPath]) +- return packagedAppPath +- }) +- } else { +- console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray) - } -- codeSignOnWindows(executablesToSign) -- } else { -- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray) +- break - } -- if (argv.createWindowsInstaller) { -- return createWindowsInstaller(packagedAppPath) -- .then(() => argv.codeSign && codeSignOnWindows([ path.join(CONFIG.buildOutputPath, 'AtomSetup.exe') ])) -- .then(() => packagedAppPath) -- } else { -- console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray) +- case 'linux': { +- if (argv.createDebianPackage) { +- createDebianPackage(packagedAppPath) +- } else { +- console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray) +- } +- +- if (argv.createRpmPackage) { +- createRpmPackage(packagedAppPath) +- } else { +- console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray) +- } +- break - } - } -- case 'linux': { -- if (argv.createDebianPackage) { -- createDebianPackage(packagedAppPath) -- } else { -- console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray) -- } - -- if (argv.createRpmPackage) { -- createRpmPackage(packagedAppPath) -- } else { -- console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray) -- } +- return Promise.resolve(packagedAppPath) +- }).then(packagedAppPath => { +- if (argv.compressArtifacts) { +- compressArtifacts(packagedAppPath) +- } else { +- console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray) - } -- } - -- return Promise.resolve(packagedAppPath) -- }).then(packagedAppPath => { -- if (argv.compressArtifacts) { -- compressArtifacts(packagedAppPath) -- } else { -- console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray) -- } -- -- if (argv.install != null) { -- installApplication(packagedAppPath, argv.install) -- } else { -- console.log('Skipping installation. Specify the --install option to install Atom'.gray) -- } -- }) +- if (argv.install != null) { +- installApplication(packagedAppPath, argv.install) +- } else { +- console.log('Skipping installation. Specify the --install option to install Atom'.gray) +- } +- }) + } --- a/script/lib/generate-startup-snapshot.js +++ b/script/lib/generate-startup-snapshot.js @@ -79,7 +79,7 @@ @@ -132,7 +138,7 @@ "colors": "1.1.2", "donna": "1.0.16", - "electron-chromedriver": "~2.0", - "electron-link": "0.2.0", + "electron-link": "0.2.2", - "electron-mksnapshot": "~2.0", "electron-packager": "7.3.0", "electron-winstaller": "2.6.4",
