[arch-commits] Commit in atom/repos (13 files)
Nicola Squartini
tensor5 at archlinux.org
Sat Jun 22 10:23:46 UTC 2019
Date: Saturday, June 22, 2019 @ 10:23:45
Author: tensor5
Revision: 482754
archrelease: copy trunk to community-staging-x86_64
Added:
atom/repos/community-staging-x86_64/
atom/repos/community-staging-x86_64/PKGBUILD
(from rev 482753, atom/trunk/PKGBUILD)
atom/repos/community-staging-x86_64/atom.js
(from rev 482753, atom/trunk/atom.js)
atom/repos/community-staging-x86_64/dugite-use-system-git.patch
(from rev 482753, atom/trunk/dugite-use-system-git.patch)
atom/repos/community-staging-x86_64/electron-3.patch
(from rev 482753, atom/trunk/electron-3.patch)
atom/repos/community-staging-x86_64/fix-atom-sh.patch
(from rev 482753, atom/trunk/fix-atom-sh.patch)
atom/repos/community-staging-x86_64/fix-license-path.patch
(from rev 482753, atom/trunk/fix-license-path.patch)
atom/repos/community-staging-x86_64/fix-restart.patch
(from rev 482753, atom/trunk/fix-restart.patch)
atom/repos/community-staging-x86_64/no-unsafe-eval-warning.patch
(from rev 482753, atom/trunk/no-unsafe-eval-warning.patch)
atom/repos/community-staging-x86_64/node-env-production.patch
(from rev 482753, atom/trunk/node-env-production.patch)
atom/repos/community-staging-x86_64/symbols-view-use-system-ctags.patch
(from rev 482753, atom/trunk/symbols-view-use-system-ctags.patch)
atom/repos/community-staging-x86_64/use-system-apm.patch
(from rev 482753, atom/trunk/use-system-apm.patch)
atom/repos/community-staging-x86_64/use-system-electron.patch
(from rev 482753, atom/trunk/use-system-electron.patch)
-------------------------------------+
PKGBUILD | 124 +++++++++++++++++
atom.js | 33 ++++
dugite-use-system-git.patch | 33 ++++
electron-3.patch | 11 +
fix-atom-sh.patch | 152 +++++++++++++++++++++
fix-license-path.patch | 22 +++
fix-restart.patch | 11 +
no-unsafe-eval-warning.patch | 11 +
node-env-production.patch | 13 +
symbols-view-use-system-ctags.patch | 11 +
use-system-apm.patch | 32 ++++
use-system-electron.patch | 243 ++++++++++++++++++++++++++++++++++
12 files changed, 696 insertions(+)
Copied: atom/repos/community-staging-x86_64/PKGBUILD (from rev 482753, atom/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2019-06-22 10:23:45 UTC (rev 482754)
@@ -0,0 +1,124 @@
+# Maintainer: Nicola Squartini <tensor5 at gmail.com>
+
+pkgname=atom
+pkgver=1.38.2
+pkgrel=2
+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'
+ 'electron-3.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=('b78c83975d9626752e05b14a27e5ad1bba623e887082e1c6f056902fd3fa7207'
+ 'd286e0766e47cfea73cd207abb9d6f7375846688823e72732c871a852b4b261d'
+ '530b46d31df0f5e8f5881e1608a66fe75d549092a6db2e72ba3ad69c48714153'
+ '75a672adc0237ea8c93ff67d8296eb73b87792b7b58cdaef7bf596fb6edd073f'
+ 'b3d3706519556a59ba557b695017c9debe8b23efe2782cdb440131520bc0540d'
+ '0ffc18cdb458f6eee97a41c34c0d91103ce1579ec3d6a4067be5556977c189f5'
+ '5a52859d5ceaa6f9d26fa657d6d728dee6e24684914cfc1d5736ccd9793fb86a'
+ 'bb474831629575636b1129e9f5e64c72a62926757b4b85f0c51b47b91fffd6ae'
+ '85612ba035047b8599692ce458b903ef2204995e102b3ff47dc05923d6c2e7d8'
+ '3c68e6b3751313e1d386e721f8f819fb051351fb2cf8e753b1d773a0f475fef8'
+ '53f43c9328a66e24b3467a0a06d9dfde83475f7e54251bf7a523beafaa043806'
+ 'e8f4c7514f4d20a05cf27e21aa8ace9294fa8ad45f8ced15361106f4aad708b9')
+
+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
+
+ # Fix for Electron 3
+ patch -Np1 -i "${srcdir}"/electron-3.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-staging-x86_64/atom.js (from rev 482753, atom/trunk/atom.js)
===================================================================
--- community-staging-x86_64/atom.js (rev 0)
+++ community-staging-x86_64/atom.js 2019-06-22 10:23:45 UTC (rev 482754)
@@ -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);
Copied: atom/repos/community-staging-x86_64/dugite-use-system-git.patch (from rev 482753, atom/trunk/dugite-use-system-git.patch)
===================================================================
--- community-staging-x86_64/dugite-use-system-git.patch (rev 0)
+++ community-staging-x86_64/dugite-use-system-git.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -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 };
Copied: atom/repos/community-staging-x86_64/electron-3.patch (from rev 482753, atom/trunk/electron-3.patch)
===================================================================
--- community-staging-x86_64/electron-3.patch (rev 0)
+++ community-staging-x86_64/electron-3.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -0,0 +1,11 @@
+--- a/src/text-editor-component.js
++++ b/src/text-editor-component.js
+@@ -4446,7 +4446,7 @@
+
+ if (element) {
+ element.className = className || ''
+- element.styleMap.forEach((value, key) => {
++ element.attributeStyleMap.forEach((value, key) => {
+ if (!style || style[key] == null) element.style[key] = ''
+ })
+ if (style) Object.assign(element.style, style)
Copied: atom/repos/community-staging-x86_64/fix-atom-sh.patch (from rev 482753, atom/trunk/fix-atom-sh.patch)
===================================================================
--- community-staging-x86_64/fix-atom-sh.patch (rev 0)
+++ community-staging-x86_64/fix-atom-sh.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -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
Copied: atom/repos/community-staging-x86_64/fix-license-path.patch (from rev 482753, atom/trunk/fix-license-path.patch)
===================================================================
--- community-staging-x86_64/fix-license-path.patch (rev 0)
+++ community-staging-x86_64/fix-license-path.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -0,0 +1,22 @@
+--- a/src/main-process/atom-application.js
++++ b/src/main-process/atom-application.js
+@@ -596,7 +596,7 @@
+ this.openPathOnEvent('application:open-your-keymap', 'atom://.atom/keymap')
+ this.openPathOnEvent('application:open-your-snippets', 'atom://.atom/snippets')
+ this.openPathOnEvent('application:open-your-stylesheet', 'atom://.atom/stylesheet')
+- this.openPathOnEvent('application:open-license', path.join(process.resourcesPath, 'LICENSE.md'))
++ this.openPathOnEvent('application:open-license', '/usr/share/licenses/atom/LICENSE.md')
+
+ this.configFile.onDidChange(settings => {
+ for (let window of this.getAllWindows()) {
+--- a/src/workspace.js
++++ b/src/workspace.js
+@@ -1136,7 +1136,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-staging-x86_64/fix-restart.patch (from rev 482753, atom/trunk/fix-restart.patch)
===================================================================
--- community-staging-x86_64/fix-restart.patch (rev 0)
+++ community-staging-x86_64/fix-restart.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -0,0 +1,11 @@
+--- a/src/main-process/atom-application.js
++++ b/src/main-process/atom-application.js
+@@ -1656,7 +1656,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) args.push(`--user-data-dir=${this.userDataDir}`)
Copied: atom/repos/community-staging-x86_64/no-unsafe-eval-warning.patch (from rev 482753, atom/trunk/no-unsafe-eval-warning.patch)
===================================================================
--- community-staging-x86_64/no-unsafe-eval-warning.patch (rev 0)
+++ community-staging-x86_64/no-unsafe-eval-warning.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -0,0 +1,11 @@
+--- a/static/index.js
++++ b/static/index.js
+@@ -16,6 +16,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-staging-x86_64/node-env-production.patch (from rev 482753, atom/trunk/node-env-production.patch)
===================================================================
--- community-staging-x86_64/node-env-production.patch (rev 0)
+++ community-staging-x86_64/node-env-production.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -0,0 +1,13 @@
+--- a/static/index.js
++++ b/static/index.js
+@@ -66,6 +66,10 @@
+ snapshotResult.setGlobals(global, process, window, document, console, require)
+ }
+
++ if (!devMode) {
++ process.env.NODE_ENV = 'production'
++ }
++
+ const FileSystemBlobStore = useSnapshot ? snapshotResult.customRequire('../src/file-system-blob-store.js') : require('../src/file-system-blob-store')
+ blobStore = FileSystemBlobStore.load(path.join(process.env.ATOM_HOME, 'blob-store'))
+
Copied: atom/repos/community-staging-x86_64/symbols-view-use-system-ctags.patch (from rev 482753, atom/trunk/symbols-view-use-system-ctags.patch)
===================================================================
--- community-staging-x86_64/symbols-view-use-system-ctags.patch (rev 0)
+++ community-staging-x86_64/symbols-view-use-system-ctags.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -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'];
+
Copied: atom/repos/community-staging-x86_64/use-system-apm.patch (from rev 482753, atom/trunk/use-system-apm.patch)
===================================================================
--- community-staging-x86_64/use-system-apm.patch (rev 0)
+++ community-staging-x86_64/use-system-apm.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -0,0 +1,32 @@
+--- a/script/lib/run-apm-install.js
++++ b/script/lib/run-apm-install.js
+@@ -8,11 +8,8 @@
+ 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(),
++ 'apm',
+ ['--loglevel=error', ci ? 'ci' : 'install'],
+ {env: installEnv, cwd: packagePath, stdio: stdioOptions || 'inherit'}
+ )
+--- a/src/package-manager.js
++++ b/src/package-manager.js
+@@ -169,13 +169,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-staging-x86_64/use-system-electron.patch (from rev 482753, atom/trunk/use-system-electron.patch)
===================================================================
--- community-staging-x86_64/use-system-electron.patch (rev 0)
+++ community-staging-x86_64/use-system-electron.patch 2019-06-22 10:23:45 UTC (rev 482754)
@@ -0,0 +1,243 @@
+--- a/package.json
++++ b/package.json
+@@ -12,7 +12,6 @@
+ "url": "https://github.com/atom/atom/issues"
+ },
+ "license": "MIT",
+- "electronVersion": "2.0.18",
+ "dependencies": {
+ "@atom/nsfw": "1.0.22",
+ "@atom/source-map-support": "^0.3.4",
+--- a/script/build
++++ b/script/build
+@@ -32,7 +32,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 codeSignOnWindows = require('./lib/code-sign-on-windows')
+@@ -61,12 +60,11 @@
+ })
+
+ const CONFIG = require('./config')
+-process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
++// process.env.ELECTRON_VERSION = CONFIG.appMetadata.electronVersion
+
+ let binariesPromise = Promise.resolve()
+
+ if (!argv.existingBinaries) {
+- checkChromedriverVersion()
+ cleanOutputDirectory()
+ copyAssets()
+ transpilePackagesWithCustomTranspilerPaths()
+@@ -85,67 +83,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 {
+- console.log('Skipping code-signing. Specify the --code-sign option to perform code-signing'.gray)
+- }
+- break
+- }
+- case 'win32': {
+- 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
+@@ -97,7 +97,7 @@
+ } else if (process.platform === 'win32') {
+ nodeBundledInElectronPath = path.join(packagedAppPath, 'atom.exe')
+ } else {
+- nodeBundledInElectronPath = path.join(packagedAppPath, 'atom')
++ nodeBundledInElectronPath = 'electron4'
+ }
+ childProcess.execFileSync(
+ nodeBundledInElectronPath,
+@@ -105,6 +105,7 @@
+ {env: Object.assign({}, process.env, {ELECTRON_RUN_AS_NODE: 1})}
+ )
+
++/*
+ const generatedStartupBlobPath = path.join(CONFIG.buildOutputPath, 'snapshot_blob.bin')
+ console.log(`Generating startup blob at "${generatedStartupBlobPath}"`)
+ childProcess.execFileSync(
+@@ -122,5 +123,6 @@
+ console.log(`Moving generated startup blob into "${startupBlobDestinationPath}"`)
+ fs.unlinkSync(startupBlobDestinationPath)
+ fs.renameSync(generatedStartupBlobPath, startupBlobDestinationPath)
++*/
+ })
+ }
+--- a/script/package.json
++++ b/script/package.json
+@@ -9,9 +9,7 @@
+ "coffeelint": "1.15.7",
+ "colors": "1.1.2",
+ "donna": "1.0.16",
+- "electron-chromedriver": "~2.0",
+ "electron-link": "0.4.0",
+- "electron-mksnapshot": "~2.0",
+ "electron-packager": "7.3.0",
+ "electron-winstaller": "2.6.4",
+ "eslint-config-standard": "^12.0.0",
+--- a/src/compile-cache.js
++++ b/src/compile-cache.js
+@@ -122,7 +122,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
+ }
+ }
+ function getConfig () {
+--- a/src/main-process/atom-protocol-handler.js
++++ b/src/main-process/atom-protocol-handler.js
+@@ -1,5 +1,6 @@
+ const {protocol} = require('electron')
+ const fs = require('fs')
++const {statSyncNoException} = require('fs-plus')
+ const path = require('path')
+
+ // Handles requests with 'atom' protocol.
+@@ -37,14 +38,14 @@
+ let filePath
+ if (relativePath.indexOf('assets/') === 0) {
+ const assetsPath = path.join(process.env.ATOM_HOME, relativePath)
+- const stat = fs.statSyncNoException(assetsPath)
++ const stat = statSyncNoException(assetsPath)
+ if (stat && stat.isFile()) filePath = assetsPath
+ }
+
+ if (!filePath) {
+ for (let loadPath of this.loadPaths) {
+ filePath = path.join(loadPath, relativePath)
+- const stat = fs.statSyncNoException(filePath)
++ const stat = statSyncNoException(filePath)
+ if (stat && stat.isFile()) break
+ }
+ }
+--- a/src/main-process/atom-window.js
++++ b/src/main-process/atom-window.js
+@@ -43,7 +43,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
+@@ -227,7 +227,7 @@
+ }
+
+ function registerBuiltins (devMode) {
+- if (devMode || !cache.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) {
++ if (devMode || !cache.resourcePath.startsWith('/usr/lib/atom/')) {
+ const fs = require('fs-plus')
+ const atomJsPath = path.join(cache.resourcePath, 'exports', 'atom.js')
+ if (fs.isFileSync(atomJsPath)) { cache.builtins.atom = atomJsPath }
+--- a/src/package-manager.js
++++ b/src/package-manager.js
+@@ -825,7 +825,7 @@ module.exports = class PackageManager {
+ }
+
+ isBundledPackagePath (packagePath) {
+- if (this.devMode && !this.resourcePath.startsWith(`${process.resourcesPath}${path.sep}`)) {
++ if (this.devMode && !this.resourcePath.startsWith('/usr/lib/atom/')) {
+ return false
+ }
+
+--- a/src/task-bootstrap.js
++++ b/src/task-bootstrap.js
+@@ -3,7 +3,7 @@ const [compileCachePath, taskPath] = process.argv.slice(2)
+
+ 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
+@@ -36,7 +36,7 @@
+ process.resourcesPath = path.normalize(process.resourcesPath)
+
+ setupAtomHome()
+- const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith(process.resourcesPath + path.sep)
++ const devMode = getWindowLoadSettings().devMode || !getWindowLoadSettings().resourcePath.startsWith('/usr/lib/atom')
+ useSnapshot = !devMode && typeof snapshotResult !== 'undefined'
+
+ if (devMode) {
+@@ -107,7 +107,7 @@
+ function setupWindow () {
+ const CompileCache = useSnapshot ? 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') : require('../src/module-cache')
+ ModuleCache.register(getWindowLoadSettings())
More information about the arch-commits
mailing list