[arch-commits] Commit in atom/repos/community-x86_64 (23 files)

Nicola Squartini tensor5 at archlinux.org
Sat Sep 28 10:44:47 UTC 2019


    Date: Saturday, September 28, 2019 @ 10:44:46
  Author: tensor5
Revision: 511963

archrelease: copy trunk to community-x86_64

Added:
  atom/repos/community-x86_64/PKGBUILD
    (from rev 511962, atom/trunk/PKGBUILD)
  atom/repos/community-x86_64/atom.js
    (from rev 511962, atom/trunk/atom.js)
  atom/repos/community-x86_64/dugite-use-system-git.patch
    (from rev 511962, atom/trunk/dugite-use-system-git.patch)
  atom/repos/community-x86_64/fix-atom-sh.patch
    (from rev 511962, atom/trunk/fix-atom-sh.patch)
  atom/repos/community-x86_64/fix-license-path.patch
    (from rev 511962, atom/trunk/fix-license-path.patch)
  atom/repos/community-x86_64/fix-restart.patch
    (from rev 511962, atom/trunk/fix-restart.patch)
  atom/repos/community-x86_64/git-utils.patch
    (from rev 511962, atom/trunk/git-utils.patch)
  atom/repos/community-x86_64/no-unsafe-eval-warning.patch
    (from rev 511962, atom/trunk/no-unsafe-eval-warning.patch)
  atom/repos/community-x86_64/node-env-production.patch
    (from rev 511962, atom/trunk/node-env-production.patch)
  atom/repos/community-x86_64/symbols-view-use-system-ctags.patch
    (from rev 511962, atom/trunk/symbols-view-use-system-ctags.patch)
  atom/repos/community-x86_64/use-system-apm.patch
    (from rev 511962, atom/trunk/use-system-apm.patch)
  atom/repos/community-x86_64/use-system-electron.patch
    (from rev 511962, atom/trunk/use-system-electron.patch)
Deleted:
  atom/repos/community-x86_64/PKGBUILD
  atom/repos/community-x86_64/atom.js
  atom/repos/community-x86_64/dugite-use-system-git.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-restart.patch
  atom/repos/community-x86_64/no-unsafe-eval-warning.patch
  atom/repos/community-x86_64/node-env-production.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                            |  260 ++++++++++---------
 atom.js                             |   66 ++--
 dugite-use-system-git.patch         |   66 ++--
 fix-atom-sh.patch                   |  304 +++++++++++-----------
 fix-license-path.patch              |   44 +--
 fix-restart.patch                   |   22 -
 git-utils.patch                     |   11 
 no-unsafe-eval-warning.patch        |   22 -
 node-env-production.patch           |   26 -
 symbols-view-use-system-ctags.patch |   22 -
 use-system-apm.patch                |   74 ++---
 use-system-electron.patch           |  451 +++++++++++++++++-----------------
 12 files changed, 702 insertions(+), 666 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-09-28 10:42:53 UTC (rev 511962)
