[arch-commits] Commit in atom/trunk (4 files)
Date: Wednesday, July 15, 2020 @ 02:13:33 Author: tensor5 Revision: 663826 upgpkg: atom 1.49.0-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch atom/trunk/use-system-electron.patch ---+ PKGBUILD | 10 +- fix-license-path.patch|2 +- fix-restart.patch |2 +- use-system-electron.patch |4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2020-07-15 00:29:42 UTC (rev 663825) +++ PKGBUILD2020-07-15 02:13:33 UTC (rev 663826) @@ -1,8 +1,8 @@ # Maintainer: Nicola Squartini pkgname=atom -pkgver=1.48.0 -_commit=5df9cd3d774352321ffeb65570de77906792f8bc +pkgver=1.49.0 +_commit=1d0abfabc682cbb43b589015be0813fe7cfd2182 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') @@ -30,14 +30,14 @@ '6218ecf9a767e80f70a4b07abaefcf63a3d615200ff27b2dbc7bb36eacd8e87f' '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153' 'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d' -'2894cce31935d45291c5fe4c625473bb83fc51e1b899f162aa6b419491c7ace1' -'e3c30c03006d23a72f07fa77f4309b16a6059af1179343033a87f74f50124076' +'74cd1d023ae1d1c9835006ea14cdd315649df2d5eb7996de664a45e720742daf' +'63ad62bef0be1029d5d10a4c76eeb6bafda4328288230e9393cd48659ec7cf2c' 'e321fdfe880cd465918dd1dbb90e4c7d46fc5310f20666eddf0a41cbca4f8ac8' '40d783794d62f12f3c429c624a84265871c7ed95f4120c9db800348896dd5437' 'a09439c2a908ca174ff3be1f0d85071d12c792ae19748e36fe601e372d6d925b' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '8d48dca4571136375b325f4bf94ccfb996e90e57b7fdf83d53c1eb2e69b3b0d4' -'a01a3237b3967b070e41a6bf3a4c664fbf6125559ffd3f84e43c81d77fa25b45') +'84b03b2e68d2f86cd963a2e9327698545a8a782895594cf2cc9a74531c5c7875') prepare() { cd ${pkgname} Modified: fix-license-path.patch === --- fix-license-path.patch 2020-07-15 00:29:42 UTC (rev 663825) +++ fix-license-path.patch 2020-07-15 02:13:33 UTC (rev 663826) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -716,7 +716,7 @@ +@@ -711,7 +711,7 @@ ); this.openPathOnEvent( 'application:open-license', Modified: fix-restart.patch === --- fix-restart.patch 2020-07-15 00:29:42 UTC (rev 663825) +++ fix-restart.patch 2020-07-15 02:13:33 UTC (rev 663826) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -2047,7 +2047,7 @@ +@@ -2042,7 +2042,7 @@ } restart() { Modified: use-system-electron.patch === --- use-system-electron.patch 2020-07-15 00:29:42 UTC (rev 663825) +++ use-system-electron.patch 2020-07-15 02:13:33 UTC (rev 663826) @@ -144,9 +144,9 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16", --"electron-chromedriver": "^5.0.0", +-"electron-chromedriver": "^9.0.0", "electron-link": "0.4.1", --"electron-mksnapshot": "^5.0.0", +-"electron-mksnapshot": "^9.0.2", "electron-packager": "12.2.0", "@atom/electron-winstaller": "0.0.1", "eslint": "^5.16.0",
[arch-commits] Commit in atom/trunk (4 files)
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 === --- PKGBUILD2019-05-15 03:22:02 UTC (rev 467256) +++ PKGBUILD2019-05-15 04:16:43 UTC (rev 467257) @@ -1,7 +1,7 @@ # Maintainer: Nicola Squartini 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
[arch-commits] Commit in atom/trunk (4 files)
Date: Wednesday, May 1, 2019 @ 05:42:20 Author: tensor5 Revision: 457385 upgpkg: atom 1.36.1-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch atom/trunk/use-system-electron.patch ---+ PKGBUILD | 12 ++-- fix-license-path.patch|2 +- fix-restart.patch |2 +- use-system-electron.patch | 21 ++--- 4 files changed, 10 insertions(+), 27 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-05-01 04:38:38 UTC (rev 457384) +++ PKGBUILD2019-05-01 05:42:20 UTC (rev 457385) @@ -1,8 +1,8 @@ # Maintainer: Nicola Squartini pkgname=atom -pkgver=1.36.0 -pkgrel=2 +pkgver=1.36.1 +pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') url='https://github.com/atom/atom' @@ -26,19 +26,19 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('4ef8c35d67964c24abea36b65c914a5aea63520496999d3d8032bdff2c8d9c23' +sha256sums=('3fa6f0d86f3108a55b38c00e5d94da8ca6ceea74ae2a5aa263ef5bfb50eca0d8' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' '971e4575884a0d1bf4683b5c6402a3d6059e41345cc09db83df5a0a30ad41bb6' '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153' '75a672adc0237ea8c93ff67d8296eb73b87792b7b58cdaef7bf596fb6edd073f' '3ce4f665a1e3484bb408a665500a8f99d8afb5e3cd9d70374c5f9f4a37176e42' -'82a0a17d93f00c92bba21094690e075f2b146b424b52209872dd993ce38ca97e' -'ad63f6428eb8c6afd477ae8f99f85ad25d822d4154c9275272c9ca19c8540953' +'b38f7538d1506bd11bf57cc5a2919b2d29fb39a8811a0bf8e7fdd68e6c144296' +'d3bd6c952ba0853811ebd3a2f268e3be796a41b8f26650c5b6489ff7cac3749c' '9073d3947f11e21788f0931021e4f41d01e3651cc99f2b3320626f478e26c491' '4033929dde0b81bb6f174cc4c79050474afaf85b54b928bfe13e05059448ebb1' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806' -'19347f0a6bf56721815a4477d0a346becea94b5ea3d4c621f9717269e21144de') +'95cddeae2be0a9e54d29122f5716687e48b4a270b3207f7caf0b351cde158980') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: fix-license-path.patch === --- fix-license-path.patch 2019-05-01 04:38:38 UTC (rev 457384) +++ fix-license-path.patch 2019-05-01 05:42:20 UTC (rev 457385) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -441,7 +441,7 @@ +@@ -553,7 +553,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-01 04:38:38 UTC (rev 457384) +++ fix-restart.patch 2019-05-01 05:42:20 UTC (rev 457385) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -1419,7 +1419,7 @@ +@@ -1603,7 +1603,7 @@ } restart () { Modified: use-system-electron.patch === --- use-system-electron.patch 2019-05-01 04:38:38 UTC (rev 457384) +++ use-system-electron.patch 2019-05-01 05:42:20 UTC (rev 457385) @@ -144,7 +144,7 @@ "colors": "1.1.2", "donna": "1.0.16", -"electron-chromedriver": "~2.0", - "electron-link": "0.3.2", + "electron-link": "0.3.3", -"electron-mksnapshot": "~2.0", "electron-packager": "7.3.0", "electron-winstaller": "2.6.4", @@ -189,15 +189,7 @@ } --- a/src/main-process/atom-window.js +++ b/src/main-process/atom-window.js -@@ -1,6 +1,7 @@ - const {BrowserWindow, app, dialog, ipcMain} = require('electron') - const path = require('path') - const fs = require('fs') -+const {statSyncNoException} = require('fs-plus') - const url = require('url') - const {EventEmitter} = require('events') - -@@ -41,7 +42,8 @@ +@@ -40,7 +40,8 @@ // Disable the `auxclick` feature so that `click` events are triggered in // response to a middle-click. // (Ref: https://github.com/atom/atom/pull/12696#issuecomment-290496960) @@ -207,15 +199,6 @@ } } -@@ -141,7 +143,7 @@ - return this.representedDirectoryPaths.some(projectPath => { - if (pathToCheck === projectPath) return true - if (!pathToCheck.startsWith(path.join(projectPath, path.sep))) return false -- if (stat === undefined) stat = fs.statSyncNoException(pathT
[arch-commits] Commit in atom/trunk (4 files)
Date: Monday, March 25, 2019 @ 07:48:33 Author: tensor5 Revision: 443398 upgpkg: atom 1.35.1-3 Fix some warnings and minor errors. Added: atom/trunk/buffer.patch atom/trunk/no-unsafe-eval.patch Modified: atom/trunk/PKGBUILD atom/trunk/use-system-electron.patch ---+ PKGBUILD | 10 ++-- buffer.patch | 22 + no-unsafe-eval.patch | 11 use-system-electron.patch | 55 4 files changed, 96 insertions(+), 2 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-25 07:47:11 UTC (rev 443397) +++ PKGBUILD2019-03-25 07:48:33 UTC (rev 443398) @@ -2,7 +2,7 @@ pkgname=atom pkgver=1.35.1 -pkgrel=2 +pkgrel=3 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') url='https://github.com/atom/atom' @@ -15,6 +15,7 @@ options=(!emptydirs) source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"; 'atom.js' +'buffer.patch' 'dugite-use-system-git.patch' 'electron-3.patch' 'fix-atom-sh.patch' @@ -21,11 +22,13 @@ 'fix-license-path.patch' 'fix-middle-click.patch' 'fix-restart.patch' +'no-unsafe-eval.patch' 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') sha256sums=('a50bcfcda4cfe6017fb76defc3a0eeaca209954d86a631f5963e69a0c064c2e8' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' +'971e4575884a0d1bf4683b5c6402a3d6059e41345cc09db83df5a0a30ad41bb6' '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153' '328da3b30f4e20e56b38e588d9fe871c01bbbe69865a79e9586919564bdfa869' 'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2' @@ -32,18 +35,21 @@ '5c77deec5896b658395bdf695c3bc044c9140ad0a5a87f34520c4a31972e51d1' '142d540259296396f6d528ecf2f7c6a363f89f8a0d2ad66497f8392da06202bc' 'c4b883265d16ee30402c449d07be78b7088c1aa60c4f3e712b8bfe857c95f346' +'4033929dde0b81bb6f174cc4c79050474afaf85b54b928bfe13e05059448ebb1' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806' -'457bd1b06604aec1e2ebb6e0ea473742747e183e833fffb36377aad64c37bcd5') +'a78082364aca5e17595acd237f9e342027384b869974cf9ae3aebd8c23df6cc0') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" + patch -Np1 -i "${srcdir}"/buffer.patch patch -Np1 -i "${srcdir}"/fix-atom-sh.patch patch -Np1 -i "${srcdir}"/use-system-electron.patch patch -Np1 -i "${srcdir}"/use-system-apm.patch patch -Np1 -i "${srcdir}"/fix-license-path.patch patch -Np1 -i "${srcdir}"/fix-restart.patch + patch -Np1 -i "${srcdir}"/no-unsafe-eval.patch # Fix for Electron 3 patch -Np1 -i "${srcdir}"/electron-3.patch Added: buffer.patch === --- buffer.patch(rev 0) +++ buffer.patch2019-03-25 07:48:33 UTC (rev 443398) @@ -0,0 +1,22 @@ +--- a/src/file-system-blob-store.js b/src/file-system-blob-store.js +@@ -20,7 +20,7 @@ + + reset () { + this.inMemoryBlobs = new Map() +-this.storedBlob = new Buffer(0) ++this.storedBlob = Buffer.alloc(0) + this.storedBlobMap = {} + this.usedKeys = new Set() + } +--- a/src/compile-cache.js b/src/compile-cache.js +@@ -177,7 +177,7 @@ + var rawData = sourceMappingURL.slice(sourceMappingURL.indexOf(',') + 1) + + try { +-var sourceMap = JSON.parse(new Buffer(rawData, 'base64')) ++var sourceMap = JSON.parse(Buffer.from(rawData, 'base64')) + } catch (error) { + console.warn('Error parsing source map', error.stack) + return null Added: no-unsafe-eval.patch === --- no-unsafe-eval.patch(rev 0) +++ no-unsafe-eval.patch2019-03-25 07:48:33 UTC (rev 443398) @@ -0,0 +1,11 @@ +--- a/static/index.html b/static/index.html +@@ -1,7 +1,7 @@ + + + +- ++ + + + Modified: use-system-electron.patch === --- use-system-electron.patch 2019-03-25 07:47:11 UTC (rev 443397) +++ use-system-electron.patch 2019-03-25 07:48:33 UTC (rev 443398) @@ -155,6 +155,61 @@ } } function getConfig () { +--- a/src/main-process/atom-protocol-handler.js b/src/main-process/atom-protocol-handler.js +@@ -1,5 +1,6 @@ + const {protocol} = require('electron') + const fs = require('fs') ++const {statSyncNoException} = require('fs-plus') + const path = require('path') + + // Handles requests with 'atom' proto
[arch-commits] Commit in atom/trunk (4 files)
Date: Monday, March 18, 2019 @ 08:21:48 Author: tensor5 Revision: 442425 upgpkg: atom 1.35.1-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch atom/trunk/use-system-electron.patch ---+ PKGBUILD | 12 +++- fix-license-path.patch|2 +- fix-restart.patch |2 +- use-system-electron.patch |6 +++--- 4 files changed, 12 insertions(+), 10 deletions(-) Modified: PKGBUILD === --- PKGBUILD2019-03-18 07:11:11 UTC (rev 442424) +++ PKGBUILD2019-03-18 08:21:48 UTC (rev 442425) @@ -1,7 +1,7 @@ # Maintainer: Nicola Squartini pkgname=atom -pkgver=1.34.0 +pkgver=1.35.1 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') @@ -24,17 +24,17 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('c4c6199e6cce48ebf02757db65011ac5a3e685f46b35d3a9695f600b40f0da8a' +sha256sums=('a50bcfcda4cfe6017fb76defc3a0eeaca209954d86a631f5963e69a0c064c2e8' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153' '328da3b30f4e20e56b38e588d9fe871c01bbbe69865a79e9586919564bdfa869' 'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2' -'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205' +'5c77deec5896b658395bdf695c3bc044c9140ad0a5a87f34520c4a31972e51d1' '142d540259296396f6d528ecf2f7c6a363f89f8a0d2ad66497f8392da06202bc' -'cbac8d28e32a32760cd6b16d313e05e32af57bfdea1c248636e1b1ae74e4e92c' +'c4b883265d16ee30402c449d07be78b7088c1aa60c4f3e712b8bfe857c95f346' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806' -'a489e590e362a24a3212c20159c5a07d19f74498bfefebbca42d8a23203e6695') +'457bd1b06604aec1e2ebb6e0ea473742747e183e833fffb36377aad64c37bcd5') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -55,6 +55,8 @@ # Fix for Electron 3 npm install --package-lock-only @atom/nsfw@1.0.20 node-abi + rm package-lock.json + ATOM_RESOURCE_PATH="${PWD}" \ npm_config_target=$(tail -c +2 /usr/lib/electron/version) \ apm install Modified: fix-license-path.patch === --- fix-license-path.patch 2019-03-18 07:11:11 UTC (rev 442424) +++ fix-license-path.patch 2019-03-18 08:21:48 UTC (rev 442425) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -416,7 +416,7 @@ +@@ -430,7 +430,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-03-18 07:11:11 UTC (rev 442424) +++ fix-restart.patch 2019-03-18 08:21:48 UTC (rev 442425) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -1356,7 +1356,7 @@ +@@ -1370,7 +1370,7 @@ } restart () { Modified: use-system-electron.patch === --- use-system-electron.patch 2019-03-18 07:11:11 UTC (rev 442424) +++ use-system-electron.patch 2019-03-18 08:21:48 UTC (rev 442425) @@ -4,7 +4,7 @@ "url": "https://github.com/atom/atom/issues"; }, "license": "MIT", -- "electronVersion": "2.0.16", +- "electronVersion": "2.0.18", "dependencies": { "@atom/nsfw": "1.0.18", "@atom/source-map-support": "^0.3.4", @@ -133,12 +133,12 @@ } --- a/script/package.json +++ b/script/package.json -@@ -9,9 +9,7 @@ +@@ -8,9 +8,7 @@ "coffeelint": "1.15.7", "colors": "1.1.2", "donna": "1.0.16", -"electron-chromedriver": "~2.0", - "electron-link": "0.2.2", + "electron-link": "0.3.3", -"electron-mksnapshot": "~2.0", "electron-packager": "7.3.0", "electron-winstaller": "2.6.4",
[arch-commits] Commit in atom/trunk (4 files)
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 === --- PKGBUILD2018-10-24 12:22:03 UTC (rev 398812) +++ PKGBUILD2018-10-24 12:27:50 UTC (rev 398813) @@ -1,7 +1,7 @@ # Maintainer: Nicola Squartini 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.patch2018-10-24 12:22:03 UTC (rev 398812) +++ use-system-apm.patch2018-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-c
[arch-commits] Commit in atom/trunk (4 files)
Date: Monday, October 8, 2018 @ 11:22:13 Author: tensor5 Revision: 391088 upgpkg: atom 1.31.2-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-restart.patch atom/trunk/use-system-apm.patch atom/trunk/use-system-electron.patch ---+ PKGBUILD | 17 +++-- fix-restart.patch |2 +- use-system-apm.patch |6 +++--- use-system-electron.patch | 24 4 files changed, 23 insertions(+), 26 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-10-08 10:53:39 UTC (rev 391087) +++ PKGBUILD2018-10-08 11:22:13 UTC (rev 391088) @@ -1,7 +1,7 @@ # Maintainer: Nicola Squartini pkgname=atom -pkgver=1.30.0 +pkgver=1.31.2 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=('ebc4ef0922307f2c4dfd69c6cd2cb4f4c8f1dc7c00a55253437b7f893d2d94cd' +sha256sums=('baff1b23e03c638584d01817bda15503e66eff1c231c3952670c94b345588628' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153' 'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2' 'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205' -'b9533bd31e9329d63abc5ec87b237761c73d0586485288925ba723fb34b3b933' +'1f48c84f30ffefaef7235d8231af7357b801d66de9f09921d0ee0dd5849595ca' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' -'4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b' -'79ae5cf80af9a4aa4ff84cad3786e8cdf3eef25e967919c84374d490f9c7f884') +'32e27c6245237a794b15eaf7dbfb81196455865af8ed9157aca763ed21a2fef3' +'a6e34b5f35183fb5f12000fc9f9948cb6dff0a50909f65c8bc87b149d3d81b00') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -45,10 +45,8 @@ build() { cd "${srcdir}/${pkgname}-${pkgver}" - export ATOM_RESOURCE_PATH="$srcdir/atom-$pkgver" - # If unset, ~/.atom/.node-gyp/.atom/.npm is used - export NPM_CONFIG_CACHE="${HOME}/.atom/.npm" - apm clean + ATOM_RESOURCE_PATH="${PWD}" \ + npm_config_target=$(tail -c +2 /usr/lib/electron/version) \ apm install # Use system ctags @@ -96,7 +94,6 @@ node -e "require('./script/lib/get-license-text')().then((licenseText) => require('fs').writeFileSync('${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md', licenseText))" # Remove useless stuff - rm "${pkgdir}"/usr/lib/atom/node_modules/.bin/pegjs find "${pkgdir}"/usr/lib/atom/node_modules \ -name "*.a" -exec rm '{}' \; \ -or -name "*.bat" -exec rm '{}' \; \ Modified: fix-restart.patch === --- fix-restart.patch 2018-10-08 10:53:39 UTC (rev 391087) +++ fix-restart.patch 2018-10-08 11:22:13 UTC (rev 391088) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -1349,7 +1349,7 @@ +@@ -1350,7 +1350,7 @@ } restart () { Modified: use-system-apm.patch === --- use-system-apm.patch2018-10-08 10:53:39 UTC (rev 391087) +++ use-system-apm.patch2018-10-08 11:22:13 UTC (rev 391088) @@ -10,12 +10,12 @@ childProcess.execFileSync( -CONFIG.getApmBinPath(), +'apm', - ['--loglevel=error', 'install'], - {env: installEnv, cwd: packagePath, stdio: 'inherit'} + ['--loglevel=error', ci ? 'ci' : 'install'], + {env: installEnv, cwd: packagePath, stdio: stdioOptions || 'inherit'} ) --- a/src/package-manager.js +++ b/src/package-manager.js -@@ -166,13 +166,7 @@ +@@ -167,13 +167,7 @@ return configPath || this.apmPath } Modified: use-system-electron.patch === --- use-system-electron.patch 2018-10-08 10:53:39 UTC (rev 391087) +++ use-system-electron.patch 2018-10-08 11:22:13 UTC (rev 391088) @@ -4,10 +4,10 @@ "url": "https://github.com/atom/atom/issues"; }, "license": "MIT", -- "electronVersion": "2.0.5", +- "electronVersion": "2.0.7", "dependencies": { "@atom/nsfw": "^1.0.18", - "@atom/watcher": "1.0.3", + "@atom/source-map-support": "^0.3.4", --- a/script/build +++ b/script/build @@ -2,10 +2,6 @@ @@ -21,23 +21,23 @@ // Needed so we can require src/module-cache.coffee during generateModuleCache require('coffee-script/register') require('colors') -@@ -27,7 +23,6 @@ +@@ -28,7 +24,6 @@ .wrap(yargs.terminalWidth()) .argv -const checkChromedriverVersion = require('./lib/check-chromedriver-version') const cleanOutputDirectory = require('./lib/clean-output-directory') - cons
[arch-commits] Commit in atom/trunk (4 files)
Date: Sunday, September 2, 2018 @ 12:49:29 Author: tensor5 Revision: 376039 upgpkg: atom 1.30.0-1 Modified: atom/trunk/PKGBUILD atom/trunk/dugite-use-system-git.patch atom/trunk/fix-atom-sh.patch atom/trunk/use-system-electron.patch -+ PKGBUILD| 10 +- dugite-use-system-git.patch | 16 fix-atom-sh.patch | 32 use-system-electron.patch |2 +- 4 files changed, 38 insertions(+), 22 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-09-02 12:40:58 UTC (rev 376038) +++ PKGBUILD2018-09-02 12:49:29 UTC (rev 376039) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini pkgname=atom -pkgver=1.29.0 +pkgver=1.30.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=('0877984f5b68b14c1804647d505f4eb64a4353a69a9fd925e31d9cb89d50d178' +sha256sums=('ebc4ef0922307f2c4dfd69c6cd2cb4f4c8f1dc7c00a55253437b7f893d2d94cd' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' -'866f19de9184287da459b0f9e8b79d0eeb72ba4e6c2a803ba29f74a33976deda' -'681f3d8e19b92548ca3a2929a13c84ef42af5a8e89bea79aba66dab30916caa6' +'530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153' +'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2' 'c8a931f36af3722c57c4d1b70c1e58aa1a18372e8e26c28a4e01253e05295205' 'b9533bd31e9329d63abc5ec87b237761c73d0586485288925ba723fb34b3b933' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b' -'3022ed1aad7eb0590a5b9477c742b513c5ac024985607ac4a90ddd66b63b1003') +'79ae5cf80af9a4aa4ff84cad3786e8cdf3eef25e967919c84374d490f9c7f884') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: dugite-use-system-git.patch === --- dugite-use-system-git.patch 2018-09-02 12:40:58 UTC (rev 376038) +++ dugite-use-system-git.patch 2018-09-02 12:49:29 UTC (rev 376039) @@ -1,6 +1,6 @@ --- a/build/lib/git-environment.js +++ b/build/lib/git-environment.js -@@ -18,7 +18,7 @@ +@@ -24,7 +24,7 @@ return path.resolve(process.env.LOCAL_GIT_DIRECTORY); } else { @@ -9,16 +9,16 @@ } } /** -@@ -50,7 +50,7 @@ - if (process.platform === 'darwin' || - process.platform === 'linux' || - process.platform === 'android') { +@@ -57,7 +57,7 @@ + return path.join(gitDir, 'mingw32', 'libexec', 'git-core'); + } + else { -return path.join(gitDir, 'libexec', 'git-core'); +return path.join(gitDir, 'lib', 'git-core'); } - else if (process.platform === 'win32') { - return path.join(gitDir, 'mingw64', 'libexec', 'git-core'); -@@ -100,9 +100,9 @@ + } + /** +@@ -108,9 +108,9 @@ if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) { // use the SSL certificate bundle included in the distribution only // when using embedded Git and not providing your own bundle Modified: fix-atom-sh.patch === --- fix-atom-sh.patch 2018-09-02 12:40:58 UTC (rev 376038) +++ fix-atom-sh.patch 2018-09-02 12:49:29 UTC (rev 376039) @@ -1,6 +1,6 @@ --- a/atom.sh +++ b/atom.sh -@@ -1,26 +1,5 @@ +@@ -1,29 +1,5 @@ #!/bin/bash -if [ "$(uname)" == 'Darwin' ]; then @@ -16,6 +16,9 @@ - atom-beta) -CHANNEL=beta -;; +- atom-nightly) +-CHANNEL=nightly +-;; - atom-dev) -CHANNEL=dev -;; @@ -27,7 +30,7 @@ export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true while getopts ":wtfvh-:" opt; do -@@ -62,82 +41,19 @@ +@@ -65,95 +41,19 @@ ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" mkdir -p "$ATOM_HOME" @@ -44,11 +47,22 @@ -ATOM_PATH="$(dirname "$ATOM_APP")" -ATOM_APP_NAME="$(basename "$ATOM_APP")" - fi -- -- if [ "$CHANNEL" == 'beta' ]; then --ATOM_EXECUTABLE_NAME="Atom Beta" ++ATOM_PATH="/usr/lib/atom/atom" + +- if [ ! -z "${ATOM_APP_NAME}" ]; then +-# If ATOM_APP_NAME is known, use it as the executable name +-ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}" - else --ATOM_EXECUTABLE_NAME="Atom" +-# Else choose it from the inferred channel name +-if [ "$CHANNEL" == 'beta' ]; then +- ATOM_EXECUTABLE_NAME="Atom Beta" +-elif [ "$CHANNEL" == 'nightly' ]; then +- ATOM_EXECUTABLE_NAME="Atom Nightly" +-elif [ "$CHANNEL" == 'dev' ]; then +- ATOM_EXECUTABLE_NAME="Atom Dev" +-else +- ATOM_EXECUTABLE_NAME="Atom" +-fi - fi - - if [ -z "${ATOM_PATH}" ]; then @@ -83,6 +97,9 @@ -beta
[arch-commits] Commit in atom/trunk (4 files)
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 === --- PKGBUILD2018-08-03 11:27:05 UTC (rev 367532) +++ PKGBUILD2018-08-03 12:46:52 UTC (rev 367533) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini 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() transpilePackagesW
[arch-commits] Commit in atom/trunk (4 files)
Date: Thursday, May 17, 2018 @ 13:33:31 Author: tensor5 Revision: 323784 upgpkg: atom 1.27.0-1 Modified: atom/trunk/PKGBUILD atom/trunk/dugite-use-system-git.patch atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch -+ PKGBUILD| 23 ++- dugite-use-system-git.patch |2 +- fix-license-path.patch |4 ++-- fix-restart.patch |2 +- 4 files changed, 22 insertions(+), 9 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-05-17 13:32:48 UTC (rev 323783) +++ PKGBUILD2018-05-17 13:33:31 UTC (rev 323784) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini pkgname=atom -pkgver=1.26.1 +pkgver=1.27.0 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') @@ -24,13 +24,13 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('d5c2fab3f671b4162992d0baffb2393bc58e6b361aa37214dcc5c9be1e03c65f' +sha256sums=('5ce50d67dab8c1cd41579a89890f999dfc0398edd2c341b695e24b50ddc5f742' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' -'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba' +'3fadee5a2d8c1ff35e085f9b9f3cf2eb71627bda9e8b10c2a0bd85b268591bf6' 'd8d77adebd7bd4eaf024988c68c30dc6b968044f7a6381227d13b6d77fa2b442' -'b8377e0132693d5130ccc42d15dce57cef9ad9f3f97aabe421f547977030cbc4' +'7f0142c91e24236a3a6dcc70af9d4217f65c5a764091876a916e3bbafa4ed0fa' 'eb771d7c009be8d48c1387ed63f3e575dc12f3bd69455b4be4b78ab57cb49b86' -'a3b2cb62521600dde5964076d5b0228abd593cdb1f25cd491748b34f99e27107' +'f81a8dd53403fe76d80716b65d69bec141fae0b1a9a6ef56314f9e815e48f132' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b' '7719b9c21fa5dad2b4e02ca05592561de8e2046283f421f2dbc9baaa7016d843') @@ -44,6 +44,19 @@ patch -Np1 -i "${srcdir}"/fix-license-path.patch patch -Np1 -i "${srcdir}"/fix-node8.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: dugite-use-system-git.patch === --- dugite-use-system-git.patch 2018-05-17 13:32:48 UTC (rev 323783) +++ dugite-use-system-git.patch 2018-05-17 13:33:31 UTC (rev 323784) @@ -9,7 +9,7 @@ } } /** -@@ -96,9 +96,9 @@ +@@ -100,9 +100,9 @@ if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) { // use the SSL certificate bundle included in the distribution only // when using embedded Git and not providing your own bundle Modified: fix-license-path.patch === --- fix-license-path.patch 2018-05-17 13:32:48 UTC (rev 323783) +++ fix-license-path.patch 2018-05-17 13:33:31 UTC (rev 323784) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -412,7 +412,7 @@ +@@ -414,7 +414,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') @@ -11,7 +11,7 @@ for (let window of this.getAllWindows()) { --- a/src/workspace.js +++ b/src/workspace.js -@@ -1105,7 +1105,7 @@ +@@ -1124,7 +1124,7 @@ // Open Atom's license in the active pane. openLicense () { Modified: fix-restart.patch === --- fix-restart.patch 2018-05-17 13:32:48 UTC (rev 323783) +++ fix-restart.patch 2018-05-17 13:33:31 UTC (rev 323784) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -1345,7 +1345,7 @@ +@@ -1347,7 +1347,7 @@ } restart () {
[arch-commits] Commit in atom/trunk (4 files)
Date: Thursday, April 19, 2018 @ 09:19:09 Author: tensor5 Revision: 316985 upgpkg: atom 1.26.0-1 Modified: atom/trunk/PKGBUILD atom/trunk/fix-license-path.patch atom/trunk/fix-restart.patch atom/trunk/use-system-electron.patch ---+ PKGBUILD | 10 +- fix-license-path.patch|2 +- fix-restart.patch |2 +- use-system-electron.patch | 14 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) Modified: PKGBUILD === --- PKGBUILD2018-04-19 08:55:24 UTC (rev 316984) +++ PKGBUILD2018-04-19 09:19:09 UTC (rev 316985) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini pkgname=atom -pkgver=1.25.1 +pkgver=1.26.0 pkgrel=1 pkgdesc='A hackable text editor for the 21st Century' arch=('x86_64') @@ -24,16 +24,16 @@ 'symbols-view-use-system-ctags.patch' 'use-system-apm.patch' 'use-system-electron.patch') -sha256sums=('607bfcfe283419d9a987649d02a3004a40272f17f2949049fccf419f8b72cfbb' +sha256sums=('1743713a64b8a6b202e2339469bf6a65d9594dd0efa26c286825b0da9696a822' 'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd' 'bbc07c111fe808b49b62198e17e8da5d3192faf281d5d84ac7cd493ed92bb2ba' 'd8d77adebd7bd4eaf024988c68c30dc6b968044f7a6381227d13b6d77fa2b442' -'67ecd71b08292218388205ee49e02d176a15bd0c3e74d30cb720b79c6946f4c9' +'813bd9a813128f7b2b8ee30dd4f759da42a8c266ea72d07913813a204a4c01da' 'eb771d7c009be8d48c1387ed63f3e575dc12f3bd69455b4be4b78ab57cb49b86' -'a6fa960741823a52b2f82684285e26eb84ce54825dc7ed008fdaca974b60957e' +'0cda894a3ade56e4a1254b646ad4d2383af8f6d675fc81e6bfa2be9d358e519f' '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8' '4b91a1acd112838bd001f4e3c555de2a5fc7446c9eab6bc5dae0ca640306e81b' -'ea255a397b798a650b34737bdfe390a393df028da061940c383063b317e70ecb') +'7719b9c21fa5dad2b4e02ca05592561de8e2046283f421f2dbc9baaa7016d843') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: fix-license-path.patch === --- fix-license-path.patch 2018-04-19 08:55:24 UTC (rev 316984) +++ fix-license-path.patch 2018-04-19 09:19:09 UTC (rev 316985) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -413,7 +413,7 @@ +@@ -414,7 +414,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 2018-04-19 08:55:24 UTC (rev 316984) +++ fix-restart.patch 2018-04-19 09:19:09 UTC (rev 316985) @@ -1,6 +1,6 @@ --- a/src/main-process/atom-application.js +++ b/src/main-process/atom-application.js -@@ -1339,7 +1339,7 @@ +@@ -1343,7 +1343,7 @@ } restart () { Modified: use-system-electron.patch === --- use-system-electron.patch 2018-04-19 08:55:24 UTC (rev 316984) +++ use-system-electron.patch 2018-04-19 09:19:09 UTC (rev 316985) @@ -7,7 +7,7 @@ - "electronVersion": "1.7.11", "dependencies": { "@atom/nsfw": "^1.0.18", - "@atom/source-map-support": "^0.3.4", + "@atom/watcher": "1.0.3", --- a/script/build +++ b/script/build @@ -2,10 +2,6 @@ @@ -101,7 +101,7 @@ - }) --- a/script/lib/generate-startup-snapshot.js +++ b/script/lib/generate-startup-snapshot.js -@@ -77,7 +77,7 @@ +@@ -79,7 +79,7 @@ } else if (process.platform === 'win32') { nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe') } else { @@ -110,7 +110,7 @@ } childProcess.execFileSync( nodeBundledInElectronPath, -@@ -85,6 +85,7 @@ +@@ -87,6 +87,7 @@ {env: Object.assign({}, process.env, {ELECTRON_RUN_AS_NODE: 1})} ) @@ -118,7 +118,7 @@ const generatedStartupBlobPath = path.join(CONFIG.buildOutputPath, 'snapshot_blob.bin') console.log(`Generating startup blob at "${generatedStartupBlobPath}"`) childProcess.execFileSync( -@@ -102,5 +103,6 @@ +@@ -104,5 +105,6 @@ console.log(`Moving generated startup blob into "${startupBlobDestinationPath}"`) fs.unlinkSync(startupBlobDestinationPath) fs.renameSync(generatedStartupBlobPath, startupBlobDestinationPath) @@ -127,12 +127,12 @@ } --- a/script/package.json +++ b/script/package.json -@@ -8,9 +8,7 @@ +@@ -7,9 +7,7 @@ + "coffeelint": "1.15.7", "colors": "1.1.2", - "csslint": "1.0.2", "donna": "1.0.16", -"electron-chromedriver": "~1.7", - "electron-link": "0.1.2", + "electron
[arch-commits] Commit in atom/trunk (4 files)
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 === --- PKGBUILD2017-10-16 19:58:38 UTC (rev 263104) +++ PKGBUILD2017-10-16 20:57:22 UTC (rev 263105) @@ -2,7 +2,7 @@ # Maintainer: Nicola Squartini 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.patch2017-10-16 19:58:38 UTC (rev 263104) +++ use-system-apm.patch2017-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", -"