[arch-commits] Commit in atom/repos (32 files)

Nicola Squartini tensor5 at archlinux.org
Fri Feb 10 11:20:29 UTC 2017


    Date: Friday, February 10, 2017 @ 11:20:28
  Author: tensor5
Revision: 211732

archrelease: copy trunk to community-i686, community-x86_64

Added:
  atom/repos/community-i686/PKGBUILD
    (from rev 211731, atom/trunk/PKGBUILD)
  atom/repos/community-i686/fix-atom-sh.patch
    (from rev 211731, atom/trunk/fix-atom-sh.patch)
  atom/repos/community-i686/fix-ime-events-handler.patch
    (from rev 211731, atom/trunk/fix-ime-events-handler.patch)
  atom/repos/community-i686/fix-license-path.patch
    (from rev 211731, atom/trunk/fix-license-path.patch)
  atom/repos/community-i686/fix-restart.patch
    (from rev 211731, atom/trunk/fix-restart.patch)
  atom/repos/community-i686/symbols-view-use-system-ctags.patch
    (from rev 211731, atom/trunk/symbols-view-use-system-ctags.patch)
  atom/repos/community-i686/use-system-apm.patch
    (from rev 211731, atom/trunk/use-system-apm.patch)
  atom/repos/community-i686/use-system-electron.patch
    (from rev 211731, atom/trunk/use-system-electron.patch)
  atom/repos/community-x86_64/PKGBUILD
    (from rev 211731, atom/trunk/PKGBUILD)
  atom/repos/community-x86_64/fix-atom-sh.patch
    (from rev 211731, atom/trunk/fix-atom-sh.patch)
  atom/repos/community-x86_64/fix-ime-events-handler.patch
    (from rev 211731, atom/trunk/fix-ime-events-handler.patch)
  atom/repos/community-x86_64/fix-license-path.patch
    (from rev 211731, atom/trunk/fix-license-path.patch)
  atom/repos/community-x86_64/fix-restart.patch
    (from rev 211731, atom/trunk/fix-restart.patch)
  atom/repos/community-x86_64/symbols-view-use-system-ctags.patch
    (from rev 211731, atom/trunk/symbols-view-use-system-ctags.patch)
  atom/repos/community-x86_64/use-system-apm.patch
    (from rev 211731, atom/trunk/use-system-apm.patch)
  atom/repos/community-x86_64/use-system-electron.patch
    (from rev 211731, atom/trunk/use-system-electron.patch)
Deleted:
  atom/repos/community-i686/PKGBUILD
  atom/repos/community-i686/fix-atom-sh.patch
  atom/repos/community-i686/fix-ime-events-handler.patch
  atom/repos/community-i686/fix-license-path.patch
  atom/repos/community-i686/fix-restart.patch
  atom/repos/community-i686/symbols-view-use-system-ctags.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/fix-atom-sh.patch
  atom/repos/community-x86_64/fix-ime-events-handler.patch
  atom/repos/community-x86_64/fix-license-path.patch
  atom/repos/community-x86_64/fix-restart.patch
  atom/repos/community-x86_64/symbols-view-use-system-ctags.patch
  atom/repos/community-x86_64/use-system-apm.patch
  atom/repos/community-x86_64/use-system-electron.patch

------------------------------------------------------+
 /PKGBUILD                                            |  206 +++++++++++++
 /fix-atom-sh.patch                                   |  230 +++++++++++++++
 /fix-ime-events-handler.patch                        |   94 ++++++
 /fix-license-path.patch                              |   44 ++
 /fix-restart.patch                                   |   22 +
 /symbols-view-use-system-ctags.patch                 |   22 +
 /use-system-apm.patch                                |   32 ++
 /use-system-electron.patch                           |  258 +++++++++++++++++
 community-i686/PKGBUILD                              |  103 ------
 community-i686/fix-atom-sh.patch                     |  104 ------
 community-i686/fix-ime-events-handler.patch          |   47 ---
 community-i686/fix-license-path.patch                |   22 -
 community-i686/fix-restart.patch                     |   11 
 community-i686/symbols-view-use-system-ctags.patch   |   11 
 community-i686/use-system-apm.patch                  |   16 -
 community-i686/use-system-electron.patch             |  113 -------
 community-x86_64/PKGBUILD                            |  103 ------
 community-x86_64/fix-atom-sh.patch                   |  104 ------
 community-x86_64/fix-ime-events-handler.patch        |   47 ---
 community-x86_64/fix-license-path.patch              |   22 -
 community-x86_64/fix-restart.patch                   |   11 
 community-x86_64/symbols-view-use-system-ctags.patch |   11 
 community-x86_64/use-system-apm.patch                |   16 -
 community-x86_64/use-system-electron.patch           |  113 -------
 24 files changed, 908 insertions(+), 854 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-i686/PKGBUILD	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,103 +0,0 @@
-# $Id$
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=atom
-pkgver=1.13.1
-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' 'libxkbfile')
-makedepends=('git' 'npm')
-optdepends=('ctags: symbol indexing support')
-replaces=('atom-editor')
-options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
-        'fix-atom-sh.patch'
-        'fix-ime-events-handler.patch'
-        'fix-license-path.patch'
-        'fix-restart.patch'
-        'symbols-view-use-system-ctags.patch'
-        'use-system-apm.patch'
-        'use-system-electron.patch')
-sha256sums=('4293bdde0ae4c6a78ebcbd46c797653db5b9e3075a82e3960ea9c7ed647e1233'
-            '73efe3485c9f009b788afdfa688a93a1db15ab0010203c833940406cb852240e'
-            'ab638bb8ef2b27f24433738299b9714a53ebabdecf7b01e8d9df6a9ecee77ec2'
-            '7f56269c3b0679dc6ec118e27348e238ce492d4c766cb3813708c981a0692fa1'
-            'e85051d4f435791c4bd898958304c3ee082d434228a68246a65d43479684c8cb'
-            'a5a2b1fefa29799b3225c4aa3fe0e5b057b2b320f98ad7bc28d3596923e52b41'
-            '822e1629ff754af3225bc3c1c9301b4459a67c79e016fd57cc122644d571e24b'
-            '68430695ef866e87d2ae469e0677d3cd5256fe2dba58f750046aa8ec674c67ab')
-
-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
-  patch -Np1 -i "${srcdir}"/fix-restart.patch
-
-  # Fix for Electron 1.4.0
-  patch -Np1 -i "${srcdir}"/fix-ime-events-handler.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 ../..
-
-  cd script
-  npm install
-  ./build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -d -m 755 "${pkgdir}"/usr/lib
-  cp -r out/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 %>|atom|" \
-      resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
-
-  for size in 16 24 32 48 64 128 256 512 1024; do
-    install -D -m 644 resources/app-icons/stable/png/${size}.png \
-            "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/atom.png
-  done
-  ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
-      "${pkgdir}"/usr/lib/atom/resources/atom.png
-
-  install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
-
-  install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  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 '{}' \; \
-      -or -name "*.node" -exec chmod a-x '{}' \; \
-      -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 '{}' \;
-}

