[arch-commits] Commit in atom/trunk (11 files)
Nicola Squartini
tensor5 at archlinux.org
Sat Nov 12 16:39:11 UTC 2016
Date: Saturday, November 12, 2016 @ 16:39:10
Author: tensor5
Revision: 195437
upgpkg: atom 1.12.2-1
Modified:
atom/trunk/PKGBUILD
atom/trunk/fix-atom-sh.patch
atom/trunk/fix-ime-events-handler.patch
atom/trunk/fix-license-path.patch
atom/trunk/use-system-apm.patch
atom/trunk/use-system-electron.patch
Deleted:
atom/trunk/autocomplete-plus.patch
atom/trunk/beforeunload.patch
atom/trunk/fix-oniguruma.patch
atom/trunk/fix-pane-resize-handle.patch
atom/trunk/run-as-node.patch
------------------------------+
PKGBUILD | 46 +++++++----------------------------------
autocomplete-plus.patch | 11 ---------
beforeunload.patch | 14 ------------
fix-atom-sh.patch | 6 ++---
fix-ime-events-handler.patch | 6 ++---
fix-license-path.patch | 6 ++---
fix-oniguruma.patch | 13 -----------
fix-pane-resize-handle.patch | 18 ----------------
run-as-node.patch | 11 ---------
use-system-apm.patch | 2 -
use-system-electron.patch | 10 ++++----
11 files changed, 23 insertions(+), 120 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-11-12 16:32:36 UTC (rev 195436)
+++ PKGBUILD 2016-11-12 16:39:10 UTC (rev 195437)
@@ -2,41 +2,30 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
pkgname=atom
-pkgver=1.11.2
+pkgver=1.12.2
pkgrel=1
pkgdesc='A hackable text editor for the 21st Century'
arch=('i686' 'x86_64')
url='https://github.com/atom/atom'
license=('MIT' 'custom')
-depends=('apm'
- 'electron')
+depends=('apm' 'electron' 'libxkbfile')
makedepends=('git' 'npm')
optdepends=('ctags: symbol indexing support')
options=(!emptydirs)
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
- 'autocomplete-plus.patch'
- 'beforeunload.patch'
'fix-atom-sh.patch'
'fix-ime-events-handler.patch'
'fix-license-path.patch'
- 'fix-oniguruma.patch'
- 'fix-pane-resize-handle.patch'
- 'run-as-node.patch'
'symbols-view-use-system-ctags.patch'
'use-system-apm.patch'
'use-system-electron.patch')
-sha256sums=('b7c09d03d950b0a6aca82225f072d9005d5681887e3a7c466b0504bf64d7c5cd'
- '58198d214edc434580c5764f749e26fb686d77c3c983d01f247f48aec84eb1a4'
- '9c419697ed1ce272a864f1a89c91d4a2e314f88ba1dc6f1836468db6572f95b6'
- 'b0c94877962e98818b8c14865c35ac0d0e088838e24670264069b7417ce1b6ab'
- '25ccca2a773f6bf449691eac10fc4e78f5c2d264092c9f792177f6bd7ea32cce'
- '883b0be8b68cda5d1004e99e8c1622ca633cf3eaf5c4aad7cc25f8dcb1235350'
- 'c0ae6c64802bc20219bc9142bd6e62e65853044b4a678d3f7ec72dcb61d22274'
- '41aaa35b638e29d28b5d92077b7b242725046cc11d4c51d3eca589eaed977ec5'
- 'b17d546406362572d94b5aee6cc66d9a55fd3967fc256d54f5070cc6ff415554'
+sha256sums=('f244c2769d2bf92510882ca169bb059932fd8640bf4d1df0d7c7f03073d3faf6'
+ '73efe3485c9f009b788afdfa688a93a1db15ab0010203c833940406cb852240e'
+ 'd3ca65c7059352ebb584b1e77c4012af2d099450f8e2e71f77cd6d9d4dd1c09a'
+ '5fc7f905dc71ddb0b35f2027c7e13ed875fe53a34490109f5b668eac32dc3580'
'a5a2b1fefa29799b3225c4aa3fe0e5b057b2b320f98ad7bc28d3596923e52b41'
- '8ad15829dd52df15eb2a963f96b5f1869950c6e90ed8dfeac2a3202d8389d4a2'
- 'c246a7ee41a2b0f9334b6130abf58587fc70a85f5a24922e2e4083c213e6468a')
+ '9acef67fb781ac33703f3f4a60e69c4ba03d1a7d58f04308f4bdbaca6bce693e'
+ '7057152ea98131e5b590aea84f9910ebc1a47573477f42d9f9d689f2d1380072')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
@@ -46,13 +35,6 @@
patch -Np1 -i "${srcdir}"/use-system-apm.patch
patch -Np1 -i "${srcdir}"/fix-license-path.patch
- # Fix for Electron 1.2.0
- patch -Np1 -i "${srcdir}"/beforeunload.patch
- patch -Np1 -i "${srcdir}"/run-as-node.patch
-
- # Fix for Electron 1.3.0
- patch -Np1 -i "${srcdir}"/fix-pane-resize-handle.patch
-
# Fix for Electron 1.4.0
patch -Np1 -i "${srcdir}"/fix-ime-events-handler.patch
}
@@ -72,18 +54,6 @@
rm -r vendor
cd ../..
- # Fix for Node 6
- cd node_modules/autocomplete-plus
- patch -Np1 -i "${srcdir}"/autocomplete-plus.patch
- cd ../..
-
- # Fix for Electron 1.3
- _node_gyp="node-gyp rebuild --target=$(</usr/lib/electron/version) --dist-url=https://atom.io/download/atom-shell"
- cd node_modules/oniguruma
- patch -Np1 -i "${srcdir}"/fix-oniguruma.patch
- ${_node_gyp}
- cd ../../
-
cd script
npm install
./build
Deleted: autocomplete-plus.patch
===================================================================
--- autocomplete-plus.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ autocomplete-plus.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -1,11 +0,0 @@
---- a/lib/autocomplete-manager.coffee
-+++ b/lib/autocomplete-manager.coffee
-@@ -441,7 +441,7 @@ class AutocompleteManager
- return @isCurrentFileBlackListedCache
-
- minimatch ?= require('minimatch')
-- fileName = path.basename(@buffer.getPath())
-+ fileName = path.basename(@buffer.getPath() or '')
- for blacklistGlob in @fileBlacklist
- if minimatch(fileName, blacklistGlob)
- @isCurrentFileBlackListedCache = true
Deleted: beforeunload.patch
===================================================================
--- beforeunload.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ beforeunload.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -1,14 +0,0 @@
---- a/src/window-event-handler.coffee
-+++ b/src/window-event-handler.coffee
-@@ -161,9 +161,8 @@
- @atomEnvironment.storeWindowDimensions()
- if confirmed
- @atomEnvironment.unloadEditorWindow()
-- else
-- @applicationDelegate.didCancelWindowUnload()
--
-+ return
-+ @applicationDelegate.didCancelWindowUnload()
- confirmed
-
- handleWindowUnload: =>
Modified: fix-atom-sh.patch
===================================================================
--- fix-atom-sh.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ fix-atom-sh.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -18,10 +18,10 @@
- BETA_VERSION=
-fi
-
+ export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
+
while getopts ":wtfvh-:" opt; do
- case "$opt" in
- -)
-@@ -52,68 +37,22 @@
+@@ -54,68 +39,22 @@
export ELECTRON_ENABLE_LOGGING=1
fi
Modified: fix-ime-events-handler.patch
===================================================================
--- fix-ime-events-handler.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ fix-ime-events-handler.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -1,6 +1,6 @@
--- a/src/text-editor-component.coffee
+++ b/src/text-editor-component.coffee
-@@ -111,6 +111,7 @@ class TextEditorComponent
+@@ -110,6 +110,7 @@ class TextEditorComponent
@updateSync()
@checkForVisibilityChange()
@initialized = true
@@ -8,7 +8,7 @@
destroy: ->
@mounted = false
-@@ -301,19 +302,20 @@ class TextEditorComponent
+@@ -304,19 +305,20 @@ class TextEditorComponent
# User escape to cancel
# 4. compositionend fired
# OR User chooses a completion
@@ -34,7 +34,7 @@
event.target.value = ''
# Listen for selection changes and store the currently selected text
-@@ -353,6 +355,10 @@ class TextEditorComponent
+@@ -354,6 +356,10 @@ class TextEditorComponent
onTextInput: (event) =>
event.stopPropagation()
Modified: fix-license-path.patch
===================================================================
--- fix-license-path.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ fix-license-path.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -1,6 +1,6 @@
--- a/src/main-process/atom-application.coffee
+++ b/src/main-process/atom-application.coffee
-@@ -231,7 +231,7 @@
+@@ -226,7 +226,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')
@@ -7,8 +7,8 @@
- @openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
+ @openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
- @disposable.add ipcHelpers.on app, 'before-quit', =>
- @quitting = true
+ @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
+ unless @quitting
--- a/src/workspace.coffee
+++ b/src/workspace.coffee
@@ -461,7 +461,7 @@
Deleted: fix-oniguruma.patch
===================================================================
--- fix-oniguruma.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ fix-oniguruma.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -1,13 +0,0 @@
---- a/src/onig-scanner.cc
-+++ b/src/onig-scanner.cc
-@@ -16,8 +16,8 @@ void OnigScanner::Init(Local<Object> target) {
- Local<FunctionTemplate> tpl = Nan::New<FunctionTemplate>(OnigScanner::New);
- tpl->SetClassName(Nan::New<String>("OnigScanner").ToLocalChecked());
- tpl->InstanceTemplate()->SetInternalFieldCount(1);
-- tpl->PrototypeTemplate()->Set(Nan::New<String>("_findNextMatch").ToLocalChecked(), Nan::New<FunctionTemplate>(OnigScanner::FindNextMatch)->GetFunction());
-- tpl->PrototypeTemplate()->Set(Nan::New<String>("_findNextMatchSync").ToLocalChecked(), Nan::New<FunctionTemplate>(OnigScanner::FindNextMatchSync)->GetFunction());
-+ tpl->PrototypeTemplate()->Set(Nan::New<String>("_findNextMatch").ToLocalChecked(), Nan::New<FunctionTemplate>(OnigScanner::FindNextMatch));
-+ tpl->PrototypeTemplate()->Set(Nan::New<String>("_findNextMatchSync").ToLocalChecked(), Nan::New<FunctionTemplate>(OnigScanner::FindNextMatchSync));
-
- target->Set(Nan::New<String>("OnigScanner").ToLocalChecked(), tpl->GetFunction());
- }
Deleted: fix-pane-resize-handle.patch
===================================================================
--- fix-pane-resize-handle.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ fix-pane-resize-handle.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -1,18 +0,0 @@
---- a/static/panes.less
-+++ b/static/panes.less
-@@ -15,7 +15,6 @@ atom-pane-container {
- min-width: 0;
-
- & > atom-pane-resize-handle {
-- position: absolute;
- z-index: 3;
- }
- }
-@@ -39,6 +38,7 @@ atom-pane-container {
- width: 8px;
- height: 100%;
- margin-left: -4px;
-+ margin-right: -4px;
- cursor: col-resize;
- border-right: none;
- }
Deleted: run-as-node.patch
===================================================================
--- run-as-node.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ run-as-node.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -1,11 +0,0 @@
---- a/exports/atom.js
-+++ b/exports/atom.js
-@@ -37,7 +37,7 @@
-
- // The following classes can't be used from a Task handler and should therefore
- // only be exported when not running as a child node process
--if (!process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE) {
-+if (!process.env.ELECTRON_RUN_AS_NODE) {
- atomExport.Task = require('../src/task')
-
- const TextEditor = (params) => {
Modified: use-system-apm.patch
===================================================================
--- use-system-apm.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ use-system-apm.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -1,6 +1,6 @@
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
-@@ -136,12 +136,7 @@
+@@ -138,12 +138,7 @@
return configPath if configPath
return @apmPath if @apmPath?
Modified: use-system-electron.patch
===================================================================
--- use-system-electron.patch 2016-11-12 16:32:36 UTC (rev 195436)
+++ use-system-electron.patch 2016-11-12 16:39:10 UTC (rev 195437)
@@ -4,10 +4,10 @@
"url": "https://github.com/atom/atom/issues"
},
"license": "MIT",
-- "electronVersion": "0.37.8",
+- "electronVersion": "1.3.6",
"dependencies": {
"async": "0.2.6",
- "atom-keymap": "6.3.2",
+ "atom-keymap": "7.1.3",
--- 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')
-@@ -28,7 +24,6 @@
+@@ -30,7 +26,6 @@
const createDebianPackage = require('./lib/create-debian-package')
const createRpmPackage = require('./lib/create-rpm-package')
const createWindowsInstaller = require('./lib/create-windows-installer')
@@ -29,7 +29,7 @@
const dumpSymbols = require('./lib/dump-symbols')
const generateAPIDocs = require('./lib/generate-api-docs')
const generateMetadata = require('./lib/generate-metadata')
-@@ -56,48 +51,4 @@
+@@ -58,48 +53,4 @@
prebuildLessCache()
generateMetadata()
generateAPIDocs()
@@ -91,7 +91,7 @@
cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
--- a/src/package-manager.coffee
+++ b/src/package-manager.coffee
-@@ -526,7 +526,7 @@
+@@ -536,7 +536,7 @@
isBundledPackagePath: (packagePath) ->
if @devMode
More information about the arch-commits
mailing list