Date: Friday, August 19, 2016 @ 02:58:58 Author: tensor5 Revision: 186986
archrelease: copy trunk to community-i686, community-x86_64 Deleted: atom/repos/community-i686/PKGBUILD atom/repos/community-i686/autocomplete-plus.patch atom/repos/community-i686/beforeunload.patch atom/repos/community-i686/deprecated-api.patch atom/repos/community-i686/fix-atom-sh.patch atom/repos/community-i686/fix-license-path.patch atom/repos/community-i686/fix-marker-index.patch atom/repos/community-i686/fix-oniguruma.patch atom/repos/community-i686/run-as-node.patch atom/repos/community-i686/tree-view.patch atom/repos/community-i686/use-system-apm.patch atom/repos/community-i686/use-system-electron.patch atom/repos/community-x86_64/PKGBUILD atom/repos/community-x86_64/autocomplete-plus.patch atom/repos/community-x86_64/beforeunload.patch atom/repos/community-x86_64/deprecated-api.patch atom/repos/community-x86_64/fix-atom-sh.patch atom/repos/community-x86_64/fix-license-path.patch atom/repos/community-x86_64/fix-marker-index.patch atom/repos/community-x86_64/fix-oniguruma.patch atom/repos/community-x86_64/run-as-node.patch atom/repos/community-x86_64/tree-view.patch atom/repos/community-x86_64/use-system-apm.patch atom/repos/community-x86_64/use-system-electron.patch --------------------------------------------+ community-i686/PKGBUILD | 149 --------------------------- community-i686/autocomplete-plus.patch | 11 - community-i686/beforeunload.patch | 14 -- community-i686/deprecated-api.patch | 17 --- community-i686/fix-atom-sh.patch | 102 ------------------ community-i686/fix-license-path.patch | 22 --- community-i686/fix-marker-index.patch | 37 ------ community-i686/fix-oniguruma.patch | 13 -- community-i686/run-as-node.patch | 11 - community-i686/tree-view.patch | 11 - community-i686/use-system-apm.patch | 29 ----- community-i686/use-system-electron.patch | 76 ------------- community-x86_64/PKGBUILD | 149 --------------------------- community-x86_64/autocomplete-plus.patch | 11 - community-x86_64/beforeunload.patch | 14 -- community-x86_64/deprecated-api.patch | 17 --- community-x86_64/fix-atom-sh.patch | 102 ------------------ community-x86_64/fix-license-path.patch | 22 --- community-x86_64/fix-marker-index.patch | 37 ------ community-x86_64/fix-oniguruma.patch | 13 -- community-x86_64/run-as-node.patch | 11 - community-x86_64/tree-view.patch | 11 - community-x86_64/use-system-apm.patch | 29 ----- community-x86_64/use-system-electron.patch | 76 ------------- 24 files changed, 984 deletions(-) Deleted: community-i686/PKGBUILD =================================================================== --- community-i686/PKGBUILD 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/PKGBUILD 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,149 +0,0 @@ -# $Id$ -# Maintainer: Nicola Squartini <[email protected]> - -pkgname=atom -pkgver=1.9.8 -pkgrel=3 -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') -makedepends=('git' 'npm') -optdepends=('ctags: symbol indexing support') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"; - 'autocomplete-plus.patch' - 'beforeunload.patch' - 'deprecated-api.patch' - 'fix-atom-sh.patch' - 'fix-license-path.patch' - 'fix-marker-index.patch' - 'fix-oniguruma.patch' - 'run-as-node.patch' - 'symbols-view-use-system-ctags.patch' - 'tree-view.patch' - 'use-system-apm.patch' - 'use-system-electron.patch') -sha256sums=('148c6dc162f51f438fc8385f0b6b6b4f19dc554c13a8edf2ec3826b5c164b466' - '58198d214edc434580c5764f749e26fb686d77c3c983d01f247f48aec84eb1a4' - 'e92e23bbf839bec6611b2ac76c1f5bba35b476983b0faa9b310288e2956247a2' - '6fca91b3e80248a96fc4b6b0228602d4dd68ef851cb059a97a7379e72e53b432' - 'd3eb239f53feb3181fb4d57d2db391d7b31ce2188c5bd5b79d9ed3133351cd90' - 'ffd67934c3f80b87dfe7706191c9afad79289b6640b2876f1439701d6827a759' - '2569702bee0508ee38a181f28bc99d6844725de206362a010705d84da09735c3' - 'c0ae6c64802bc20219bc9142bd6e62e65853044b4a678d3f7ec72dcb61d22274' - '1533581eeede375924a3431fed7e6641a156f765bf252590d73da4259f07343f' - 'a5a2b1fefa29799b3225c4aa3fe0e5b057b2b320f98ad7bc28d3596923e52b41' - '109af01ceae45615994f2ac08292c44db339bf7ef89369b077e04fcfc35aa3dd' - '7771ff6ddf06bedeb37ff47bf98f685cc67585e6f831d2add9a31078383a6fbe' - '23d9d2976ad23f17d7c6e7e09c5de5aceae72a5577f811723bf8c7885b319c05') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - 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 - - # apm with system (updated) nodejs cannot 'require' modules inside asar - sed -e "s/, 'generate-asar'//" -i build/Gruntfile.coffee - - # Fix for Electron 1.2.0 - patch -Np1 -i "${srcdir}"/beforeunload.patch - patch -Np1 -i "${srcdir}"/run-as-node.patch -} - -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 - apm install - - # Use system ctags - cd node_modules/symbols-view - patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch - rm -r vendor - cd ../.. - - # Fix for Node 6 - cd node_modules/autocomplete-plus - patch -Np1 -i "${srcdir}"/autocomplete-plus.patch - cd ../.. - cd node_modules/tree-view - patch -Np1 -i "${srcdir}"/tree-view.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/marker-index - patch -Np1 -i "${srcdir}"/fix-marker-index.patch - ${_node_gyp} - cd ../oniguruma - patch -Np1 -i "${srcdir}"/fix-oniguruma.patch - ${_node_gyp} - cd ../../ - - _packagesToDedupe=('abbrev' - 'amdefine' - 'atom-space-pen-views' - 'cheerio' - 'domelementtype' - 'fs-plus' - 'grim' - 'highlights' - 'humanize-plus' - 'iconv-lite' - 'inherits' - 'loophole' - 'oniguruma' - 'q' - 'request' - 'rimraf' - 'roaster' - 'season' - 'sigmund' - 'semver' - 'through' - 'temp') - apm dedupe ${_packagesToDedupe[@]} - cd build - npm install - cd .. - script/grunt --channel=stable -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -d -m 755 "${pkgdir}"/usr/lib - cp -r out/Atom/resources/app "${pkgdir}"/usr/lib - mv "${pkgdir}"/usr/lib/app "${pkgdir}"/usr/lib/atom - - install -d -m 755 "${pkgdir}/usr/share/applications" - sed -e "s|<%= appName %>|Atom|" \ - -e "s/<%= description %>/${pkgdesc}/" \ - -e "s|<%= installDir %>/share/<%= appFileName %>/atom|electron --app=/usr/lib/atom|" \ - -e "s|<%= iconPath %>|/usr/lib/atom/resources/atom.png|" \ - resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop" - - install -D -m 755 out/Atom/resources/new-app/atom.sh "${pkgdir}/usr/bin/atom" - - install -D -m 644 out/Atom/resources/LICENSE.md \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md" - - # Remove useless stuff - find "${pkgdir}"/usr/lib/atom/node_modules \ - -name "*.a" -exec rm '{}' \; \ - -or -name "*.bat" -exec rm '{}' \; \ - -or -name "benchmark" -prune -exec rm -r '{}' \; \ - -or -name "doc" -prune -exec rm -r '{}' \; \ - -or -name "html" -prune -exec rm -r '{}' \; \ - -or -name "man" -prune -exec rm -r '{}' \; \ - -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \ - -or -path "*/task-lists/src" -prune -exec rm -r '{}' \; -} Deleted: community-i686/autocomplete-plus.patch =================================================================== --- community-i686/autocomplete-plus.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/autocomplete-plus.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -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: community-i686/beforeunload.patch =================================================================== --- community-i686/beforeunload.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/beforeunload.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,14 +0,0 @@ ---- a/src/window-event-handler.coffee -+++ b/src/window-event-handler.coffee -@@ -145,9 +145,8 @@ - @atomEnvironment.storeWindowDimensions() - if confirmed - @atomEnvironment.unloadEditorWindow() -- else -- @applicationDelegate.didCancelWindowUnload() -- -+ return -+ @applicationDelegate.didCancelWindowUnload() - confirmed - - handleWindowUnload: => Deleted: community-i686/deprecated-api.patch =================================================================== --- community-i686/deprecated-api.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/deprecated-api.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,17 +0,0 @@ ---- a/src/browser/atom-window.coffee -+++ b/src/browser/atom-window.coffee -@@ -24,11 +24,11 @@ - options = - show: false - title: 'Atom' -- 'web-preferences': -- 'direct-write': true -+ 'webPreferences': -+ 'directWrite': true - - if @isSpec -- options['web-preferences']['page-visibility'] = true -+ options.webPreferences.backgroundThrottling = false - - # Don't set icon on Windows so the exe's ico will be used as window and - # taskbar's icon. See https://github.com/atom/atom/issues/4811 for more. Deleted: community-i686/fix-atom-sh.patch =================================================================== --- community-i686/fix-atom-sh.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/fix-atom-sh.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,102 +0,0 @@ ---- a/atom.sh -+++ b/atom.sh -@@ -1,20 +1,5 @@ - #!/bin/bash - --if [ "$(uname)" == 'Darwin' ]; then -- OS='Mac' --elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then -- OS='Linux' --else -- echo "Your platform ($(uname -a)) is not supported." -- exit 1 --fi -- --if [ "$(basename $0)" == 'atom-beta' ]; then -- BETA_VERSION=true --else -- BETA_VERSION= --fi -- - while getopts ":wtfvh-:" opt; do - case "$opt" in - -) -@@ -52,66 +37,22 @@ - export ELECTRON_ENABLE_LOGGING=1 - fi - --if [ $OS == 'Mac' ]; then -- if [ -n "$BETA_VERSION" ]; then -- ATOM_APP_NAME="Atom Beta.app" -- else -- ATOM_APP_NAME="Atom.app" -- fi -+ATOM_PATH="electron --app=/usr/lib/atom" - -- if [ -z "${ATOM_PATH}" ]; then -- # If ATOM_PATH isnt set, check /Applications and then ~/Applications for Atom.app -- if [ -x "/Applications/$ATOM_APP_NAME" ]; then -- ATOM_PATH="/Applications" -- elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then -- ATOM_PATH="$HOME/Applications" -- else -- # We havent found an Atom.app, use spotlight to search for Atom -- ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)" -- -- # Exit if Atom can't be found -- if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then -- echo "Cannot locate Atom.app, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing Atom.app." -- exit 1 -- fi -- fi -- fi -+ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" -+mkdir -p "$ATOM_HOME" - -- if [ $EXPECT_OUTPUT ]; then -- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/Atom" --executed-from="$(pwd)" --pid=$$ "$@" -- exit $? -- else -- open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@" -- fi --elif [ $OS == 'Linux' ]; then -- SCRIPT=$(readlink -f "$0") -- USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..) -- -- if [ -n "$BETA_VERSION" ]; then -- ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom" -- else -- ATOM_PATH="$USR_DIRECTORY/share/atom/atom" -- fi -- -- ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" -- mkdir -p "$ATOM_HOME" -- -- : ${TMPDIR:=/tmp} -- -- [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom" -- -- 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 $? -- 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 -+ ) & - fi - - # Exits this process when Atom is used as $EDITOR Deleted: community-i686/fix-license-path.patch =================================================================== --- community-i686/fix-license-path.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/fix-license-path.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,22 +0,0 @@ ---- a/src/main-process/atom-application.coffee -+++ b/src/main-process/atom-application.coffee -@@ -213,7 +213,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') - - app.on 'before-quit', => - @quitting = true ---- a/src/workspace.coffee -+++ b/src/workspace.coffee -@@ -456,7 +456,7 @@ - - # Open Atom's license in the active pane. - openLicense: -> -- @open(path.join(process.resourcesPath, 'LICENSE.md')) -+ @open('/usr/share/licenses/atom/LICENSE.md') - - # Synchronously open the given URI in the active pane. **Only use this method - # in specs. Calling this in production code will block the UI thread and Deleted: community-i686/fix-marker-index.patch =================================================================== --- community-i686/fix-marker-index.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/fix-marker-index.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,37 +0,0 @@ ---- a/src/native/marker-index-wrapper.cc -+++ b/src/native/marker-index-wrapper.cc -@@ -18,20 +18,20 @@ public: - constructorTemplate->SetClassName( - Nan::New<String>("MarkerIndex").ToLocalChecked()); - constructorTemplate->InstanceTemplate()->SetInternalFieldCount(1); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("generateRandomNumber").ToLocalChecked(), Nan::New<FunctionTemplate>(GenerateRandomNumber)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("insert").ToLocalChecked(), Nan::New<FunctionTemplate>(Insert)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("setExclusive").ToLocalChecked(), Nan::New<FunctionTemplate>(SetExclusive)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("delete").ToLocalChecked(), Nan::New<FunctionTemplate>(Delete)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("splice").ToLocalChecked(), Nan::New<FunctionTemplate>(Splice)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getStart").ToLocalChecked(), Nan::New<FunctionTemplate>(GetStart)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getEnd").ToLocalChecked(), Nan::New<FunctionTemplate>(GetEnd)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("compare").ToLocalChecked(), Nan::New<FunctionTemplate>(Compare)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findIntersecting").ToLocalChecked(), Nan::New<FunctionTemplate>(FindIntersecting)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContaining").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContaining)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContainedIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContainedIn)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findStartingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindStartingIn)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findEndingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindEndingIn)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("dump").ToLocalChecked(), Nan::New<FunctionTemplate>(Dump)->GetFunction()); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("generateRandomNumber").ToLocalChecked(), Nan::New<FunctionTemplate>(GenerateRandomNumber)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("insert").ToLocalChecked(), Nan::New<FunctionTemplate>(Insert)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("setExclusive").ToLocalChecked(), Nan::New<FunctionTemplate>(SetExclusive)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("delete").ToLocalChecked(), Nan::New<FunctionTemplate>(Delete)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("splice").ToLocalChecked(), Nan::New<FunctionTemplate>(Splice)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getStart").ToLocalChecked(), Nan::New<FunctionTemplate>(GetStart)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getEnd").ToLocalChecked(), Nan::New<FunctionTemplate>(GetEnd)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("compare").ToLocalChecked(), Nan::New<FunctionTemplate>(Compare)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findIntersecting").ToLocalChecked(), Nan::New<FunctionTemplate>(FindIntersecting)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContaining").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContaining)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContainedIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContainedIn)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findStartingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindStartingIn)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findEndingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindEndingIn)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("dump").ToLocalChecked(), Nan::New<FunctionTemplate>(Dump)); - - // assign Number.isFinite for use from C++ - Local<String> number_string = Nan::New("Number").ToLocalChecked(); Deleted: community-i686/fix-oniguruma.patch =================================================================== --- community-i686/fix-oniguruma.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/fix-oniguruma.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -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: community-i686/run-as-node.patch =================================================================== --- community-i686/run-as-node.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/run-as-node.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,11 +0,0 @@ ---- a/exports/atom.coffee -+++ b/exports/atom.coffee -@@ -20,7 +20,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 --unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE -+unless process.env.ELECTRON_RUN_AS_NODE - module.exports.Task = require '../src/task' - - TextEditor = (params) -> Deleted: community-i686/tree-view.patch =================================================================== --- community-i686/tree-view.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/tree-view.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,11 +0,0 @@ ---- a/lib/main.coffee -+++ b/lib/main.coffee -@@ -54,7 +54,7 @@ - projectPath = atom.project.getPaths()[0] - if atom.workspace.getActivePaneItem() - false -- else if path.basename(projectPath) is '.git' -+ else if projectPath and path.basename(projectPath) is '.git' - # Only attach when the project path matches the path to open signifying - # the .git folder was opened explicitly and not by using Atom as the Git - # editor. Deleted: community-i686/use-system-apm.patch =================================================================== --- community-i686/use-system-apm.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/use-system-apm.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,29 +0,0 @@ ---- a/build/tasks/build-task.coffee -+++ b/build/tasks/build-task.coffee -@@ -155,10 +155,6 @@ - cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/ - cp 'static', path.join(appDir, 'static') - -- cp path.join('apm', 'node_modules', 'atom-package-manager'), path.resolve(appDir, '..', 'new-app', 'apm'), filter: filterNodeModule -- if process.platform isnt 'win32' -- fs.symlinkSync(path.join('..', '..', 'bin', 'apm'), path.resolve(appDir, '..', 'new-app', 'apm', 'node_modules', '.bin', 'apm')) -- - channel = grunt.config.get('atom.channel') - - cp path.join('resources', 'app-icons', channel, 'png', '1024.png'), path.join(appDir, 'resources', 'atom.png') ---- a/src/package-manager.coffee -+++ b/src/package-manager.coffee -@@ -136,12 +136,7 @@ - return configPath if configPath - return @apmPath if @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 - - # Public: Get the paths being used to look for packages. Deleted: community-i686/use-system-electron.patch =================================================================== --- community-i686/use-system-electron.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-i686/use-system-electron.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,76 +0,0 @@ ---- a/build/Gruntfile.coffee -+++ b/build/Gruntfile.coffee -@@ -302,7 +302,7 @@ - - grunt.registerTask('ci', ciTasks) - -- defaultTasks = ['download-electron', 'download-electron-chromedriver', 'build', 'set-version', 'generate-asar'] -+ defaultTasks = ['build', 'set-version', 'generate-asar'] - unless process.platform is 'linux' or grunt.option('no-install') - defaultTasks.push 'install' - grunt.registerTask('default', defaultTasks) ---- a/build/tasks/build-task.coffee -+++ b/build/tasks/build-task.coffee -@@ -14,19 +14,6 @@ - rm path.join(buildDir, 'installer') - mkdir path.dirname(buildDir) - -- if process.platform is 'darwin' -- cp 'electron/Electron.app', shellAppDir, filter: /default_app/ -- fs.renameSync path.join(shellAppDir, 'Contents', 'MacOS', 'Electron'), path.join(shellAppDir, 'Contents', 'MacOS', 'Atom') -- fs.renameSync path.join(shellAppDir, 'Contents', 'Frameworks', 'Electron Helper.app'), path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app') -- fs.renameSync path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Electron Helper'), path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Atom Helper') -- else -- cp 'electron', shellAppDir, filter: /default_app/ -- -- if process.platform is 'win32' -- fs.renameSync path.join(shellAppDir, 'electron.exe'), path.join(shellAppDir, 'atom.exe') -- else -- fs.renameSync path.join(shellAppDir, 'electron'), path.join(shellAppDir, 'atom') -- - mkdir appDir - - if process.platform isnt 'win32' ---- a/package.json -+++ b/package.json -@@ -12,7 +12,6 @@ - "url": "https://github.com/atom/atom/issues"; - }, - "license": "MIT", -- "electronVersion": "0.37.8", - "dependencies": { - "async": "0.2.6", - "atom-keymap": "6.3.2", ---- a/src/module-cache.coffee -+++ b/src/module-cache.coffee -@@ -194,7 +194,7 @@ - return - - registerBuiltins = (devMode) -> -- if devMode or not cache.resourcePath.startsWith("#{process.resourcesPath}#{path.sep}") -+ if devMode or not cache.resourcePath.startsWith("/usr/lib/atom") - fs = require 'fs-plus' - atomCoffeePath = path.join(cache.resourcePath, 'exports', 'atom.coffee') - cache.builtins.atom = atomCoffeePath if fs.isFileSync(atomCoffeePath) ---- a/src/package-manager.coffee -+++ b/src/package-manager.coffee -@@ -526,7 +526,7 @@ - - isBundledPackagePath: (packagePath) -> - if @devMode -- return false unless @resourcePath.startsWith("#{process.resourcesPath}#{path.sep}") -+ return false unless @resourcePath.startsWith("/usr/lib/atom") - - @resourcePathWithTrailingSlash ?= "#{@resourcePath}#{path.sep}" - packagePath?.startsWith(@resourcePathWithTrailingSlash) ---- a/static/index.js -+++ b/static/index.js -@@ -29,7 +29,7 @@ - throw loadSettingsError - } - -- var devMode = loadSettings.devMode || !loadSettings.resourcePath.startsWith(process.resourcesPath + path.sep) -+ var devMode = loadSettings.devMode || !loadSettings.resourcePath.startsWith('/usr/lib/atom') - - if (devMode) { - setupDeprecatedPackages() Deleted: community-x86_64/PKGBUILD =================================================================== --- community-x86_64/PKGBUILD 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/PKGBUILD 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,149 +0,0 @@ -# $Id$ -# Maintainer: Nicola Squartini <[email protected]> - -pkgname=atom -pkgver=1.9.8 -pkgrel=3 -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') -makedepends=('git' 'npm') -optdepends=('ctags: symbol indexing support') -source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"; - 'autocomplete-plus.patch' - 'beforeunload.patch' - 'deprecated-api.patch' - 'fix-atom-sh.patch' - 'fix-license-path.patch' - 'fix-marker-index.patch' - 'fix-oniguruma.patch' - 'run-as-node.patch' - 'symbols-view-use-system-ctags.patch' - 'tree-view.patch' - 'use-system-apm.patch' - 'use-system-electron.patch') -sha256sums=('148c6dc162f51f438fc8385f0b6b6b4f19dc554c13a8edf2ec3826b5c164b466' - '58198d214edc434580c5764f749e26fb686d77c3c983d01f247f48aec84eb1a4' - 'e92e23bbf839bec6611b2ac76c1f5bba35b476983b0faa9b310288e2956247a2' - '6fca91b3e80248a96fc4b6b0228602d4dd68ef851cb059a97a7379e72e53b432' - 'd3eb239f53feb3181fb4d57d2db391d7b31ce2188c5bd5b79d9ed3133351cd90' - 'ffd67934c3f80b87dfe7706191c9afad79289b6640b2876f1439701d6827a759' - '2569702bee0508ee38a181f28bc99d6844725de206362a010705d84da09735c3' - 'c0ae6c64802bc20219bc9142bd6e62e65853044b4a678d3f7ec72dcb61d22274' - '1533581eeede375924a3431fed7e6641a156f765bf252590d73da4259f07343f' - 'a5a2b1fefa29799b3225c4aa3fe0e5b057b2b320f98ad7bc28d3596923e52b41' - '109af01ceae45615994f2ac08292c44db339bf7ef89369b077e04fcfc35aa3dd' - '7771ff6ddf06bedeb37ff47bf98f685cc67585e6f831d2add9a31078383a6fbe' - '23d9d2976ad23f17d7c6e7e09c5de5aceae72a5577f811723bf8c7885b319c05') - -prepare() { - cd "${srcdir}/${pkgname}-${pkgver}" - - 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 - - # apm with system (updated) nodejs cannot 'require' modules inside asar - sed -e "s/, 'generate-asar'//" -i build/Gruntfile.coffee - - # Fix for Electron 1.2.0 - patch -Np1 -i "${srcdir}"/beforeunload.patch - patch -Np1 -i "${srcdir}"/run-as-node.patch -} - -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 - apm install - - # Use system ctags - cd node_modules/symbols-view - patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch - rm -r vendor - cd ../.. - - # Fix for Node 6 - cd node_modules/autocomplete-plus - patch -Np1 -i "${srcdir}"/autocomplete-plus.patch - cd ../.. - cd node_modules/tree-view - patch -Np1 -i "${srcdir}"/tree-view.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/marker-index - patch -Np1 -i "${srcdir}"/fix-marker-index.patch - ${_node_gyp} - cd ../oniguruma - patch -Np1 -i "${srcdir}"/fix-oniguruma.patch - ${_node_gyp} - cd ../../ - - _packagesToDedupe=('abbrev' - 'amdefine' - 'atom-space-pen-views' - 'cheerio' - 'domelementtype' - 'fs-plus' - 'grim' - 'highlights' - 'humanize-plus' - 'iconv-lite' - 'inherits' - 'loophole' - 'oniguruma' - 'q' - 'request' - 'rimraf' - 'roaster' - 'season' - 'sigmund' - 'semver' - 'through' - 'temp') - apm dedupe ${_packagesToDedupe[@]} - cd build - npm install - cd .. - script/grunt --channel=stable -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - install -d -m 755 "${pkgdir}"/usr/lib - cp -r out/Atom/resources/app "${pkgdir}"/usr/lib - mv "${pkgdir}"/usr/lib/app "${pkgdir}"/usr/lib/atom - - install -d -m 755 "${pkgdir}/usr/share/applications" - sed -e "s|<%= appName %>|Atom|" \ - -e "s/<%= description %>/${pkgdesc}/" \ - -e "s|<%= installDir %>/share/<%= appFileName %>/atom|electron --app=/usr/lib/atom|" \ - -e "s|<%= iconPath %>|/usr/lib/atom/resources/atom.png|" \ - resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop" - - install -D -m 755 out/Atom/resources/new-app/atom.sh "${pkgdir}/usr/bin/atom" - - install -D -m 644 out/Atom/resources/LICENSE.md \ - "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE.md" - - # Remove useless stuff - find "${pkgdir}"/usr/lib/atom/node_modules \ - -name "*.a" -exec rm '{}' \; \ - -or -name "*.bat" -exec rm '{}' \; \ - -or -name "benchmark" -prune -exec rm -r '{}' \; \ - -or -name "doc" -prune -exec rm -r '{}' \; \ - -or -name "html" -prune -exec rm -r '{}' \; \ - -or -name "man" -prune -exec rm -r '{}' \; \ - -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \ - -or -path "*/task-lists/src" -prune -exec rm -r '{}' \; -} Deleted: community-x86_64/autocomplete-plus.patch =================================================================== --- community-x86_64/autocomplete-plus.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/autocomplete-plus.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -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: community-x86_64/beforeunload.patch =================================================================== --- community-x86_64/beforeunload.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/beforeunload.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,14 +0,0 @@ ---- a/src/window-event-handler.coffee -+++ b/src/window-event-handler.coffee -@@ -145,9 +145,8 @@ - @atomEnvironment.storeWindowDimensions() - if confirmed - @atomEnvironment.unloadEditorWindow() -- else -- @applicationDelegate.didCancelWindowUnload() -- -+ return -+ @applicationDelegate.didCancelWindowUnload() - confirmed - - handleWindowUnload: => Deleted: community-x86_64/deprecated-api.patch =================================================================== --- community-x86_64/deprecated-api.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/deprecated-api.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,17 +0,0 @@ ---- a/src/browser/atom-window.coffee -+++ b/src/browser/atom-window.coffee -@@ -24,11 +24,11 @@ - options = - show: false - title: 'Atom' -- 'web-preferences': -- 'direct-write': true -+ 'webPreferences': -+ 'directWrite': true - - if @isSpec -- options['web-preferences']['page-visibility'] = true -+ options.webPreferences.backgroundThrottling = false - - # Don't set icon on Windows so the exe's ico will be used as window and - # taskbar's icon. See https://github.com/atom/atom/issues/4811 for more. Deleted: community-x86_64/fix-atom-sh.patch =================================================================== --- community-x86_64/fix-atom-sh.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/fix-atom-sh.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,102 +0,0 @@ ---- a/atom.sh -+++ b/atom.sh -@@ -1,20 +1,5 @@ - #!/bin/bash - --if [ "$(uname)" == 'Darwin' ]; then -- OS='Mac' --elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then -- OS='Linux' --else -- echo "Your platform ($(uname -a)) is not supported." -- exit 1 --fi -- --if [ "$(basename $0)" == 'atom-beta' ]; then -- BETA_VERSION=true --else -- BETA_VERSION= --fi -- - while getopts ":wtfvh-:" opt; do - case "$opt" in - -) -@@ -52,66 +37,22 @@ - export ELECTRON_ENABLE_LOGGING=1 - fi - --if [ $OS == 'Mac' ]; then -- if [ -n "$BETA_VERSION" ]; then -- ATOM_APP_NAME="Atom Beta.app" -- else -- ATOM_APP_NAME="Atom.app" -- fi -+ATOM_PATH="electron --app=/usr/lib/atom" - -- if [ -z "${ATOM_PATH}" ]; then -- # If ATOM_PATH isnt set, check /Applications and then ~/Applications for Atom.app -- if [ -x "/Applications/$ATOM_APP_NAME" ]; then -- ATOM_PATH="/Applications" -- elif [ -x "$HOME/Applications/$ATOM_APP_NAME" ]; then -- ATOM_PATH="$HOME/Applications" -- else -- # We havent found an Atom.app, use spotlight to search for Atom -- ATOM_PATH="$(mdfind "kMDItemCFBundleIdentifier == 'com.github.atom'" | grep -v ShipIt | head -1 | xargs -0 dirname)" -- -- # Exit if Atom can't be found -- if [ ! -x "$ATOM_PATH/$ATOM_APP_NAME" ]; then -- echo "Cannot locate Atom.app, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing Atom.app." -- exit 1 -- fi -- fi -- fi -+ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" -+mkdir -p "$ATOM_HOME" - -- if [ $EXPECT_OUTPUT ]; then -- "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/Atom" --executed-from="$(pwd)" --pid=$$ "$@" -- exit $? -- else -- open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@" -- fi --elif [ $OS == 'Linux' ]; then -- SCRIPT=$(readlink -f "$0") -- USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..) -- -- if [ -n "$BETA_VERSION" ]; then -- ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom" -- else -- ATOM_PATH="$USR_DIRECTORY/share/atom/atom" -- fi -- -- ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" -- mkdir -p "$ATOM_HOME" -- -- : ${TMPDIR:=/tmp} -- -- [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom" -- -- 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 $? -- 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 -+ ) & - fi - - # Exits this process when Atom is used as $EDITOR Deleted: community-x86_64/fix-license-path.patch =================================================================== --- community-x86_64/fix-license-path.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/fix-license-path.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,22 +0,0 @@ ---- a/src/main-process/atom-application.coffee -+++ b/src/main-process/atom-application.coffee -@@ -213,7 +213,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') - - app.on 'before-quit', => - @quitting = true ---- a/src/workspace.coffee -+++ b/src/workspace.coffee -@@ -456,7 +456,7 @@ - - # Open Atom's license in the active pane. - openLicense: -> -- @open(path.join(process.resourcesPath, 'LICENSE.md')) -+ @open('/usr/share/licenses/atom/LICENSE.md') - - # Synchronously open the given URI in the active pane. **Only use this method - # in specs. Calling this in production code will block the UI thread and Deleted: community-x86_64/fix-marker-index.patch =================================================================== --- community-x86_64/fix-marker-index.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/fix-marker-index.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,37 +0,0 @@ ---- a/src/native/marker-index-wrapper.cc -+++ b/src/native/marker-index-wrapper.cc -@@ -18,20 +18,20 @@ public: - constructorTemplate->SetClassName( - Nan::New<String>("MarkerIndex").ToLocalChecked()); - constructorTemplate->InstanceTemplate()->SetInternalFieldCount(1); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("generateRandomNumber").ToLocalChecked(), Nan::New<FunctionTemplate>(GenerateRandomNumber)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("insert").ToLocalChecked(), Nan::New<FunctionTemplate>(Insert)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("setExclusive").ToLocalChecked(), Nan::New<FunctionTemplate>(SetExclusive)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("delete").ToLocalChecked(), Nan::New<FunctionTemplate>(Delete)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("splice").ToLocalChecked(), Nan::New<FunctionTemplate>(Splice)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getStart").ToLocalChecked(), Nan::New<FunctionTemplate>(GetStart)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getEnd").ToLocalChecked(), Nan::New<FunctionTemplate>(GetEnd)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("compare").ToLocalChecked(), Nan::New<FunctionTemplate>(Compare)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findIntersecting").ToLocalChecked(), Nan::New<FunctionTemplate>(FindIntersecting)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContaining").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContaining)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContainedIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContainedIn)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findStartingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindStartingIn)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findEndingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindEndingIn)->GetFunction()); -- constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("dump").ToLocalChecked(), Nan::New<FunctionTemplate>(Dump)->GetFunction()); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("generateRandomNumber").ToLocalChecked(), Nan::New<FunctionTemplate>(GenerateRandomNumber)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("insert").ToLocalChecked(), Nan::New<FunctionTemplate>(Insert)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("setExclusive").ToLocalChecked(), Nan::New<FunctionTemplate>(SetExclusive)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("delete").ToLocalChecked(), Nan::New<FunctionTemplate>(Delete)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("splice").ToLocalChecked(), Nan::New<FunctionTemplate>(Splice)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getStart").ToLocalChecked(), Nan::New<FunctionTemplate>(GetStart)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("getEnd").ToLocalChecked(), Nan::New<FunctionTemplate>(GetEnd)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("compare").ToLocalChecked(), Nan::New<FunctionTemplate>(Compare)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findIntersecting").ToLocalChecked(), Nan::New<FunctionTemplate>(FindIntersecting)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContaining").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContaining)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findContainedIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindContainedIn)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findStartingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindStartingIn)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("findEndingIn").ToLocalChecked(), Nan::New<FunctionTemplate>(FindEndingIn)); -+ constructorTemplate->PrototypeTemplate()->Set(Nan::New<String>("dump").ToLocalChecked(), Nan::New<FunctionTemplate>(Dump)); - - // assign Number.isFinite for use from C++ - Local<String> number_string = Nan::New("Number").ToLocalChecked(); Deleted: community-x86_64/fix-oniguruma.patch =================================================================== --- community-x86_64/fix-oniguruma.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/fix-oniguruma.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -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: community-x86_64/run-as-node.patch =================================================================== --- community-x86_64/run-as-node.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/run-as-node.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,11 +0,0 @@ ---- a/exports/atom.coffee -+++ b/exports/atom.coffee -@@ -20,7 +20,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 --unless process.env.ATOM_SHELL_INTERNAL_RUN_AS_NODE -+unless process.env.ELECTRON_RUN_AS_NODE - module.exports.Task = require '../src/task' - - TextEditor = (params) -> Deleted: community-x86_64/tree-view.patch =================================================================== --- community-x86_64/tree-view.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/tree-view.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,11 +0,0 @@ ---- a/lib/main.coffee -+++ b/lib/main.coffee -@@ -54,7 +54,7 @@ - projectPath = atom.project.getPaths()[0] - if atom.workspace.getActivePaneItem() - false -- else if path.basename(projectPath) is '.git' -+ else if projectPath and path.basename(projectPath) is '.git' - # Only attach when the project path matches the path to open signifying - # the .git folder was opened explicitly and not by using Atom as the Git - # editor. Deleted: community-x86_64/use-system-apm.patch =================================================================== --- community-x86_64/use-system-apm.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/use-system-apm.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,29 +0,0 @@ ---- a/build/tasks/build-task.coffee -+++ b/build/tasks/build-task.coffee -@@ -155,10 +155,6 @@ - cp 'src', path.join(appDir, 'src'), filter: /.+\.(cson|coffee)$/ - cp 'static', path.join(appDir, 'static') - -- cp path.join('apm', 'node_modules', 'atom-package-manager'), path.resolve(appDir, '..', 'new-app', 'apm'), filter: filterNodeModule -- if process.platform isnt 'win32' -- fs.symlinkSync(path.join('..', '..', 'bin', 'apm'), path.resolve(appDir, '..', 'new-app', 'apm', 'node_modules', '.bin', 'apm')) -- - channel = grunt.config.get('atom.channel') - - cp path.join('resources', 'app-icons', channel, 'png', '1024.png'), path.join(appDir, 'resources', 'atom.png') ---- a/src/package-manager.coffee -+++ b/src/package-manager.coffee -@@ -136,12 +136,7 @@ - return configPath if configPath - return @apmPath if @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 - - # Public: Get the paths being used to look for packages. Deleted: community-x86_64/use-system-electron.patch =================================================================== --- community-x86_64/use-system-electron.patch 2016-08-19 02:55:42 UTC (rev 186985) +++ community-x86_64/use-system-electron.patch 2016-08-19 02:58:58 UTC (rev 186986) @@ -1,76 +0,0 @@ ---- a/build/Gruntfile.coffee -+++ b/build/Gruntfile.coffee -@@ -302,7 +302,7 @@ - - grunt.registerTask('ci', ciTasks) - -- defaultTasks = ['download-electron', 'download-electron-chromedriver', 'build', 'set-version', 'generate-asar'] -+ defaultTasks = ['build', 'set-version', 'generate-asar'] - unless process.platform is 'linux' or grunt.option('no-install') - defaultTasks.push 'install' - grunt.registerTask('default', defaultTasks) ---- a/build/tasks/build-task.coffee -+++ b/build/tasks/build-task.coffee -@@ -14,19 +14,6 @@ - rm path.join(buildDir, 'installer') - mkdir path.dirname(buildDir) - -- if process.platform is 'darwin' -- cp 'electron/Electron.app', shellAppDir, filter: /default_app/ -- fs.renameSync path.join(shellAppDir, 'Contents', 'MacOS', 'Electron'), path.join(shellAppDir, 'Contents', 'MacOS', 'Atom') -- fs.renameSync path.join(shellAppDir, 'Contents', 'Frameworks', 'Electron Helper.app'), path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app') -- fs.renameSync path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Electron Helper'), path.join(shellAppDir, 'Contents', 'Frameworks', 'Atom Helper.app', 'Contents', 'MacOS', 'Atom Helper') -- else -- cp 'electron', shellAppDir, filter: /default_app/ -- -- if process.platform is 'win32' -- fs.renameSync path.join(shellAppDir, 'electron.exe'), path.join(shellAppDir, 'atom.exe') -- else -- fs.renameSync path.join(shellAppDir, 'electron'), path.join(shellAppDir, 'atom') -- - mkdir appDir - - if process.platform isnt 'win32' ---- a/package.json -+++ b/package.json -@@ -12,7 +12,6 @@ - "url": "https://github.com/atom/atom/issues"; - }, - "license": "MIT", -- "electronVersion": "0.37.8", - "dependencies": { - "async": "0.2.6", - "atom-keymap": "6.3.2", ---- a/src/module-cache.coffee -+++ b/src/module-cache.coffee -@@ -194,7 +194,7 @@ - return - - registerBuiltins = (devMode) -> -- if devMode or not cache.resourcePath.startsWith("#{process.resourcesPath}#{path.sep}") -+ if devMode or not cache.resourcePath.startsWith("/usr/lib/atom") - fs = require 'fs-plus' - atomCoffeePath = path.join(cache.resourcePath, 'exports', 'atom.coffee') - cache.builtins.atom = atomCoffeePath if fs.isFileSync(atomCoffeePath) ---- a/src/package-manager.coffee -+++ b/src/package-manager.coffee -@@ -526,7 +526,7 @@ - - isBundledPackagePath: (packagePath) -> - if @devMode -- return false unless @resourcePath.startsWith("#{process.resourcesPath}#{path.sep}") -+ return false unless @resourcePath.startsWith("/usr/lib/atom") - - @resourcePathWithTrailingSlash ?= "#{@resourcePath}#{path.sep}" - packagePath?.startsWith(@resourcePathWithTrailingSlash) ---- a/static/index.js -+++ b/static/index.js -@@ -29,7 +29,7 @@ - throw loadSettingsError - } - -- var devMode = loadSettings.devMode || !loadSettings.resourcePath.startsWith(process.resourcesPath + path.sep) -+ var devMode = loadSettings.devMode || !loadSettings.resourcePath.startsWith('/usr/lib/atom') - - if (devMode) { - setupDeprecatedPackages()