+++ PKGBUILD	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,119 +0,0 @@
-# Maintainer: Nicola Squartini <tensor5 at gmail.com>
-
-pkgname=atom
-pkgver=1.39.1
-pkgrel=1
-pkgdesc='A hackable text editor for the 21st Century'
-arch=('x86_64')
-url='https://github.com/atom/atom'
-license=('MIT' 'custom')
-depends=('apm' 'electron4' 'libxkbfile')
-makedepends=('git' 'npm')
-optdepends=('ctags: symbol indexing support'
-            'git: Git and GitHub integration')
-replaces=('atom-editor')
-options=(!emptydirs)
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
-        'atom.js'
-        'dugite-use-system-git.patch'
-        'fix-atom-sh.patch'
-        'fix-license-path.patch'
-        'fix-restart.patch'
-        'no-unsafe-eval-warning.patch'
-        'node-env-production.patch'
-        'symbols-view-use-system-ctags.patch'
-        'use-system-apm.patch'
-        'use-system-electron.patch')
-sha256sums=('5ed505b8d917d639c67b35d232867f456f7734a19a52867d3b8ddcb9ab89331d'
-            'd286e0766e47cfea73cd207abb9d6f7375846688823e72732c871a852b4b261d'
-            '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
-            'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
-            '2894cce31935d45291c5fe4c625473bb83fc51e1b899f162aa6b419491c7ace1'
-            'e3c30c03006d23a72f07fa77f4309b16a6059af1179343033a87f74f50124076'
-            '7015f16485bb63b53b306357faa39fc2d8b9c9920ce631e15cc559475ea8572b'
-            '27aa7e032e45728d4012a1c8de05a1f7146882bdd28cae4bcbe096fc38ba5255'
-            '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
-            '8d48dca4571136375b325f4bf94ccfb996e90e57b7fdf83d53c1eb2e69b3b0d4'
-            'ccfb472a8b09d6c3297f3c5755906c1498b6a88da88d1d356e5ff8f54dbe5355')
-
-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
-  patch -Np1 -i "${srcdir}"/node-env-production.patch
-  patch -Np1 -i "${srcdir}"/no-unsafe-eval-warning.patch
-}
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  ATOM_RESOURCE_PATH="${PWD}" \
-  npm_config_build_from_source=true \
-  npm_config_target=$(< /usr/lib/electron4/version) \
-  apm install
-
-  # Use system ctags
-  cd node_modules/symbols-view
-  patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch
-  rm -r vendor
-  cd ../..
-
-  # Use system git
-  cd node_modules/dugite
-  patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch
-  rm -r git
-  cd ../..
-
-  cd script
-  npm install
-  # Set ELECTRON_VERSION (see use-system-electron.patch)
-  env ELECTRON_VERSION=$(< /usr/lib/electron4/version) ./build --no-bootstrap
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  install -d -m 755 "${pkgdir}"/usr/lib
-  cp -r out/app "${pkgdir}"/usr/lib/atom
-  install -m 644 out/startup.js "${pkgdir}"/usr/lib/atom
-  install -m 755 "${srcdir}/atom.js" "${pkgdir}"/usr/lib/atom/atom
-
-  install -d -m 755 "${pkgdir}/usr/share/applications"
-  sed -e "s|<%= appName %>|Atom|" \
-      -e "s/<%= description %>/${pkgdesc}/" \
-      -e "s|<%= installDir %>|/usr|" \
-      -e "s|<%= appFileName %>|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
-  find "${pkgdir}"/usr/lib/atom/node_modules \
-      -name "*.a" -exec rm '{}' \; \
-      -or -name "*.bat" -exec rm '{}' \; \
-      -or -name "*.c" -exec rm '{}' \; \
-      -or -name "*.cpp" -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 -name "scripts" -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 511962, atom/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,141 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=atom
+pkgver=1.40.1
+pkgrel=1
+pkgdesc='A hackable text editor for the 21st Century'
+arch=('x86_64')
+url='https://github.com/atom/atom'
+license=('MIT' 'custom')
+depends=('apm' 'electron4' 'libxkbfile')
+makedepends=('git' 'npm')
+optdepends=('ctags: symbol indexing support'
+            'git: Git and GitHub integration')
+replaces=('atom-editor')
+options=(!emptydirs)
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/atom/atom/archive/v${pkgver}.tar.gz"
+        'atom.js'
+        'dugite-use-system-git.patch'
+        'fix-atom-sh.patch'
+        'fix-license-path.patch'
+        'fix-restart.patch'
+        'git-utils.patch'
+        'no-unsafe-eval-warning.patch'
+        'node-env-production.patch'
+        'symbols-view-use-system-ctags.patch'
+        'use-system-apm.patch'
+        'use-system-electron.patch')
+sha256sums=('7ec4b3fd35d3dcb4df90911726144ca5d05335ee9c0f093f2c29fa22fbe3527a'
+            'd286e0766e47cfea73cd207abb9d6f7375846688823e72732c871a852b4b261d'
+            '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
+            'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
+            '2894cce31935d45291c5fe4c625473bb83fc51e1b899f162aa6b419491c7ace1'
+            'e3c30c03006d23a72f07fa77f4309b16a6059af1179343033a87f74f50124076'
+            'e321fdfe880cd465918dd1dbb90e4c7d46fc5310f20666eddf0a41cbca4f8ac8'
+            '40d783794d62f12f3c429c624a84265871c7ed95f4120c9db800348896dd5437'
+            'a09439c2a908ca174ff3be1f0d85071d12c792ae19748e36fe601e372d6d925b'
+            '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
+            '8d48dca4571136375b325f4bf94ccfb996e90e57b7fdf83d53c1eb2e69b3b0d4'
+            '79c01868ec489a43125047c86f3d5fae6d102f9d8338479590107116cf15b578')
+
+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
+  patch -Np1 -i "${srcdir}"/node-env-production.patch
+  patch -Np1 -i "${srcdir}"/no-unsafe-eval-warning.patch
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ATOM_RESOURCE_PATH="${PWD}" \
+  npm_config_build_from_source=true \
+  npm_config_target=$(< /usr/lib/electron4/version) \
+  apm install
+
+  # Use system ctags
+  cd node_modules/symbols-view
+  patch -Np1 -i "${srcdir}"/symbols-view-use-system-ctags.patch
+  rm -r vendor
+  cd ../..
+
+  # Use system git
+  cd node_modules/dugite
+  patch -Np1 -i "${srcdir}"/dugite-use-system-git.patch
+  rm -r git
+  cd ../..
+
+  # Fix issue with:
+  # build/Release/git.node: undefined symbol: git_net_url_is_default_port
+  cd node_modules/git-utils
+  patch -Np1 -i "${srcdir}"/git-utils.patch
+  env \
+    npm_config_disturl=https://electronjs.org/headers \
+    npm_config_runtime=electron \
+    npm_config_target=$(< /usr/lib/electron4/version) \
+    node-gyp rebuild
+  cd ../..
+
+  cd script
+  # Hack to avoid using Node 12
+  env \
+    npm_config_disturl=https://electronjs.org/headers \
+    npm_config_runtime=electron \
+    npm_config_target=$(< /usr/lib/electron4/version) \
+    npm install
+  # Set ELECTRON_VERSION (see use-system-electron.patch)
+  env \
+    ELECTRON_RUN_AS_NODE=1 \
+    ELECTRON_VERSION=$(< /usr/lib/electron4/version) \
+    electron4 \
+    build --no-bootstrap
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  install -d -m 755 "${pkgdir}"/usr/lib
+  cp -r out/app "${pkgdir}"/usr/lib/atom
+  install -m 644 out/startup.js "${pkgdir}"/usr/lib/atom
+  install -m 755 "${srcdir}/atom.js" "${pkgdir}"/usr/lib/atom/atom
+
+  install -d -m 755 "${pkgdir}/usr/share/applications"
+  sed -e "s|<%= appName %>|Atom|" \
+      -e "s/<%= description %>/${pkgdesc}/" \
+      -e "s|<%= installDir %>|/usr|" \
+      -e "s|<%= appFileName %>|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
+  find "${pkgdir}"/usr/lib/atom/node_modules \
+      -name "*.a" -exec rm '{}' \; \
+      -or -name "*.bat" -exec rm '{}' \; \
+      -or -name "*.c" -exec rm '{}' \; \
+      -or -name "*.cpp" -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 -name "scripts" -prune -exec rm -r '{}' \; \
+      -or -path "*/less/gradle" -prune -exec rm -r '{}' \; \
+      -or -path "*/task-lists/src" -prune -exec rm -r '{}' \;
+}

Deleted: atom.js
===================================================================
--- atom.js	2019-09-28 10:42:53 UTC (rev 511962)
+++ atom.js	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,33 +0,0 @@
-#!/usr/bin/electron4
-
-const name = "atom";
-
-const {app} = require("electron");
-const fs = require("fs");
-const Module = require("module");
-const {join} = require("path");
-const vm = require("vm");
-
-// Change command name.
-const fd = fs.openSync("/proc/self/comm", fs.constants.O_WRONLY);
-fs.writeSync(fd, name);
-fs.closeSync(fd);
-
-// Remove first command line argument (/usr/bin/electron).
-process.argv.splice(0, 1);
-
-// Set application paths.
-const appPath = __dirname;
-const packageJson = require(join(appPath, "package.json"));
-const productName = packageJson.productName;
-app.setAppPath(appPath);
-app.setDesktopName(name + ".desktop");
-app.setName(productName);
-app.setPath("userCache", join(app.getPath("cache"), productName));
-app.setPath("userData", join(app.getPath("appData"), productName));
-app.setVersion(packageJson.version);
-
-// Run the application.
-const startupJs = fs.readFileSync(join(appPath, "startup.js"), "utf-8");
-vm.runInThisContext(startupJs);
-Module._load(appPath, Module, true);