Copied: atom/repos/community-i686/PKGBUILD (from rev 211731, atom/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=atom
+pkgver=1.14.1
+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' 'libxkbfile')
+makedepends=('git' 'npm')
+optdepends=('ctags: symbol indexing support')
+replaces=('atom-editor')
+options=(!emptydirs)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
+        'fix-atom-sh.patch'
+        'fix-ime-events-handler.patch'
+        'fix-license-path.patch'
+        'fix-restart.patch'
+        'symbols-view-use-system-ctags.patch'
+        'use-system-apm.patch'
+        'use-system-electron.patch')
+sha256sums=('1d4d180f31989473e4b408eaed115d420fa157c0c8c771ea943860be03afa671'
+            '2148436adf17ec1970adc344fccf3782645375cd93e62a696a55f5b11fe98032'
+            'ab638bb8ef2b27f24433738299b9714a53ebabdecf7b01e8d9df6a9ecee77ec2'
+            '7f56269c3b0679dc6ec118e27348e238ce492d4c766cb3813708c981a0692fa1'
+            '99a4a93c42c357fa1a913bc8b2e5db0178e1a1030916ec768a3a37709ad81c97'
+            '6edb3c1ba5f32e9ec4b5743911e69212af498aa4e64d7be96579dcb40ebc6204'
+            '822e1629ff754af3225bc3c1c9301b4459a67c79e016fd57cc122644d571e24b'
+            '76f3173142d69182de7251c8b2f503347489b9584abcd89d966b93fb0ebb0eb7')
+
+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
+  patch -Np1 -i "${srcdir}"/fix-restart.patch
+
+  # Fix for Electron 1.4.0
+  patch -Np1 -i "${srcdir}"/fix-ime-events-handler.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 ../..
+
+  cd script
+  npm install
+  ./build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -d -m 755 "${pkgdir}"/usr/lib
+  cp -r out/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 %>|atom|" \
+      resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
+
+  for size in 16 24 32 48 64 128 256 512 1024; do
+    install -D -m 644 resources/app-icons/stable/png/${size}.png \
+            "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/atom.png
+  done
+  ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
+      "${pkgdir}"/usr/lib/atom/resources/atom.png
+
+  install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
+
+  install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  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 '{}' \; \
+      -or -name "*.node" -exec chmod a-x '{}' \; \
+      -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/fix-atom-sh.patch
===================================================================
--- community-i686/fix-atom-sh.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-i686/fix-atom-sh.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,104 +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
--
- export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
- 
- while getopts ":wtfvh-:" opt; do
-@@ -54,68 +39,22 @@
-   export ELECTRON_ENABLE_LOGGING=1
- fi
- 
--if [ $OS == 'Mac' ]; then
--  if [ -n "$BETA_VERSION" ]; then
--    ATOM_APP_NAME="Atom Beta.app"
--    ATOM_EXECUTABLE_NAME="Atom Beta"
--  else
--    ATOM_APP_NAME="Atom.app"
--    ATOM_EXECUTABLE_NAME="Atom"
--  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_EXECUTABLE_NAME" --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

Copied: atom/repos/community-i686/fix-atom-sh.patch (from rev 211731, atom/trunk/fix-atom-sh.patch)
===================================================================
--- community-i686/fix-atom-sh.patch	                        (rev 0)
+++ community-i686/fix-atom-sh.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,115 @@
+--- 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
+-
+ export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
+ 
+ while getopts ":wtfvh-:" opt; do
+@@ -54,79 +39,22 @@
+   export ELECTRON_ENABLE_LOGGING=1
+ fi
+ 
+-if [ $OS == 'Mac' ]; then
+-  if [ -L "$0" ]; then
+-    SCRIPT="$(readlink "$0")"
+-  else
+-    SCRIPT="$0"
+-  fi
+-  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
+-  if [ "$ATOM_APP" == . ]; then
+-    unset ATOM_APP
+-  else
+-    ATOM_PATH="$(dirname "$ATOM_APP")"
+-    ATOM_APP_NAME="$(basename "$ATOM_APP")"
+-  fi
+-
+-  if [ -n "$BETA_VERSION" ]; then
+-    ATOM_EXECUTABLE_NAME="Atom Beta"
+-  else
+-    ATOM_EXECUTABLE_NAME="Atom"
+-  fi
+-
+-  if [ -z "${ATOM_PATH}" ]; then
+-    # If ATOM_PATH isn't 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 haven't 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_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
+-        exit 1
+-      fi
+-    fi
+-  fi
+-
+-  if [ $EXPECT_OUTPUT ]; then
+-    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --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}
++ATOM_PATH="electron --app=/usr/lib/atom"
+ 
+-  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
++ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
++mkdir -p "$ATOM_HOME"
+ 
+-  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-ime-events-handler.patch
===================================================================
--- community-i686/fix-ime-events-handler.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-i686/fix-ime-events-handler.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,47 +0,0 @@
---- a/src/text-editor-component.coffee
-+++ b/src/text-editor-component.coffee
-@@ -110,6 +110,7 @@ class TextEditorComponent
-     @updateSync()
-     @checkForVisibilityChange()
-     @initialized = true
-+    @checkpointForIME = null
- 
-   destroy: ->
-     @mounted = false
-@@ -305,19 +306,20 @@ class TextEditorComponent
-     # User escape to cancel
-     #   4. compositionend fired
-     # OR User chooses a completion
--    #   4. compositionend fired
--    #   5. textInput fired; event.data == the completion string
-+    #   4. textInput fired; event.data == the completion string
-+    #   5. compositionend fired
- 
--    checkpoint = null
-     @domNode.addEventListener 'compositionstart', =>
-       if @openedAccentedCharacterMenu
-         @editor.selectLeft()
-         @openedAccentedCharacterMenu = false
--      checkpoint = @editor.createCheckpoint()
-+      @checkpointForIME = @editor.createCheckpoint()
-     @domNode.addEventListener 'compositionupdate', (event) =>
-       @editor.insertText(event.data, select: true)
-     @domNode.addEventListener 'compositionend', (event) =>
--      @editor.revertToCheckpoint(checkpoint)
-+      if @checkpointForIME
-+        @editor.revertToCheckpoint(@checkpointForIME)
-+        @checkpointForIME = null
-       event.target.value = ''
- 
-   # Listen for selection changes and store the currently selected text
-@@ -354,6 +356,10 @@ class TextEditorComponent
-   onTextInput: (event) =>
-     event.stopPropagation()
- 
-+    if @checkpointForIME
-+      @editor.revertToCheckpoint(@checkpointForIME)
-+      @checkpointForIME = null
-+
-     # WARNING: If we call preventDefault on the input of a space character,
-     # then the browser interprets the spacebar keypress as a page-down command,
-     # causing spaces to scroll elements containing editors. This is impossible

Copied: atom/repos/community-i686/fix-ime-events-handler.patch (from rev 211731, atom/trunk/fix-ime-events-handler.patch)
===================================================================
--- community-i686/fix-ime-events-handler.patch	                        (rev 0)
+++ community-i686/fix-ime-events-handler.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,47 @@
+--- a/src/text-editor-component.coffee
++++ b/src/text-editor-component.coffee
+@@ -110,6 +110,7 @@ class TextEditorComponent
+     @updateSync()
+     @checkForVisibilityChange()
+     @initialized = true
++    @checkpointForIME = null
+ 
+   destroy: ->
+     @mounted = false
+@@ -305,19 +306,20 @@ class TextEditorComponent
+     # User escape to cancel
+     #   4. compositionend fired
+     # OR User chooses a completion
+-    #   4. compositionend fired
+-    #   5. textInput fired; event.data == the completion string
++    #   4. textInput fired; event.data == the completion string
++    #   5. compositionend fired
+ 
+-    checkpoint = null
+     @domNode.addEventListener 'compositionstart', =>
+       if @openedAccentedCharacterMenu
+         @editor.selectLeft()
+         @openedAccentedCharacterMenu = false
+-      checkpoint = @editor.createCheckpoint()
++      @checkpointForIME = @editor.createCheckpoint()
+     @domNode.addEventListener 'compositionupdate', (event) =>
+       @editor.insertText(event.data, select: true)
+     @domNode.addEventListener 'compositionend', (event) =>
+-      @editor.revertToCheckpoint(checkpoint)
++      if @checkpointForIME
++        @editor.revertToCheckpoint(@checkpointForIME)
++        @checkpointForIME = null
+       event.target.value = ''
+ 
+   # Listen for selection changes and store the currently selected text
+@@ -354,6 +356,10 @@ class TextEditorComponent
+   onTextInput: (event) =>
+     event.stopPropagation()
+ 
++    if @checkpointForIME
++      @editor.revertToCheckpoint(@checkpointForIME)
++      @checkpointForIME = null
++
+     # WARNING: If we call preventDefault on the input of a space character,
+     # then the browser interprets the spacebar keypress as a page-down command,
+     # causing spaces to scroll elements containing editors. This is impossible

Deleted: community-i686/fix-license-path.patch
===================================================================
--- community-i686/fix-license-path.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-i686/fix-license-path.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,22 +0,0 @@
---- a/src/main-process/atom-application.coffee
-+++ b/src/main-process/atom-application.coffee
-@@ -246,7 +246,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')
- 
-     @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
-       unless @quitting
---- a/src/workspace.coffee
-+++ b/src/workspace.coffee
-@@ -461,7 +461,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

Copied: atom/repos/community-i686/fix-license-path.patch (from rev 211731, atom/trunk/fix-license-path.patch)
===================================================================
--- community-i686/fix-license-path.patch	                        (rev 0)
+++ community-i686/fix-license-path.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,22 @@
+--- a/src/main-process/atom-application.coffee
++++ b/src/main-process/atom-application.coffee
+@@ -246,7 +246,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')
+ 
+     @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
+       unless @quitting
+--- a/src/workspace.coffee
++++ b/src/workspace.coffee
+@@ -461,7 +461,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-restart.patch
===================================================================
--- community-i686/fix-restart.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-i686/fix-restart.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,11 +0,0 @@
---- a/src/main-process/atom-application.coffee
-+++ b/src/main-process/atom-application.coffee
-@@ -794,7 +794,7 @@
-       @restart()
- 
-   restart: ->
--    args = []
-+    args = ["--app=/usr/lib/atom"]
-     args.push("--safe") if @safeMode
-     args.push("--portable") if @setPortable
-     args.push("--log-file=#{@logFile}") if @logFile?

Copied: atom/repos/community-i686/fix-restart.patch (from rev 211731, atom/trunk/fix-restart.patch)
===================================================================
--- community-i686/fix-restart.patch	                        (rev 0)
+++ community-i686/fix-restart.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,11 @@
+--- a/src/main-process/atom-application.coffee
++++ b/src/main-process/atom-application.coffee
+@@ -797,7 +797,7 @@
+       @restart()
+ 
+   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?

Deleted: community-i686/symbols-view-use-system-ctags.patch
===================================================================
--- community-i686/symbols-view-use-system-ctags.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-i686/symbols-view-use-system-ctags.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,11 +0,0 @@
---- a/lib/tag-generator.coffee
-+++ b/lib/tag-generator.coffee
-@@ -56,7 +56,7 @@ class TagGenerator
-   generate: ->
-     tags = {}
-     packageRoot = @getPackageRoot()
--    command = path.join(packageRoot, 'vendor', "ctags-#{process.platform}")
-+    command = 'ctags'
-     defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config')
-     args = ["--options=#{defaultCtagsFile}", '--fields=+KS']
- 

Copied: atom/repos/community-i686/symbols-view-use-system-ctags.patch (from rev 211731, atom/trunk/symbols-view-use-system-ctags.patch)
===================================================================
--- community-i686/symbols-view-use-system-ctags.patch	                        (rev 0)
+++ community-i686/symbols-view-use-system-ctags.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,11 @@
+--- a/lib/tag-generator.js
++++ b/lib/tag-generator.js
+@@ -72,7 +72,7 @@ export default class TagGenerator {
+   generate() {
+     let tags = {};
+     const packageRoot = this.getPackageRoot();
+-    const command = path.join(packageRoot, 'vendor', `ctags-${process.platform}`);
++    const command = 'ctags';
+     const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config');
+     const args = [`--options=${defaultCtagsFile}`, '--fields=+KS'];
+ 

Deleted: community-i686/use-system-apm.patch
===================================================================
--- community-i686/use-system-apm.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-i686/use-system-apm.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,16 +0,0 @@
---- a/src/package-manager.coffee
-+++ b/src/package-manager.coffee
-@@ -140,12 +140,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.

Copied: atom/repos/community-i686/use-system-apm.patch (from rev 211731, atom/trunk/use-system-apm.patch)
===================================================================
--- community-i686/use-system-apm.patch	                        (rev 0)
+++ community-i686/use-system-apm.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,16 @@
+--- a/src/package-manager.coffee
++++ b/src/package-manager.coffee
+@@ -140,12 +140,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	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-i686/use-system-electron.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,113 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -12,7 +12,6 @@
-     "url": "https://github.com/atom/atom/issues"
-   },
-   "license": "MIT",
--  "electronVersion": "1.3.13",
-   "dependencies": {
-     "async": "0.2.6",
-     "atom-keymap": "7.1.3-9",
---- 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')
-@@ -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')
--const downloadChromedriver = require('./lib/download-chromedriver')
- const dumpSymbols = require('./lib/dump-symbols')
- const generateAPIDocs = require('./lib/generate-api-docs')
- const generateMetadata = require('./lib/generate-metadata')
-@@ -58,48 +53,4 @@
- prebuildLessCache()
- generateMetadata()
- generateAPIDocs()
--downloadChromedriver()
- dumpSymbols()
--  .then(packageApplication)
--  .then(packagedAppPath => {
--    if (process.platform === 'darwin') {
--      if (argv.codeSign) {
--        codeSignOnMac(packagedAppPath)
--      } else {
--        console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
--      }
--    } else if (process.platform === 'win32') {
--      if (argv.createWindowsInstaller) {
--        return createWindowsInstaller(packagedAppPath, argv.codeSign).then(() => packagedAppPath)
--      }
--      else {
--        console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer. Code-signing was skipped too.'.gray)
--      }
--    } else if (process.platform === 'linux') {
--      if (argv.createDebianPackage) {
--        createDebianPackage(packagedAppPath)
--      } else {
--        console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray)
--      }
--
--      if (argv.createRpmPackage) {
--        createRpmPackage(packagedAppPath)
--      } else {
--        console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray)
--      }
--    }
--
--    return Promise.resolve(packagedAppPath)
--  }).then(packagedAppPath => {
--    if (argv.compressArtifacts) {
--      compressArtifacts(packagedAppPath)
--    } else {
--      console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray)
--    }
--
--    if (argv.install) {
--      installApplication(packagedAppPath)
--    } else {
--      console.log('Skipping installation. Specify the --install option to install Atom'.gray)
--    }
--  })
---- 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'
-     atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js')
-     cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
---- a/src/package-manager.coffee
-+++ b/src/package-manager.coffee
-@@ -544,7 +544,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()

