Commit d6d52024 authored by Chaoting Liu's avatar Chaoting Liu

[skip-ci] atom: update to 1.25.0, update patches

parent 7f3fadd9
Pipeline #278 skipped
pkgname=atom
pkgver=1.24.0
pkgver=1.25.0
pkgrel=1
pkgdesc='A hackable text editor for the 21st Century'
arch=('x86_64')
......@@ -10,19 +10,16 @@ makedepends=('git' 'npm' 'libgnome-keyring' 'gconf' 'python2' 'libsecret')
options=(!emptydirs)
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
'fix-license-path.patch'
'fix-restart.patch'
'update-tello.patch')
sha256sums=('7494fba115b214e29d3977cc1a3b08b94d0e88cad65b0d506d40904e3f967bbc'
'75e60c20ddbe79c812595fdf88771422317db4256a200d2caefd09ebdd27ecc7'
'34625e26f1089a068582bd43a9a3755b3f5186b90dcc097b519def8f701d9f3a'
'c285e6301093cc810bcbee122315f3a48ff17f530521d5e1903b48e67e0b9d4f')
'fix-restart.patch')
sha256sums=('3608c1472879420d3e69f76402f74d9bef9270687bb679b4cde008d328768c5c'
'67ecd71b08292218388205ee49e02d176a15bd0c3e74d30cb720b79c6946f4c9'
'a6fa960741823a52b2f82684285e26eb84ce54825dc7ed008fdaca974b60957e')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
patch -Np1 -i "${srcdir}"/fix-license-path.patch
patch -Np1 -i "${srcdir}"/fix-restart.patch
patch -Np1 -i "${srcdir}"/update-tello.patch
}
build() {
......@@ -31,7 +28,7 @@ build() {
export PYTHON=/usr/bin/python2
export ATOM_RESOURCE_PATH="$srcdir/atom-$pkgver"
# If unset, ~/.atom/.node-gyp/.atom/.npm is used
export NPM_CONFIG_CACHE="${HOME}/.atom/.npm"
export NPM_CONFIG_CACHE="$HOME/.atom/.npm"
cd script
npm install
......
--- a/src/main-process/atom-application.coffee
+++ b/src/main-process/atom-application.coffee
@@ -272,7 +272,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')
- @openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
+ @openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
@@ -413,7 +413,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')
- this.openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
+ this.openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
@disposable.add ipcHelpers.on app, 'before-quit', (event) =>
resolveBeforeQuitPromise = null
this.configFile.onDidChange(settings => {
for (let window of this.getAllWindows()) {
--- a/src/workspace.js
+++ b/src/workspace.js
@@ -1102,7 +1102,7 @@
@@ -1105,7 +1105,7 @@
// Open Atom's license in the active pane.
openLicense () {
......
--- a/src/main-process/atom-application.coffee
+++ b/src/main-process/atom-application.coffee
@@ -870,7 +870,7 @@
@restart()
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
@@ -1339,7 +1339,7 @@
}
restart: ->
- args = []
+ args = ["--app=/usr/lib/atom"]
args.push("--safe") if @safeMode
args.push("--log-file=#{@logFile}") if @logFile?
args.push("--socket-path=#{@socketPath}") if @socketPath?
restart () {
- const args = []
+ 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}`)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment