[arch-commits] Commit in atom/trunk (7 files)
Nicola Squartini
tensor5 at archlinux.org
Fri Apr 12 02:41:00 UTC 2019
Date: Friday, April 12, 2019 @ 02:40:59
Author: tensor5
Revision: 451189
upgpkg: atom 1.36.0-1
Modified:
atom/trunk/PKGBUILD
atom/trunk/electron-3.patch
atom/trunk/fix-atom-sh.patch
atom/trunk/fix-license-path.patch
atom/trunk/fix-restart.patch
atom/trunk/use-system-electron.patch
Deleted:
atom/trunk/fix-middle-click.patch
---------------------------+
PKGBUILD | 26 ++++++++++----------------
electron-3.patch | 2 +-
fix-atom-sh.patch | 42 ++++++++++++++++++++++++++++--------------
fix-license-path.patch | 2 +-
fix-middle-click.patch | 21 ---------------------
fix-restart.patch | 2 +-
use-system-electron.patch | 16 +++++++++++-----
7 files changed, 52 insertions(+), 59 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2019-04-12 01:50:14 UTC (rev 451188)
+++ PKGBUILD 2019-04-12 02:40:59 UTC (rev 451189)
@@ -1,8 +1,8 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
pkgname=atom
-pkgver=1.35.1
-pkgrel=3
+pkgver=1.36.0
+pkgrel=1
pkgdesc='A hackable text editor for the 21st Century'
arch=('x86_64')
url='https://github.com/atom/atom'
@@ -20,25 +20,23 @@
'electron-3.patch'
'fix-atom-sh.patch'
'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'
+sha256sums=('4ef8c35d67964c24abea36b65c914a5aea63520496999d3d8032bdff2c8d9c23'
'cdf87ab82cfcf69e8904684c59b08c35a68540ea16ab173fce06037ac341efcd'
'971e4575884a0d1bf4683b5c6402a3d6059e41345cc09db83df5a0a30ad41bb6'
'530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
- '328da3b30f4e20e56b38e588d9fe871c01bbbe69865a79e9586919564bdfa869'
- 'ab9eed3d4c8bfefea256953428379ab1e636b9c7d4c4af30ddc3f485330183c2'
- '5c77deec5896b658395bdf695c3bc044c9140ad0a5a87f34520c4a31972e51d1'
- '142d540259296396f6d528ecf2f7c6a363f89f8a0d2ad66497f8392da06202bc'
- 'c4b883265d16ee30402c449d07be78b7088c1aa60c4f3e712b8bfe857c95f346'
+ '75a672adc0237ea8c93ff67d8296eb73b87792b7b58cdaef7bf596fb6edd073f'
+ '3ce4f665a1e3484bb408a665500a8f99d8afb5e3cd9d70374c5f9f4a37176e42'
+ '82a0a17d93f00c92bba21094690e075f2b146b424b52209872dd993ce38ca97e'
+ 'ad63f6428eb8c6afd477ae8f99f85ad25d822d4154c9275272c9ca19c8540953'
'4033929dde0b81bb6f174cc4c79050474afaf85b54b928bfe13e05059448ebb1'
'3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
'53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806'
- 'a78082364aca5e17595acd237f9e342027384b869974cf9ae3aebd8c23df6cc0')
+ '19347f0a6bf56721815a4477d0a346becea94b5ea3d4c621f9717269e21144de')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -79,14 +77,10 @@
rm -r git
cd ../..
- # https://bugs.archlinux.org/task/61047
- cd node_modules/tabs
- patch -Np1 -i "${srcdir}"/fix-middle-click.patch
- cd ../..
-
cd script
npm install
- ./build
+ # Set ELECTRON_VERSION (see use-system-electron.patch)
+ env ELECTRON_VERSION=$(< /usr/lib/electron/version) ./build
}
package() {
Modified: electron-3.patch
===================================================================
--- electron-3.patch 2019-04-12 01:50:14 UTC (rev 451188)
+++ electron-3.patch 2019-04-12 02:40:59 UTC (rev 451189)
@@ -1,6 +1,6 @@
--- a/src/text-editor-component.js
+++ b/src/text-editor-component.js
-@@ -4433,7 +4433,7 @@
+@@ -4446,7 +4446,7 @@
if (element) {
element.className = className || ''
Modified: fix-atom-sh.patch
===================================================================
--- fix-atom-sh.patch 2019-04-12 01:50:14 UTC (rev 451188)
+++ fix-atom-sh.patch 2019-04-12 02:40:59 UTC (rev 451189)
@@ -29,8 +29,8 @@
-
export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
- while getopts ":wtfvh-:" opt; do
-@@ -65,95 +41,19 @@
+ ATOM_ADD=false
+@@ -86,105 +62,24 @@
ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
mkdir -p "$ATOM_HOME"
@@ -52,7 +52,12 @@
- 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
++if [ $EXPECT_OUTPUT ]; then
++ "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
++ ATOM_EXIT=$?
++ if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
++ exit "${EXIT_CODE_OVERRIDE}"
+ else
- # Else choose it from the inferred channel name
- if [ "$CHANNEL" == 'beta' ]; then
- ATOM_EXECUTABLE_NAME="Atom Beta"
@@ -81,11 +86,17 @@
- exit 1
- fi
- fi
-- fi
++ exit ${ATOM_EXIT}
+ fi
-
- if [ $EXPECT_OUTPUT ]; then
- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
-- exit $?
+- ATOM_EXIT=$?
+- if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
+- exit "${EXIT_CODE_OVERRIDE}"
+- else
+- exit ${ATOM_EXIT}
+- fi
- else
- open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
- fi
@@ -114,15 +125,12 @@
-
- if [ $EXPECT_OUTPUT ]; then
- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+if [ $EXPECT_OUTPUT ]; then
-+ "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+ exit $?
-+else
-+ (
-+ nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+ if [ $? -ne 0 ]; then
-+ cat "$ATOM_HOME/nohup.out"
- exit $?
+- ATOM_EXIT=$?
+- if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
+- exit "${EXIT_CODE_OVERRIDE}"
+- else
+- exit ${ATOM_EXIT}
+- fi
- else
- (
- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
@@ -131,6 +139,12 @@
- exit $?
- fi
- ) &
++else
++ (
++ nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
++ if [ $? -ne 0 ]; then
++ cat "$ATOM_HOME/nohup.out"
++ exit $?
fi
+ ) &
fi
Modified: fix-license-path.patch
===================================================================
--- fix-license-path.patch 2019-04-12 01:50:14 UTC (rev 451188)
+++ fix-license-path.patch 2019-04-12 02:40:59 UTC (rev 451189)
@@ -1,6 +1,6 @@
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
-@@ -430,7 +430,7 @@
+@@ -441,7 +441,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')
Deleted: fix-middle-click.patch
===================================================================
--- fix-middle-click.patch 2019-04-12 01:50:14 UTC (rev 451188)
+++ fix-middle-click.patch 2019-04-12 02:40:59 UTC (rev 451189)
@@ -1,21 +0,0 @@
-From 82e767bfafcc882f3c3811bb9eb008b8f7c2c731 Mon Sep 17 00:00:00 2001
-From: Mario Pilz <mario at pilz-at.net>
-Date: Fri, 21 Dec 2018 03:48:36 +0100
-Subject: [PATCH] Fix tab close on middle click for Electron 3
-
----
- lib/tab-bar-view.coffee | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/tab-bar-view.coffee b/lib/tab-bar-view.coffee
-index 93e958e..2b91ad6 100644
---- a/lib/tab-bar-view.coffee
-+++ b/lib/tab-bar-view.coffee
-@@ -87,6 +87,7 @@ class TabBarView
-
- @element.addEventListener "mousedown", @onMouseDown.bind(this)
- @element.addEventListener "click", @onClick.bind(this)
-+ @element.addEventListener "auxclick", @onClick.bind(this)
- @element.addEventListener "dblclick", @onDoubleClick.bind(this)
-
- @onDropOnOtherWindow = @onDropOnOtherWindow.bind(this)
Modified: fix-restart.patch
===================================================================
--- fix-restart.patch 2019-04-12 01:50:14 UTC (rev 451188)
+++ fix-restart.patch 2019-04-12 02:40:59 UTC (rev 451189)
@@ -1,6 +1,6 @@
--- a/src/main-process/atom-application.js
+++ b/src/main-process/atom-application.js
-@@ -1370,7 +1370,7 @@
+@@ -1419,7 +1419,7 @@
}
restart () {
Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch 2019-04-12 01:50:14 UTC (rev 451188)
+++ use-system-electron.patch 2019-04-12 02:40:59 UTC (rev 451189)
@@ -29,7 +29,13 @@
const cleanOutputDirectory = require('./lib/clean-output-directory')
const codeSignOnMac = require('./lib/code-sign-on-mac')
const codeSignOnWindows = require('./lib/code-sign-on-windows')
-@@ -60,7 +55,6 @@
+@@ -57,12 +52,11 @@
+ })
+
+ const CONFIG = require('./config')
+-process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
++// process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
+
let binariesPromise = Promise.resolve()
if (!argv.existingBinaries) {
@@ -37,7 +43,7 @@
cleanOutputDirectory()
copyAssets()
transpilePackagesWithCustomTranspilerPaths()
-@@ -79,67 +73,5 @@
+@@ -81,67 +75,5 @@
if (!argv.generateApiDocs) {
binariesPromise
@@ -138,7 +144,7 @@
"colors": "1.1.2",
"donna": "1.0.16",
- "electron-chromedriver": "~2.0",
- "electron-link": "0.3.3",
+ "electron-link": "0.3.2",
- "electron-mksnapshot": "~2.0",
"electron-packager": "7.3.0",
"electron-winstaller": "2.6.4",
@@ -191,7 +197,7 @@
const url = require('url')
const {EventEmitter} = require('events')
-@@ -43,7 +44,8 @@
+@@ -41,7 +42,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)
@@ -201,7 +207,7 @@
}
}
-@@ -159,7 +161,7 @@
+@@ -141,7 +143,7 @@
return this.representedDirectoryPaths.some(projectPath => {
if (pathToCheck === projectPath) return true
if (!pathToCheck.startsWith(path.join(projectPath, path.sep))) return false
More information about the arch-commits
mailing list