Copied: atom/repos/community-i686/use-system-electron.patch (from rev 211731, atom/trunk/use-system-electron.patch)
===================================================================
--- community-i686/use-system-electron.patch	                        (rev 0)
+++ community-i686/use-system-electron.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,129 @@
+--- a/package.json
++++ b/package.json
+@@ -12,7 +12,6 @@
+     "url": "https://github.com/atom/atom/issues"
+   },
+   "license": "MIT",
+-  "electronVersion": "1.3.13",
+   "dependencies": {
+     "async": "0.2.6",
+     "atom-keymap": "7.1.18",
+--- 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')
+@@ -23,7 +19,6 @@
+   .wrap(yargs.terminalWidth())
+   .argv
+ 
+-const checkChromedriverVersion = require('./lib/check-chromedriver-version')
+ const cleanOutputDirectory = require('./lib/clean-output-directory')
+ const codeSignOnMac = require('./lib/code-sign-on-mac')
+ const compressArtifacts = require('./lib/compress-artifacts')
+@@ -48,7 +43,6 @@
+   process.exit(1)
+ })
+ 
+-checkChromedriverVersion()
+ cleanOutputDirectory()
+ copyAssets()
+ transpileBabelPaths()
+@@ -60,46 +54,3 @@
+ generateMetadata()
+ generateAPIDocs()
+ dumpSymbols()
+-  .then(packageApplication)
+-  .then(packagedAppPath => {
+-    if (process.platform === 'darwin') {
+-      if (argv.codeSign) {
+-        codeSignOnMac(packagedAppPath)
+-      } else {
+-        console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+-      }
+-    } else if (process.platform === 'win32') {
+-      if (argv.createWindowsInstaller) {
+-        return createWindowsInstaller(packagedAppPath, argv.codeSign).then(() => packagedAppPath)
+-      }
+-      else {
+-        console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer. Code-signing was skipped too.'.gray)
+-      }
+-    } else if (process.platform === 'linux') {
+-      if (argv.createDebianPackage) {
+-        createDebianPackage(packagedAppPath)
+-      } else {
+-        console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray)
+-      }
+-
+-      if (argv.createRpmPackage) {
+-        createRpmPackage(packagedAppPath)
+-      } else {
+-        console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray)
+-      }
+-    }
+-
+-    return Promise.resolve(packagedAppPath)
+-  }).then(packagedAppPath => {
+-    if (argv.compressArtifacts) {
+-      compressArtifacts(packagedAppPath)
+-    } else {
+-      console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray)
+-    }
+-
+-    if (argv.install) {
+-      installApplication(packagedAppPath)
+-    } else {
+-      console.log('Skipping installation. Specify the --install option to install Atom'.gray)
+-    }
+-  })
+--- a/script/package.json
++++ b/script/package.json
+@@ -8,7 +8,6 @@
+     "colors": "1.1.2",
+     "csslint": "1.0.2",
+     "donna": "1.0.13",
+-    "electron-chromedriver": "~1.3",
+     "electron-packager": "7.3.0",
+     "electron-winstaller": "2.5.1",
+     "fs-extra": "0.30.0",
+--- 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'
+     atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js')
+     cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
+--- a/src/package-manager.coffee
++++ b/src/package-manager.coffee
+@@ -544,7 +544,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	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-x86_64/PKGBUILD	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,103 +0,0 @@
-# $Id$
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=atom
-pkgver=1.13.1
-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' 'libxkbfile')
-makedepends=('git' 'npm')
-optdepends=('ctags: symbol indexing support')
-replaces=('atom-editor')
-options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
-        'fix-atom-sh.patch'
-        'fix-ime-events-handler.patch'
-        'fix-license-path.patch'
-        'fix-restart.patch'
-        'symbols-view-use-system-ctags.patch'
-        'use-system-apm.patch'
-        'use-system-electron.patch')
-sha256sums=('4293bdde0ae4c6a78ebcbd46c797653db5b9e3075a82e3960ea9c7ed647e1233'
-            '73efe3485c9f009b788afdfa688a93a1db15ab0010203c833940406cb852240e'
-            'ab638bb8ef2b27f24433738299b9714a53ebabdecf7b01e8d9df6a9ecee77ec2'
-            '7f56269c3b0679dc6ec118e27348e238ce492d4c766cb3813708c981a0692fa1'
-            'e85051d4f435791c4bd898958304c3ee082d434228a68246a65d43479684c8cb'
-            'a5a2b1fefa29799b3225c4aa3fe0e5b057b2b320f98ad7bc28d3596923e52b41'
-            '822e1629ff754af3225bc3c1c9301b4459a67c79e016fd57cc122644d571e24b'
-            '68430695ef866e87d2ae469e0677d3cd5256fe2dba58f750046aa8ec674c67ab')
-
-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
-  patch -Np1 -i "${srcdir}"/fix-restart.patch
-
-  # Fix for Electron 1.4.0
-  patch -Np1 -i "${srcdir}"/fix-ime-events-handler.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 ../..
-
-  cd script
-  npm install
-  ./build
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -d -m 755 "${pkgdir}"/usr/lib
-  cp -r out/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 %>|atom|" \
-      resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
-
-  for size in 16 24 32 48 64 128 256 512 1024; do
-    install -D -m 644 resources/app-icons/stable/png/${size}.png \
-            "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/atom.png
-  done
-  ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
-      "${pkgdir}"/usr/lib/atom/resources/atom.png
-
-  install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
-
-  install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  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 '{}' \; \
-      -or -name "*.node" -exec chmod a-x '{}' \; \
-      -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 '{}' \;
-}

Copied: atom/repos/community-x86_64/PKGBUILD (from rev 211731, atom/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,103 @@
+# $Id$
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=atom
+pkgver=1.14.1
+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' 'libxkbfile')
+makedepends=('git' 'npm')
+optdepends=('ctags: symbol indexing support')
+replaces=('atom-editor')
+options=(!emptydirs)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
+        'fix-atom-sh.patch'
+        'fix-ime-events-handler.patch'
+        'fix-license-path.patch'
+        'fix-restart.patch'
+        'symbols-view-use-system-ctags.patch'
+        'use-system-apm.patch'
+        'use-system-electron.patch')
+sha256sums=('1d4d180f31989473e4b408eaed115d420fa157c0c8c771ea943860be03afa671'
+            '2148436adf17ec1970adc344fccf3782645375cd93e62a696a55f5b11fe98032'
+            'ab638bb8ef2b27f24433738299b9714a53ebabdecf7b01e8d9df6a9ecee77ec2'
+            '7f56269c3b0679dc6ec118e27348e238ce492d4c766cb3813708c981a0692fa1'
+            '99a4a93c42c357fa1a913bc8b2e5db0178e1a1030916ec768a3a37709ad81c97'
+            '6edb3c1ba5f32e9ec4b5743911e69212af498aa4e64d7be96579dcb40ebc6204'
+            '822e1629ff754af3225bc3c1c9301b4459a67c79e016fd57cc122644d571e24b'
+            '76f3173142d69182de7251c8b2f503347489b9584abcd89d966b93fb0ebb0eb7')
+
+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
+  patch -Np1 -i "${srcdir}"/fix-restart.patch
+
+  # Fix for Electron 1.4.0
+  patch -Np1 -i "${srcdir}"/fix-ime-events-handler.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 ../..
+
+  cd script
+  npm install
+  ./build
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -d -m 755 "${pkgdir}"/usr/lib
+  cp -r out/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 %>|atom|" \
+      resources/linux/atom.desktop.in > "${pkgdir}/usr/share/applications/atom.desktop"
+
+  for size in 16 24 32 48 64 128 256 512 1024; do
+    install -D -m 644 resources/app-icons/stable/png/${size}.png \
+            "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/atom.png
+  done
+  ln -sf ../../../share/icons/hicolor/1024x1024/apps/atom.png \
+      "${pkgdir}"/usr/lib/atom/resources/atom.png
+
+  install -D -m 755 atom.sh "${pkgdir}/usr/bin/atom"
+
+  install -d -m 755 "${pkgdir}/usr/share/licenses/${pkgname}"
+  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 '{}' \; \
+      -or -name "*.node" -exec chmod a-x '{}' \; \
+      -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/fix-atom-sh.patch
===================================================================
--- community-x86_64/fix-atom-sh.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-x86_64/fix-atom-sh.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,104 +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
--
- export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
- 
- while getopts ":wtfvh-:" opt; do
-@@ -54,68 +39,22 @@
-   export ELECTRON_ENABLE_LOGGING=1
- fi
- 
--if [ $OS == 'Mac' ]; then
--  if [ -n "$BETA_VERSION" ]; then
--    ATOM_APP_NAME="Atom Beta.app"
--    ATOM_EXECUTABLE_NAME="Atom Beta"
--  else
--    ATOM_APP_NAME="Atom.app"
--    ATOM_EXECUTABLE_NAME="Atom"
--  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_EXECUTABLE_NAME" --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