Copied: atom/repos/community-x86_64/atom.js (from rev 511962, atom/trunk/atom.js)
===================================================================
--- atom.js	                        (rev 0)
+++ atom.js	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,33 @@
+#!/usr/bin/electron4
+
+const name = "atom";
+
+const {app} = require("electron");
+const fs = require("fs");
+const Module = require("module");
+const {join} = require("path");
+const vm = require("vm");
+
+// Change command name.
+const fd = fs.openSync("/proc/self/comm", fs.constants.O_WRONLY);
+fs.writeSync(fd, name);
+fs.closeSync(fd);
+
+// Remove first command line argument (/usr/bin/electron).
+process.argv.splice(0, 1);
+
+// Set application paths.
+const appPath = __dirname;
+const packageJson = require(join(appPath, "package.json"));
+const productName = packageJson.productName;
+app.setAppPath(appPath);
+app.setDesktopName(name + ".desktop");
+app.setName(productName);
+app.setPath("userCache", join(app.getPath("cache"), productName));
+app.setPath("userData", join(app.getPath("appData"), productName));
+app.setVersion(packageJson.version);
+
+// Run the application.
+const startupJs = fs.readFileSync(join(appPath, "startup.js"), "utf-8");
+vm.runInThisContext(startupJs);
+Module._load(appPath, Module, true);

Deleted: dugite-use-system-git.patch
===================================================================
--- dugite-use-system-git.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ dugite-use-system-git.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,33 +0,0 @@
---- a/build/lib/git-environment.js
-+++ b/build/lib/git-environment.js
-@@ -24,7 +24,7 @@
-         return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
-     }
-     else {
--        return resolveEmbeddedGitDir();
-+        return '/usr';
-     }
- }
- /**
-@@ -57,7 +57,7 @@
-         return path.join(gitDir, 'mingw32', 'libexec', 'git-core');
-     }
-     else {
--        return path.join(gitDir, 'libexec', 'git-core');
-+        return path.join(gitDir, 'lib', 'git-core');
-     }
- }
- /**
-@@ -108,9 +108,9 @@
-         if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
-             // use the SSL certificate bundle included in the distribution only
-             // when using embedded Git and not providing your own bundle
--            const distDir = resolveEmbeddedGitDir();
--            const sslCABundle = `${distDir}/ssl/cacert.pem`;
--            env.GIT_SSL_CAINFO = sslCABundle;
-+            // const distDir = resolveEmbeddedGitDir();
-+            // const sslCABundle = `${distDir}/ssl/cacert.pem`;
-+            // env.GIT_SSL_CAINFO = sslCABundle;
-         }
-     }
-     return { env, gitLocation };

Copied: atom/repos/community-x86_64/dugite-use-system-git.patch (from rev 511962, atom/trunk/dugite-use-system-git.patch)
===================================================================
--- dugite-use-system-git.patch	                        (rev 0)
+++ dugite-use-system-git.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,33 @@
+--- a/build/lib/git-environment.js
++++ b/build/lib/git-environment.js
+@@ -24,7 +24,7 @@
+         return path.resolve(process.env.LOCAL_GIT_DIRECTORY);
+     }
+     else {
+-        return resolveEmbeddedGitDir();
++        return '/usr';
+     }
+ }
+ /**
+@@ -57,7 +57,7 @@
+         return path.join(gitDir, 'mingw32', 'libexec', 'git-core');
+     }
+     else {
+-        return path.join(gitDir, 'libexec', 'git-core');
++        return path.join(gitDir, 'lib', 'git-core');
+     }
+ }
+ /**
+@@ -108,9 +108,9 @@
+         if (!env.GIT_SSL_CAINFO && !env.LOCAL_GIT_DIRECTORY) {
+             // use the SSL certificate bundle included in the distribution only
+             // when using embedded Git and not providing your own bundle
+-            const distDir = resolveEmbeddedGitDir();
+-            const sslCABundle = `${distDir}/ssl/cacert.pem`;
+-            env.GIT_SSL_CAINFO = sslCABundle;
++            // const distDir = resolveEmbeddedGitDir();
++            // const sslCABundle = `${distDir}/ssl/cacert.pem`;
++            // env.GIT_SSL_CAINFO = sslCABundle;
+         }
+     }
+     return { env, gitLocation };

Deleted: fix-atom-sh.patch
===================================================================
--- fix-atom-sh.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ fix-atom-sh.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,152 +0,0 @@
---- a/atom.sh
-+++ b/atom.sh
-@@ -1,29 +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
--
--case $(basename $0) in
--  atom-beta)
--    CHANNEL=beta
--    ;;
--  atom-nightly)
--    CHANNEL=nightly
--    ;;
--  atom-dev)
--    CHANNEL=dev
--    ;;
--  *)
--    CHANNEL=stable
--    ;;
--esac
--
- # Only set the ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT env var if it hasn't been set.
- if [ -z "$ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT" ]
- then
-@@ -90,105 +66,24 @@
- ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
- mkdir -p "$ATOM_HOME"
- 
--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
-+ATOM_PATH="/usr/lib/atom/atom"
- 
--  if [ ! -z "${ATOM_APP_NAME}" ]; then
--    # If ATOM_APP_NAME is known, use it as the executable name
--    ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
-+if [ $EXPECT_OUTPUT ]; then
-+  "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
-+  ATOM_EXIT=$?
-+  if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
-+    exit "${EXIT_CODE_OVERRIDE}"
-   else
--    # Else choose it from the inferred channel name
--    if [ "$CHANNEL" == 'beta' ]; then
--      ATOM_EXECUTABLE_NAME="Atom Beta"
--    elif [ "$CHANNEL" == 'nightly' ]; then
--      ATOM_EXECUTABLE_NAME="Atom Nightly"
--    elif [ "$CHANNEL" == 'dev' ]; then
--      ATOM_EXECUTABLE_NAME="Atom Dev"
--    else
--      ATOM_EXECUTABLE_NAME="Atom"
--    fi
--  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
-+    exit ${ATOM_EXIT}
-   fi
--
--  if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
--    ATOM_EXIT=$?
--    if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
--      exit "${EXIT_CODE_OVERRIDE}"
--    else
--      exit ${ATOM_EXIT}
--    fi
--  else
--    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
--  fi
--elif [ $OS == 'Linux' ]; then
--  SCRIPT=$(readlink -f "$0")
--  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
--
--  case $CHANNEL in
--    beta)
--      ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
--      ;;
--    nightly)
--      ATOM_PATH="$USR_DIRECTORY/share/atom-nightly/atom"
--      ;;
--    dev)
--      ATOM_PATH="$USR_DIRECTORY/share/atom-dev/atom"
--      ;;
--    *)
--      ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
--      ;;
--  esac
--
--  : ${TMPDIR:=/tmp}
--
--  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
--
--  if [ $EXPECT_OUTPUT ]; then
--    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
--    ATOM_EXIT=$?
--    if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
--      exit "${EXIT_CODE_OVERRIDE}"
--    else
--      exit ${ATOM_EXIT}
--    fi
--  else
--    (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
--    if [ $? -ne 0 ]; then
--      cat "$ATOM_HOME/nohup.out"
--      exit $?
--    fi
--    ) &
-+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
- 
- # Exits this process when Atom is used as $EDITOR

Copied: atom/repos/community-x86_64/fix-atom-sh.patch (from rev 511962, atom/trunk/fix-atom-sh.patch)
===================================================================
--- fix-atom-sh.patch	                        (rev 0)
+++ fix-atom-sh.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,152 @@
+--- a/atom.sh
++++ b/atom.sh
+@@ -1,29 +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
+-
+-case $(basename $0) in
+-  atom-beta)
+-    CHANNEL=beta
+-    ;;
+-  atom-nightly)
+-    CHANNEL=nightly
+-    ;;
+-  atom-dev)
+-    CHANNEL=dev
+-    ;;
+-  *)
+-    CHANNEL=stable
+-    ;;
+-esac
+-
+ # Only set the ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT env var if it hasn't been set.
+ if [ -z "$ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT" ]
+ then
+@@ -90,105 +66,24 @@
+ ATOM_HOME="${ATOM_HOME:-$HOME/.atom}"
+ mkdir -p "$ATOM_HOME"
+ 
+-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
++ATOM_PATH="/usr/lib/atom/atom"
+ 
+-  if [ ! -z "${ATOM_APP_NAME}" ]; then
+-    # If ATOM_APP_NAME is known, use it as the executable name
+-    ATOM_EXECUTABLE_NAME="${ATOM_APP_NAME%.*}"
++if [ $EXPECT_OUTPUT ]; then
++  "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
++  ATOM_EXIT=$?
++  if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
++    exit "${EXIT_CODE_OVERRIDE}"
+   else
+-    # Else choose it from the inferred channel name
+-    if [ "$CHANNEL" == 'beta' ]; then
+-      ATOM_EXECUTABLE_NAME="Atom Beta"
+-    elif [ "$CHANNEL" == 'nightly' ]; then
+-      ATOM_EXECUTABLE_NAME="Atom Nightly"
+-    elif [ "$CHANNEL" == 'dev' ]; then
+-      ATOM_EXECUTABLE_NAME="Atom Dev"
+-    else
+-      ATOM_EXECUTABLE_NAME="Atom"
+-    fi
+-  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
++    exit ${ATOM_EXIT}
+   fi
+-
+-  if [ $EXPECT_OUTPUT ]; then
+-    "$ATOM_PATH/$ATOM_APP_NAME/Contents/MacOS/$ATOM_EXECUTABLE_NAME" --executed-from="$(pwd)" --pid=$$ "$@"
+-    ATOM_EXIT=$?
+-    if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
+-      exit "${EXIT_CODE_OVERRIDE}"
+-    else
+-      exit ${ATOM_EXIT}
+-    fi
+-  else
+-    open -a "$ATOM_PATH/$ATOM_APP_NAME" -n --args --executed-from="$(pwd)" --pid=$$ --path-environment="$PATH" "$@"
+-  fi
+-elif [ $OS == 'Linux' ]; then
+-  SCRIPT=$(readlink -f "$0")
+-  USR_DIRECTORY=$(readlink -f $(dirname $SCRIPT)/..)
+-
+-  case $CHANNEL in
+-    beta)
+-      ATOM_PATH="$USR_DIRECTORY/share/atom-beta/atom"
+-      ;;
+-    nightly)
+-      ATOM_PATH="$USR_DIRECTORY/share/atom-nightly/atom"
+-      ;;
+-    dev)
+-      ATOM_PATH="$USR_DIRECTORY/share/atom-dev/atom"
+-      ;;
+-    *)
+-      ATOM_PATH="$USR_DIRECTORY/share/atom/atom"
+-      ;;
+-  esac
+-
+-  : ${TMPDIR:=/tmp}
+-
+-  [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom"
+-
+-  if [ $EXPECT_OUTPUT ]; then
+-    "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@"
+-    ATOM_EXIT=$?
+-    if [ ${ATOM_EXIT} -eq 0 ] && [ -n "${EXIT_CODE_OVERRIDE}" ]; then
+-      exit "${EXIT_CODE_OVERRIDE}"
+-    else
+-      exit ${ATOM_EXIT}
+-    fi
+-  else
+-    (
+-    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
+-    if [ $? -ne 0 ]; then
+-      cat "$ATOM_HOME/nohup.out"
+-      exit $?
+-    fi
+-    ) &
++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
+ 
+ # Exits this process when Atom is used as $EDITOR

Deleted: fix-license-path.patch
===================================================================
--- fix-license-path.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ fix-license-path.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,22 +0,0 @@
---- a/src/main-process/atom-application.js
-+++ b/src/main-process/atom-application.js
-@@ -716,7 +716,7 @@
-     );
-     this.openPathOnEvent(
-       'application:open-license',
--      path.join(process.resourcesPath, 'LICENSE.md')
-+      '/usr/share/licenses/atom/LICENSE.md'
-     );
- 
-     this.configFile.onDidChange(settings => {
---- a/src/workspace.js
-+++ b/src/workspace.js
-@@ -1300,7 +1300,7 @@
- 
-   // Open Atom's license in the active pane.
-   openLicense() {
--    return this.open(path.join(process.resourcesPath, 'LICENSE.md'));
-+    return this.open('/usr/share/licenses/atom/LICENSE.md');
-   }
- 
-   // Synchronously open the given URI in the active pane. **Only use this method

Copied: atom/repos/community-x86_64/fix-license-path.patch (from rev 511962, atom/trunk/fix-license-path.patch)
===================================================================
--- fix-license-path.patch	                        (rev 0)
+++ fix-license-path.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,22 @@
+--- a/src/main-process/atom-application.js
++++ b/src/main-process/atom-application.js
+@@ -716,7 +716,7 @@
+     );
+     this.openPathOnEvent(
+       'application:open-license',
+-      path.join(process.resourcesPath, 'LICENSE.md')
++      '/usr/share/licenses/atom/LICENSE.md'
+     );
+ 
+     this.configFile.onDidChange(settings => {
+--- a/src/workspace.js
++++ b/src/workspace.js
+@@ -1300,7 +1300,7 @@
+ 
+   // Open Atom's license in the active pane.
+   openLicense() {
+-    return this.open(path.join(process.resourcesPath, 'LICENSE.md'));
++    return this.open('/usr/share/licenses/atom/LICENSE.md');
+   }
+ 
+   // Synchronously open the given URI in the active pane. **Only use this method

Deleted: fix-restart.patch
===================================================================
--- fix-restart.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ fix-restart.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,11 +0,0 @@
---- a/src/main-process/atom-application.js
-+++ b/src/main-process/atom-application.js
-@@ -2047,7 +2047,7 @@
-   }
- 
-   restart() {
--    const args = [];
-+    const args = ['/usr/lib/atom/atom'];
-     if (this.safeMode) args.push('--safe');
-     if (this.logFile != null) args.push(`--log-file=${this.logFile}`);
-     if (this.userDataDir != null)

Copied: atom/repos/community-x86_64/fix-restart.patch (from rev 511962, atom/trunk/fix-restart.patch)
===================================================================
--- fix-restart.patch	                        (rev 0)
+++ fix-restart.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,11 @@
+--- a/src/main-process/atom-application.js
++++ b/src/main-process/atom-application.js
+@@ -2047,7 +2047,7 @@
+   }
+ 
+   restart() {
+-    const args = [];
++    const args = ['/usr/lib/atom/atom'];
+     if (this.safeMode) args.push('--safe');
+     if (this.logFile != null) args.push(`--log-file=${this.logFile}`);
+     if (this.userDataDir != null)

Copied: atom/repos/community-x86_64/git-utils.patch (from rev 511962, atom/trunk/git-utils.patch)
===================================================================
--- git-utils.patch	                        (rev 0)
+++ git-utils.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,11 @@
+--- a/binding.gyp
++++ b/binding.gyp
+@@ -162,6 +162,8 @@
+         'deps/libgit2/src/message.h',
+         'deps/libgit2/src/mwindow.c',
+         'deps/libgit2/src/mwindow.h',
++        'deps/libgit2/src/net.c',
++        'deps/libgit2/src/net.h',
+         'deps/libgit2/src/netops.c',
+         'deps/libgit2/src/netops.h',
+         'deps/libgit2/src/notes.c',

Deleted: no-unsafe-eval-warning.patch
===================================================================
--- no-unsafe-eval-warning.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ no-unsafe-eval-warning.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,11 +0,0 @@
---- a/static/index.js
-+++ b/static/index.js
-@@ -12,6 +12,8 @@
-   let blobStore = null;
-   let useSnapshot = false;
- 
-+  process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true;
-+
-   const startupMarkers = electron.remote.getCurrentWindow().startupMarkers;
- 
-   if (startupMarkers) {

Copied: atom/repos/community-x86_64/no-unsafe-eval-warning.patch (from rev 511962, atom/trunk/no-unsafe-eval-warning.patch)
===================================================================
--- no-unsafe-eval-warning.patch	                        (rev 0)
+++ no-unsafe-eval-warning.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,11 @@
+--- a/static/index.js
++++ b/static/index.js
+@@ -13,6 +13,8 @@
+   let blobStore = null;
+   let useSnapshot = false;
+ 
++  process.env.ELECTRON_DISABLE_SECURITY_WARNINGS = true;
++
+   const startupMarkers = electron.remote.getCurrentWindow().startupMarkers;
+ 
+   if (startupMarkers) {

Deleted: node-env-production.patch
===================================================================
--- node-env-production.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ node-env-production.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,13 +0,0 @@
---- a/static/index.js
-+++ b/static/index.js
-@@ -84,6 +84,10 @@
-         );
-       }
- 
-+      if (!devMode) {
-+        process.env.NODE_ENV = 'production';
-+      }
-+
-       const FileSystemBlobStore = useSnapshot
-         ? snapshotResult.customRequire('../src/file-system-blob-store.js')
-         : require('../src/file-system-blob-store');

Copied: atom/repos/community-x86_64/node-env-production.patch (from rev 511962, atom/trunk/node-env-production.patch)
===================================================================
--- node-env-production.patch	                        (rev 0)
+++ node-env-production.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,13 @@
+--- a/static/index.js
++++ b/static/index.js
+@@ -85,6 +85,10 @@
+         );
+       }
+ 
++      if (!devMode) {
++        process.env.NODE_ENV = 'production';
++      }
++
+       const FileSystemBlobStore = useSnapshot
+         ? snapshotResult.customRequire('../src/file-system-blob-store.js')
+         : require('../src/file-system-blob-store');

Deleted: symbols-view-use-system-ctags.patch
===================================================================
--- symbols-view-use-system-ctags.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ symbols-view-use-system-ctags.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,11 +0,0 @@
---- a/lib/tag-generator.js
-+++ b/lib/tag-generator.js
-@@ -79,7 +79,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'];
- 

Copied: atom/repos/community-x86_64/symbols-view-use-system-ctags.patch (from rev 511962, atom/trunk/symbols-view-use-system-ctags.patch)
===================================================================
--- symbols-view-use-system-ctags.patch	                        (rev 0)
+++ symbols-view-use-system-ctags.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,11 @@
+--- a/lib/tag-generator.js
++++ b/lib/tag-generator.js
+@@ -79,7 +79,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: use-system-apm.patch
===================================================================
--- use-system-apm.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ use-system-apm.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,37 +0,0 @@
---- a/script/lib/run-apm-install.js
-+++ b/script/lib/run-apm-install.js
-@@ -8,10 +8,7 @@
-   const installEnv = Object.assign({}, process.env);
-   // Set resource path so that apm can load metadata related to Atom.
-   installEnv.ATOM_RESOURCE_PATH = CONFIG.repositoryRootPath;
--  // Set our target (Electron) version so that node-pre-gyp can download the
--  // proper binaries.
--  installEnv.npm_config_target = CONFIG.appMetadata.electronVersion;
--  childProcess.execFileSync(CONFIG.getApmBinPath(), [ci ? 'ci' : 'install'], {
-+  childProcess.execFileSync('apm', [ci ? 'ci' : 'install'], {
-     env: installEnv,
-     cwd: packagePath,
-     stdio: stdioOptions || 'inherit'
---- a/src/package-manager.js
-+++ b/src/package-manager.js
-@@ -194,19 +194,7 @@
-       return configPath || this.apmPath;
-     }
- 
--    const commandName = process.platform === 'win32' ? 'apm.cmd' : 'apm';
--    const apmRoot = path.join(process.resourcesPath, 'app', 'apm');
--    this.apmPath = path.join(apmRoot, 'bin', commandName);
--    if (!fs.isFileSync(this.apmPath)) {
--      this.apmPath = path.join(
--        apmRoot,
--        'node_modules',
--        'atom-package-manager',
--        'bin',
--        commandName
--      );
--    }
--    return this.apmPath;
-+    return '/usr/lib/node_modules/atom-package-manager/bin/apm';
-   }
- 
-   // Public: Get the paths being used to look for packages.

Copied: atom/repos/community-x86_64/use-system-apm.patch (from rev 511962, atom/trunk/use-system-apm.patch)
===================================================================
--- use-system-apm.patch	                        (rev 0)
+++ use-system-apm.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,37 @@
+--- a/script/lib/run-apm-install.js
++++ b/script/lib/run-apm-install.js
+@@ -8,10 +8,7 @@
+   const installEnv = Object.assign({}, process.env);
+   // Set resource path so that apm can load metadata related to Atom.
+   installEnv.ATOM_RESOURCE_PATH = CONFIG.repositoryRootPath;
+-  // Set our target (Electron) version so that node-pre-gyp can download the
+-  // proper binaries.
+-  installEnv.npm_config_target = CONFIG.appMetadata.electronVersion;
+-  childProcess.execFileSync(CONFIG.getApmBinPath(), [ci ? 'ci' : 'install'], {
++  childProcess.execFileSync('apm', [ci ? 'ci' : 'install'], {
+     env: installEnv,
+     cwd: packagePath,
+     stdio: stdioOptions || 'inherit'
+--- a/src/package-manager.js
++++ b/src/package-manager.js
+@@ -194,19 +194,7 @@
+       return configPath || this.apmPath;
+     }
+ 
+-    const commandName = process.platform === 'win32' ? 'apm.cmd' : 'apm';
+-    const apmRoot = path.join(process.resourcesPath, 'app', 'apm');
+-    this.apmPath = path.join(apmRoot, 'bin', commandName);
+-    if (!fs.isFileSync(this.apmPath)) {
+-      this.apmPath = path.join(
+-        apmRoot,
+-        'node_modules',
+-        'atom-package-manager',
+-        'bin',
+-        commandName
+-      );
+-    }
+-    return this.apmPath;
++    return '/usr/lib/node_modules/atom-package-manager/bin/apm';
+   }
+ 
+   // Public: Get the paths being used to look for packages.

Deleted: use-system-electron.patch
===================================================================
--- use-system-electron.patch	2019-09-28 10:42:53 UTC (rev 511962)
+++ use-system-electron.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -1,224 +0,0 @@
---- a/package.json
-+++ b/package.json
-@@ -12,7 +12,6 @@
-     "url": "https://github.com/atom/atom/issues"
-   },
-   "license": "MIT",
--  "electronVersion": "3.1.10",
-   "dependencies": {
-     "@atom/nsfw": "1.0.25",
-     "@atom/source-map-support": "^0.3.4",
---- a/script/build
-+++ b/script/build
-@@ -33,7 +33,7 @@
-   .wrap(yargs.terminalWidth())
-   .argv
- 
--const checkChromedriverVersion = require('./lib/check-chromedriver-version')
-+// const checkChromedriverVersion = require('./lib/check-chromedriver-version')
- const cleanOutputDirectory = require('./lib/clean-output-directory')
- const codeSignOnMac = require('./lib/code-sign-on-mac')
- const codeSignOnWindows = require('./lib/code-sign-on-windows')
-@@ -63,12 +63,12 @@
- })
- 
- const CONFIG = require('./config')
--process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
-+// process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
- 
- let binariesPromise = Promise.resolve()
- 
- if (!argv.existingBinaries) {
--  checkChromedriverVersion()
-+  // checkChromedriverVersion()
-   cleanOutputDirectory()
-   copyAssets()
-   transpilePackagesWithCustomTranspilerPaths()
-@@ -87,73 +87,5 @@
- 
- if (!argv.generateApiDocs) {
-   binariesPromise
--    .then(packageApplication)
-     .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath))
--    .then(packagedAppPath => {
--      switch (process.platform) {
--        case 'darwin': {
--          if (argv.codeSign) {
--            codeSignOnMac(packagedAppPath)
--          } else if (argv.testSign) {
--            testSignOnMac(packagedAppPath)
--          } else {
--            console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
--          }
--          break
--        }
--        case 'win32': {
--          if (argv.testSign) {
--            console.log('Test signing is not supported on Windows, skipping.'.gray)
--          }
--
--          if (argv.codeSign) {
--            const executablesToSign = [ path.join(packagedAppPath, 'Atom.exe') ]
--            if (argv.createWindowsInstaller) {
--              executablesToSign.push(path.join(__dirname, 'node_modules', 'electron-winstaller', 'vendor', 'Update.exe'))
--            }
--            codeSignOnWindows(executablesToSign)
--          } else {
--            console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
--          }
--          if (argv.createWindowsInstaller) {
--            return createWindowsInstaller(packagedAppPath)
--              .then((installerPath) => {
--                argv.codeSign && codeSignOnWindows([installerPath])
--                return packagedAppPath
--              })
--          } else {
--            console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray)
--          }
--          break
--        }
--        case '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)
--          }
--          break
--        }
--      }
--
--      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 != null) {
--        installApplication(packagedAppPath, argv.install)
--      } else {
--        console.log('Skipping installation. Specify the --install option to install Atom'.gray)
--      }
--    })
- }
---- a/script/lib/generate-startup-snapshot.js
-+++ b/script/lib/generate-startup-snapshot.js
-@@ -268,14 +268,14 @@
-     } else if (process.platform === 'win32') {
-       nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe');
-     } else {
--      nodeBundledInElectronPath = path.join(packagedAppPath, 'atom');
-+      nodeBundledInElectronPath = 'electron4';
-     }
-     childProcess.execFileSync(
-       nodeBundledInElectronPath,
-       [verifySnapshotScriptPath, snapshotScriptPath],
-       { env: Object.assign({}, process.env, { ELECTRON_RUN_AS_NODE: 1 }) }
-     );
--
-+    /*
-     console.log('Generating startup blob with mksnapshot');
-     childProcess.spawnSync(process.execPath, [
-       path.join(
-@@ -317,5 +317,6 @@
-         destinationPath
-       );
-     }
-+    */
-   });
- };
---- a/script/package.json
-+++ b/script/package.json
-@@ -10,9 +10,7 @@
-     "coffeelint": "1.15.7",
-     "colors": "1.1.2",
-     "donna": "1.0.16",
--    "electron-chromedriver": "^3.0.0",
-     "electron-link": "0.4.0",
--    "electron-mksnapshot": "^3.1.10",
-     "electron-packager": "12.2.0",
-     "electron-winstaller": "2.6.4",
-     "eslint": "^5.16.0",
---- a/src/compile-cache.js
-+++ b/src/compile-cache.js
-@@ -138,7 +138,7 @@ exports.install = function(resourcesPath, nodeRequire) {
-       return {
-         column,
-         line: row,
--        source: path.join(resourcesPath, 'app', 'static', relativePath),
-+        source: path.join(resourcesPath, 'static', relativePath),
-         name: null
-       };
-     }
---- a/src/main-process/atom-window.js
-+++ b/src/main-process/atom-window.js
-@@ -46,7 +46,8 @@
-         // Disable the `auxclick` feature so that `click` events are triggered in
-         // response to a middle-click.
-         // (Ref: https://github.com/atom/atom/pull/12696#issuecomment-290496960)
--        disableBlinkFeatures: 'Auxclick'
-+        disableBlinkFeatures: 'Auxclick',
-+        nodeIntegration: true
-       }
-     };
- 
---- a/src/module-cache.js
-+++ b/src/module-cache.js
-@@ -270,7 +270,7 @@
- function registerBuiltins(devMode) {
-   if (
-     devMode ||
--    !cache.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)
-+    !cache.resourcePath.startsWith('/usr/lib/atom/')
-   ) {
-     const fs = require('fs-plus');
-     const atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js');
---- a/src/package-manager.js
-+++ b/src/package-manager.js 
-@@ -939,7 +939,7 @@
-   isBundledPackagePath(packagePath) {
-     if (
-       this.devMode &&
--      !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)
-+      !this.resourcePath.startsWith('/usr/lib/atom/')
-     ) {
-       return false;
-     }
---- a/src/task-bootstrap.js
-+++ b/src/task-bootstrap.js
-@@ -3,7 +3,7 @@
- 
- const CompileCache = require('./compile-cache');
- CompileCache.setCacheDirectory(compileCachePath);
--CompileCache.install(`${process.resourcesPath}`, require);
-+CompileCache.install('/usr/lib/atom', require);
- 
- const setupGlobals = function() {
-   global.attachEvent = function() {};
---- a/static/index.js
-+++ b/static/index.js
-@@ -39,7 +39,7 @@
-       const devMode =
-         getWindowLoadSettings().devMode ||
-         !getWindowLoadSettings().resourcePath.startsWith(
--          process.resourcesPath + path.sep
-+          '/usr/lib/atom'
-         );
-       useSnapshot = !devMode && typeof snapshotResult !== 'undefined';
- 
-@@ -133,7 +133,7 @@
-       ? snapshotResult.customRequire('../src/compile-cache.js')
-       : require('../src/compile-cache');
-     CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME);
--    CompileCache.install(process.resourcesPath, require);
-+    CompileCache.install('/usr/lib/atom', require);
- 
-     const ModuleCache = useSnapshot
-       ? snapshotResult.customRequire('../src/module-cache.js')

Copied: atom/repos/community-x86_64/use-system-electron.patch (from rev 511962, atom/trunk/use-system-electron.patch)
===================================================================
--- use-system-electron.patch	                        (rev 0)
+++ use-system-electron.patch	2019-09-28 10:44:46 UTC (rev 511963)
@@ -0,0 +1,227 @@
+--- a/package.json
++++ b/package.json
+@@ -12,7 +12,6 @@
+     "url": "https://github.com/atom/atom/issues"
+   },
+   "license": "MIT",
+-  "electronVersion": "3.1.10",
+   "dependencies": {
+     "@atom/nsfw": "1.0.25",
+     "@atom/source-map-support": "^0.3.4",
+--- a/script/build
++++ b/script/build
+@@ -33,7 +33,7 @@
+   .wrap(yargs.terminalWidth())
+   .argv
+ 
+-const checkChromedriverVersion = require('./lib/check-chromedriver-version')
++// const checkChromedriverVersion = require('./lib/check-chromedriver-version')
+ const cleanOutputDirectory = require('./lib/clean-output-directory')
+ const codeSignOnMac = require('./lib/code-sign-on-mac')
+ const codeSignOnWindows = require('./lib/code-sign-on-windows')
+@@ -63,12 +63,12 @@
+ })
+ 
+ const CONFIG = require('./config')
+-process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
++// process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
+ 
+ let binariesPromise = Promise.resolve()
+ 
+ if (!argv.existingBinaries) {
+-  checkChromedriverVersion()
++  // checkChromedriverVersion()
+   cleanOutputDirectory()
+   copyAssets()
+   transpilePackagesWithCustomTranspilerPaths()
+@@ -87,73 +87,5 @@
+ 
+ if (!argv.generateApiDocs) {
+   binariesPromise
+-    .then(packageApplication)
+     .then(packagedAppPath => generateStartupSnapshot(packagedAppPath).then(() => packagedAppPath))
+-    .then(packagedAppPath => {
+-      switch (process.platform) {
+-        case 'darwin': {
+-          if (argv.codeSign) {
+-            codeSignOnMac(packagedAppPath)
+-          } else if (argv.testSign) {
+-            testSignOnMac(packagedAppPath)
+-          } else {
+-            console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+-          }
+-          break
+-        }
+-        case 'win32': {
+-          if (argv.testSign) {
+-            console.log('Test signing is not supported on Windows, skipping.'.gray)
+-          }
+-
+-          if (argv.codeSign) {
+-            const executablesToSign = [ path.join(packagedAppPath, CONFIG.executableName) ]
+-            if (argv.createWindowsInstaller) {
+-              executablesToSign.push(path.join(__dirname, 'node_modules', '@atom', 'electron-winstaller', 'vendor', 'Squirrel.exe'))
+-            }
+-            codeSignOnWindows(executablesToSign)
+-          } else {
+-            console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+-          }
+-          if (argv.createWindowsInstaller) {
+-            return createWindowsInstaller(packagedAppPath)
+-              .then((installerPath) => {
+-                argv.codeSign && codeSignOnWindows([installerPath])
+-                return packagedAppPath
+-              })
+-          } else {
+-            console.log('Skipping creating installer. Specify the --create-windows-installer option to create a Squirrel-based Windows installer.'.gray)
+-          }
+-          break
+-        }
+-        case '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)
+-          }
+-          break
+-        }
+-      }
+-
+-      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 != null) {
+-        installApplication(packagedAppPath, argv.install)
+-      } else {
+-        console.log('Skipping installation. Specify the --install option to install Atom'.gray)
+-      }
+-    })
+ }
+--- a/script/lib/generate-startup-snapshot.js
++++ b/script/lib/generate-startup-snapshot.js
+@@ -265,17 +265,14 @@
+         CONFIG.executableName
+       );
+     } else {
+-      nodeBundledInElectronPath = path.join(
+-        packagedAppPath,
+-        CONFIG.executableName
+-      );
++      nodeBundledInElectronPath = 'electron4';
+     }
+     childProcess.execFileSync(
+       nodeBundledInElectronPath,
+       [verifySnapshotScriptPath, snapshotScriptPath],
+       { env: Object.assign({}, process.env, { ELECTRON_RUN_AS_NODE: 1 }) }
+     );
+-
++    /*
+     console.log('Generating startup blob with mksnapshot');
+     childProcess.spawnSync(process.execPath, [
+       path.join(
+@@ -317,5 +314,6 @@
+         destinationPath
+       );
+     }
++    */
+   });
+ };
+--- a/script/package.json
++++ b/script/package.json
+@@ -10,9 +10,7 @@
+     "coffeelint": "1.15.7",
+     "colors": "1.1.2",
+     "donna": "1.0.16",
+-    "electron-chromedriver": "^3.0.0",
+     "electron-link": "0.4.0",
+-    "electron-mksnapshot": "^3.1.10",
+     "electron-packager": "12.2.0",
+     "@atom/electron-winstaller": "0.0.1",
+     "eslint": "^5.16.0",
+--- a/src/compile-cache.js
++++ b/src/compile-cache.js
+@@ -138,7 +138,7 @@ exports.install = function(resourcesPath, nodeRequire) {
+       return {
+         column,
+         line: row,
+-        source: path.join(resourcesPath, 'app', 'static', relativePath),
++        source: path.join(resourcesPath, 'static', relativePath),
+         name: null
+       };
+     }
+--- a/src/main-process/atom-window.js
++++ b/src/main-process/atom-window.js
+@@ -47,7 +47,8 @@
+         // Disable the `auxclick` feature so that `click` events are triggered in
+         // response to a middle-click.
+         // (Ref: https://github.com/atom/atom/pull/12696#issuecomment-290496960)
+-        disableBlinkFeatures: 'Auxclick'
++        disableBlinkFeatures: 'Auxclick',
++        nodeIntegration: true
+       }
+     };
+ 
+--- a/src/module-cache.js
++++ b/src/module-cache.js
+@@ -270,7 +270,7 @@
+ function registerBuiltins(devMode) {
+   if (
+     devMode ||
+-    !cache.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)
++    !cache.resourcePath.startsWith('/usr/lib/atom/')
+   ) {
+     const fs = require('fs-plus');
+     const atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js');
+--- a/src/package-manager.js
++++ b/src/package-manager.js 
+@@ -939,7 +939,7 @@
+   isBundledPackagePath(packagePath) {
+     if (
+       this.devMode &&
+-      !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)
++      !this.resourcePath.startsWith('/usr/lib/atom/')
+     ) {
+       return false;
+     }
+--- a/src/task-bootstrap.js
++++ b/src/task-bootstrap.js
+@@ -3,7 +3,7 @@
+ 
+ const CompileCache = require('./compile-cache');
+ CompileCache.setCacheDirectory(compileCachePath);
+-CompileCache.install(`${process.resourcesPath}`, require);
++CompileCache.install('/usr/lib/atom', require);
+ 
+ const setupGlobals = function() {
+   global.attachEvent = function() {};
+--- a/static/index.js
++++ b/static/index.js
+@@ -40,7 +40,7 @@
+       const devMode =
+         getWindowLoadSettings().devMode ||
+         !getWindowLoadSettings().resourcePath.startsWith(
+-          process.resourcesPath + path.sep
++          '/usr/lib/atom'
+         );
+       useSnapshot = !devMode && typeof snapshotResult !== 'undefined';
+ 
+@@ -134,7 +134,7 @@
+       ? snapshotResult.customRequire('../src/compile-cache.js')
+       : require('../src/compile-cache');
+     CompileCache.setAtomHomeDirectory(process.env.ATOM_HOME);
+-    CompileCache.install(process.resourcesPath, require);
++    CompileCache.install('/usr/lib/atom', require);
+ 
+     const ModuleCache = useSnapshot
+       ? snapshotResult.customRequire('../src/module-cache.js')


More information about the arch-commits mailing list