Copied: atom/repos/community-x86_64/fix-atom-sh.patch (from rev 211731, atom/trunk/fix-atom-sh.patch)
===================================================================
--- community-x86_64/fix-atom-sh.patch	                        (rev 0)
+++ community-x86_64/fix-atom-sh.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,115 @@
+--- 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
+-
+ export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
+ 
+ while getopts ":wtfvh-:" opt; do
+@@ -54,79 +39,22 @@
+   export ELECTRON_ENABLE_LOGGING=1
+ fi
+ 
+-if [ $OS == 'Mac' ]; then
+-  if [ -L "$0" ]; then
+-    SCRIPT="$(readlink "$0")"
+-  else
+-    SCRIPT="$0"
+-  fi
+-  ATOM_APP="$(dirname "$(dirname "$(dirname "$(dirname "$SCRIPT")")")")"
+-  if [ "$ATOM_APP" == . ]; then
+-    unset ATOM_APP
+-  else
+-    ATOM_PATH="$(dirname "$ATOM_APP")"
+-    ATOM_APP_NAME="$(basename "$ATOM_APP")"
+-  fi
+-
+-  if [ -n "$BETA_VERSION" ]; then
+-    ATOM_EXECUTABLE_NAME="Atom Beta"
+-  else
+-    ATOM_EXECUTABLE_NAME="Atom"
+-  fi
+-
+-  if [ -z "${ATOM_PATH}" ]; then
+-    # If ATOM_PATH isn't 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 haven't 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_NAME}, it is usually located in /Applications. Set the ATOM_PATH environment variable to the directory containing ${ATOM_APP_NAME}."
+-        exit 1
+-      fi
+-    fi
+-  fi
+-
+-  if [ $EXPECT_OUTPUT ]; then
+-    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --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}
++ATOM_PATH="electron --app=/usr/lib/atom"
+ 
+-  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
++ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
++mkdir -p "$ATOM_HOME"
+ 
+-  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-ime-events-handler.patch
===================================================================
--- community-x86_64/fix-ime-events-handler.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-x86_64/fix-ime-events-handler.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,47 +0,0 @@
---- a/src/text-editor-component.coffee
-+++ b/src/text-editor-component.coffee
-@@ -110,6 +110,7 @@ class TextEditorComponent
-     @updateSync()
-     @checkForVisibilityChange()
-     @initialized = true
-+    @checkpointForIME = null
- 
-   destroy: ->
-     @mounted = false
-@@ -305,19 +306,20 @@ class TextEditorComponent
-     # User escape to cancel
-     #   4. compositionend fired
-     # OR User chooses a completion
--    #   4. compositionend fired
--    #   5. textInput fired; event.data == the completion string
-+    #   4. textInput fired; event.data == the completion string
-+    #   5. compositionend fired
- 
--    checkpoint = null
-     @domNode.addEventListener 'compositionstart', =>
-       if @openedAccentedCharacterMenu
-         @editor.selectLeft()
-         @openedAccentedCharacterMenu = false
--      checkpoint = @editor.createCheckpoint()
-+      @checkpointForIME = @editor.createCheckpoint()
-     @domNode.addEventListener 'compositionupdate', (event) =>
-       @editor.insertText(event.data, select: true)
-     @domNode.addEventListener 'compositionend', (event) =>
--      @editor.revertToCheckpoint(checkpoint)
-+      if @checkpointForIME
-+        @editor.revertToCheckpoint(@checkpointForIME)
-+        @checkpointForIME = null
-       event.target.value = ''
- 
-   # Listen for selection changes and store the currently selected text
-@@ -354,6 +356,10 @@ class TextEditorComponent
-   onTextInput: (event) =>
-     event.stopPropagation()
- 
-+    if @checkpointForIME
-+      @editor.revertToCheckpoint(@checkpointForIME)
-+      @checkpointForIME = null
-+
-     # WARNING: If we call preventDefault on the input of a space character,
-     # then the browser interprets the spacebar keypress as a page-down command,
-     # causing spaces to scroll elements containing editors. This is impossible

Copied: atom/repos/community-x86_64/fix-ime-events-handler.patch (from rev 211731, atom/trunk/fix-ime-events-handler.patch)
===================================================================
--- community-x86_64/fix-ime-events-handler.patch	                        (rev 0)
+++ community-x86_64/fix-ime-events-handler.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,47 @@
+--- a/src/text-editor-component.coffee
++++ b/src/text-editor-component.coffee
+@@ -110,6 +110,7 @@ class TextEditorComponent
+     @updateSync()
+     @checkForVisibilityChange()
+     @initialized = true
++    @checkpointForIME = null
+ 
+   destroy: ->
+     @mounted = false
+@@ -305,19 +306,20 @@ class TextEditorComponent
+     # User escape to cancel
+     #   4. compositionend fired
+     # OR User chooses a completion
+-    #   4. compositionend fired
+-    #   5. textInput fired; event.data == the completion string
++    #   4. textInput fired; event.data == the completion string
++    #   5. compositionend fired
+ 
+-    checkpoint = null
+     @domNode.addEventListener 'compositionstart', =>
+       if @openedAccentedCharacterMenu
+         @editor.selectLeft()
+         @openedAccentedCharacterMenu = false
+-      checkpoint = @editor.createCheckpoint()
++      @checkpointForIME = @editor.createCheckpoint()
+     @domNode.addEventListener 'compositionupdate', (event) =>
+       @editor.insertText(event.data, select: true)
+     @domNode.addEventListener 'compositionend', (event) =>
+-      @editor.revertToCheckpoint(checkpoint)
++      if @checkpointForIME
++        @editor.revertToCheckpoint(@checkpointForIME)
++        @checkpointForIME = null
+       event.target.value = ''
+ 
+   # Listen for selection changes and store the currently selected text
+@@ -354,6 +356,10 @@ class TextEditorComponent
+   onTextInput: (event) =>
+     event.stopPropagation()
+ 
++    if @checkpointForIME
++      @editor.revertToCheckpoint(@checkpointForIME)
++      @checkpointForIME = null
++
+     # WARNING: If we call preventDefault on the input of a space character,
+     # then the browser interprets the spacebar keypress as a page-down command,
+     # causing spaces to scroll elements containing editors. This is impossible

Deleted: community-x86_64/fix-license-path.patch
===================================================================
--- community-x86_64/fix-license-path.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-x86_64/fix-license-path.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,22 +0,0 @@
---- a/src/main-process/atom-application.coffee
-+++ b/src/main-process/atom-application.coffee
-@@ -246,7 +246,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')
- 
-     @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
-       unless @quitting
---- a/src/workspace.coffee
-+++ b/src/workspace.coffee
-@@ -461,7 +461,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

Copied: atom/repos/community-x86_64/fix-license-path.patch (from rev 211731, atom/trunk/fix-license-path.patch)
===================================================================
--- community-x86_64/fix-license-path.patch	                        (rev 0)
+++ community-x86_64/fix-license-path.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,22 @@
+--- a/src/main-process/atom-application.coffee
++++ b/src/main-process/atom-application.coffee
+@@ -246,7 +246,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')
+ 
+     @disposable.add ipcHelpers.on app, 'before-quit', (event) =>
+       unless @quitting
+--- a/src/workspace.coffee
++++ b/src/workspace.coffee
+@@ -461,7 +461,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-restart.patch
===================================================================
--- community-x86_64/fix-restart.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-x86_64/fix-restart.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,11 +0,0 @@
---- a/src/main-process/atom-application.coffee
-+++ b/src/main-process/atom-application.coffee
-@@ -794,7 +794,7 @@
-       @restart()
- 
-   restart: ->
--    args = []
-+    args = ["--app=/usr/lib/atom"]
-     args.push("--safe") if @safeMode
-     args.push("--portable") if @setPortable
-     args.push("--log-file=#{@logFile}") if @logFile?

Copied: atom/repos/community-x86_64/fix-restart.patch (from rev 211731, atom/trunk/fix-restart.patch)
===================================================================
--- community-x86_64/fix-restart.patch	                        (rev 0)
+++ community-x86_64/fix-restart.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,11 @@
+--- a/src/main-process/atom-application.coffee
++++ b/src/main-process/atom-application.coffee
+@@ -797,7 +797,7 @@
+       @restart()
+ 
+   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?

Deleted: community-x86_64/symbols-view-use-system-ctags.patch
===================================================================
--- community-x86_64/symbols-view-use-system-ctags.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-x86_64/symbols-view-use-system-ctags.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,11 +0,0 @@
---- a/lib/tag-generator.coffee
-+++ b/lib/tag-generator.coffee
-@@ -56,7 +56,7 @@ class TagGenerator
-   generate: ->
-     tags = {}
-     packageRoot = @getPackageRoot()
--    command = path.join(packageRoot, 'vendor', "ctags-#{process.platform}")
-+    command = 'ctags'
-     defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config')
-     args = ["--options=#{defaultCtagsFile}", '--fields=+KS']
- 

Copied: atom/repos/community-x86_64/symbols-view-use-system-ctags.patch (from rev 211731, atom/trunk/symbols-view-use-system-ctags.patch)
===================================================================
--- community-x86_64/symbols-view-use-system-ctags.patch	                        (rev 0)
+++ community-x86_64/symbols-view-use-system-ctags.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,11 @@
+--- a/lib/tag-generator.js
++++ b/lib/tag-generator.js
+@@ -72,7 +72,7 @@ export default class TagGenerator {
+   generate() {
+     let tags = {};
+     const packageRoot = this.getPackageRoot();
+-    const command = path.join(packageRoot, 'vendor', `ctags-${process.platform}`);
++    const command = 'ctags';
+     const defaultCtagsFile = path.join(packageRoot, 'lib', 'ctags-config');
+     const args = [`--options=${defaultCtagsFile}`, '--fields=+KS'];
+ 

Deleted: community-x86_64/use-system-apm.patch
===================================================================
--- community-x86_64/use-system-apm.patch	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-x86_64/use-system-apm.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,16 +0,0 @@
---- a/src/package-manager.coffee
-+++ b/src/package-manager.coffee
-@@ -140,12 +140,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.

Copied: atom/repos/community-x86_64/use-system-apm.patch (from rev 211731, atom/trunk/use-system-apm.patch)
===================================================================
--- community-x86_64/use-system-apm.patch	                        (rev 0)
+++ community-x86_64/use-system-apm.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,16 @@
+--- a/src/package-manager.coffee
++++ b/src/package-manager.coffee
+@@ -140,12 +140,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	2017-02-10 11:19:52 UTC (rev 211731)
+++ community-x86_64/use-system-electron.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -1,113 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -12,7 +12,6 @@
-     "url": "https://github.com/atom/atom/issues"
-   },
-   "license": "MIT",
--  "electronVersion": "1.3.13",
-   "dependencies": {
-     "async": "0.2.6",
-     "atom-keymap": "7.1.3-9",
---- 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')
-@@ -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')
--const downloadChromedriver = require('./lib/download-chromedriver')
- const dumpSymbols = require('./lib/dump-symbols')
- const generateAPIDocs = require('./lib/generate-api-docs')
- const generateMetadata = require('./lib/generate-metadata')
-@@ -58,48 +53,4 @@
- prebuildLessCache()
- generateMetadata()
- generateAPIDocs()
--downloadChromedriver()
- dumpSymbols()
--  .then(packageApplication)
--  .then(packagedAppPath => {
--    if (process.platform === 'darwin') {
--      if (argv.codeSign) {
--        codeSignOnMac(packagedAppPath)
--      } else {
--        console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
--      }
--    } else if (process.platform === 'win32') {
--      if (argv.createWindowsInstaller) {
--        return createWindowsInstaller(packagedAppPath, argv.codeSign).then(() => packagedAppPath)
--      }
--      else {
--        console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer. Code-signing was skipped too.'.gray)
--      }
--    } else if (process.platform === 'linux') {
--      if (argv.createDebianPackage) {
--        createDebianPackage(packagedAppPath)
--      } else {
--        console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray)
--      }
--
--      if (argv.createRpmPackage) {
--        createRpmPackage(packagedAppPath)
--      } else {
--        console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray)
--      }
--    }
--
--    return Promise.resolve(packagedAppPath)
--  }).then(packagedAppPath => {
--    if (argv.compressArtifacts) {
--      compressArtifacts(packagedAppPath)
--    } else {
--      console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray)
--    }
--
--    if (argv.install) {
--      installApplication(packagedAppPath)
--    } else {
--      console.log('Skipping installation. Specify the --install option to install Atom'.gray)
--    }
--  })
---- 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'
-     atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js')
-     cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
---- a/src/package-manager.coffee
-+++ b/src/package-manager.coffee
-@@ -544,7 +544,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()

Copied: atom/repos/community-x86_64/use-system-electron.patch (from rev 211731, atom/trunk/use-system-electron.patch)
===================================================================
--- community-x86_64/use-system-electron.patch	                        (rev 0)
+++ community-x86_64/use-system-electron.patch	2017-02-10 11:20:28 UTC (rev 211732)
@@ -0,0 +1,129 @@
+--- a/package.json
++++ b/package.json
+@@ -12,7 +12,6 @@
+     "url": "https://github.com/atom/atom/issues"
+   },
+   "license": "MIT",
+-  "electronVersion": "1.3.13",
+   "dependencies": {
+     "async": "0.2.6",
+     "atom-keymap": "7.1.18",
+--- 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')
+@@ -23,7 +19,6 @@
+   .wrap(yargs.terminalWidth())
+   .argv
+ 
+-const checkChromedriverVersion = require('./lib/check-chromedriver-version')
+ const cleanOutputDirectory = require('./lib/clean-output-directory')
+ const codeSignOnMac = require('./lib/code-sign-on-mac')
+ const compressArtifacts = require('./lib/compress-artifacts')
+@@ -48,7 +43,6 @@
+   process.exit(1)
+ })
+ 
+-checkChromedriverVersion()
+ cleanOutputDirectory()
+ copyAssets()
+ transpileBabelPaths()
+@@ -60,46 +54,3 @@
+ generateMetadata()
+ generateAPIDocs()
+ dumpSymbols()
+-  .then(packageApplication)
+-  .then(packagedAppPath => {
+-    if (process.platform === 'darwin') {
+-      if (argv.codeSign) {
+-        codeSignOnMac(packagedAppPath)
+-      } else {
+-        console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+-      }
+-    } else if (process.platform === 'win32') {
+-      if (argv.createWindowsInstaller) {
+-        return createWindowsInstaller(packagedAppPath, argv.codeSign).then(() => packagedAppPath)
+-      }
+-      else {
+-        console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer. Code-signing was skipped too.'.gray)
+-      }
+-    } else if (process.platform === 'linux') {
+-      if (argv.createDebianPackage) {
+-        createDebianPackage(packagedAppPath)
+-      } else {
+-        console.log('Skipping creating debian package. Specify the --create-debian-package option to create it.'.gray)
+-      }
+-
+-      if (argv.createRpmPackage) {
+-        createRpmPackage(packagedAppPath)
+-      } else {
+-        console.log('Skipping creating rpm package. Specify the --create-rpm-package option to create it.'.gray)
+-      }
+-    }
+-
+-    return Promise.resolve(packagedAppPath)
+-  }).then(packagedAppPath => {
+-    if (argv.compressArtifacts) {
+-      compressArtifacts(packagedAppPath)
+-    } else {
+-      console.log('Skipping artifacts compression. Specify the --compress-artifacts option to compress Atom binaries (and symbols on macOS)'.gray)
+-    }
+-
+-    if (argv.install) {
+-      installApplication(packagedAppPath)
+-    } else {
+-      console.log('Skipping installation. Specify the --install option to install Atom'.gray)
+-    }
+-  })
+--- a/script/package.json
++++ b/script/package.json
+@@ -8,7 +8,6 @@
+     "colors": "1.1.2",
+     "csslint": "1.0.2",
+     "donna": "1.0.13",
+-    "electron-chromedriver": "~1.3",
+     "electron-packager": "7.3.0",
+     "electron-winstaller": "2.5.1",
+     "fs-extra": "0.30.0",
+--- 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'
+     atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js')
+     cache.builtins.atom = atomJsPath if fs.isFileSync(atomJsPath)
+--- a/src/package-manager.coffee
++++ b/src/package-manager.coffee
+@@ -544,7 +544,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()



More information about the arch-commits mailing list