From 6b933047f46efec1aa747570f945344254227457 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Dec 2017 17:25:28 +0000 Subject: gentoo resync : 15.12.2017 --- app-editors/atom/files/atom-1.13-apm-path.patch | 16 -------- app-editors/atom/files/atom-apm-path-r1.patch | 16 -------- app-editors/atom/files/atom-fix-app-restart.patch | 12 ------ app-editors/atom/files/atom-license-path.patch | 11 ------ app-editors/atom/files/atom-marker-layer.patch | 11 ------ .../atom/files/atom-unbundle-electron.patch | 45 ---------------------- 6 files changed, 111 deletions(-) delete mode 100644 app-editors/atom/files/atom-1.13-apm-path.patch delete mode 100644 app-editors/atom/files/atom-apm-path-r1.patch delete mode 100644 app-editors/atom/files/atom-fix-app-restart.patch delete mode 100644 app-editors/atom/files/atom-license-path.patch delete mode 100644 app-editors/atom/files/atom-marker-layer.patch delete mode 100644 app-editors/atom/files/atom-unbundle-electron.patch (limited to 'app-editors/atom/files') diff --git a/app-editors/atom/files/atom-1.13-apm-path.patch b/app-editors/atom/files/atom-1.13-apm-path.patch deleted file mode 100644 index 0dcb7914c669..000000000000 --- a/app-editors/atom/files/atom-1.13-apm-path.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/build/app/src/config-schema.js b/build/app/src/config-schema.js -index 1307db6..d6a1ba4 100644 ---- a/build/app/src/config-schema.js -+++ b/build/app/src/config-schema.js -@@ -21,6 +21,11 @@ var configSchema = { - core: { - type: 'object', - properties: { -+ apmPath: { -+ type: 'string', -+ 'default': '/usr/bin/apm{{ATOM_SUFFIX}}', -+ description: 'Path to apm executable.' -+ }, - ignoredNames: { - type: 'array', - 'default': ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db'], diff --git a/app-editors/atom/files/atom-apm-path-r1.patch b/app-editors/atom/files/atom-apm-path-r1.patch deleted file mode 100644 index c30987d8a300..000000000000 --- a/app-editors/atom/files/atom-apm-path-r1.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/src/config-schema.js b/src/config-schema.js -index 39f0585..24ee2de 100644 ---- a/src/config-schema.js -+++ b/src/config-schema.js -@@ -5,6 +5,11 @@ const configSchema = { - core: { - type: 'object', - properties: { -+ apmPath: { -+ type: 'string', -+ "default": '/usr/bin/apm{{ATOM_SUFFIX}}', -+ description: 'Path to apm executable.' -+ }, - ignoredNames: { - type: 'array', - default: ['.git', '.hg', '.svn', '.DS_Store', '._*', 'Thumbs.db', 'desktop.ini'], diff --git a/app-editors/atom/files/atom-fix-app-restart.patch b/app-editors/atom/files/atom-fix-app-restart.patch deleted file mode 100644 index 1bfa1ed429a0..000000000000 --- a/app-editors/atom/files/atom-fix-app-restart.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/atom-application.js.orig b/atom-application.js -index 92d985f..9a120e6 100644 ---- a/build/app/src/main-process/atom-application.js -+++ b/build/app/src/main-process/atom-application.js -@@ -1178,6 +1178,7 @@ - AtomApplication.prototype.restart = function() { - var args; - args = []; -+ args.push("--app=" + this.resourcePath); - if (this.safeMode) { - args.push("--safe"); - } diff --git a/app-editors/atom/files/atom-license-path.patch b/app-editors/atom/files/atom-license-path.patch deleted file mode 100644 index 0ddf993448a5..000000000000 --- a/app-editors/atom/files/atom-license-path.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build/app/src/main-process/atom-application.js -+++ b/build/app/src/main-process/atom-application.js -@@ -406,7 +406,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.disposable.add(ipcHelpers.on(app, 'before-quit', (function(_this) { - return function(event) { - if (!_this.quitting) { diff --git a/app-editors/atom/files/atom-marker-layer.patch b/app-editors/atom/files/atom-marker-layer.patch deleted file mode 100644 index 2d797aa293da..000000000000 --- a/app-editors/atom/files/atom-marker-layer.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/build/app/node_modules/text-buffer/lib/marker-layer.js ---- b/build/app/node_modules/text-buffer/lib/marker-layer.js -@@ -192,7 +192,7 @@ - return function(markerId) { - var marker; - marker = _this.markersById[markerId]; -- if (!marker.matchesParams(params)) { -+ if (marker == null || !marker.matchesParams(params)) { - return; - } - return result.push(marker); diff --git a/app-editors/atom/files/atom-unbundle-electron.patch b/app-editors/atom/files/atom-unbundle-electron.patch deleted file mode 100644 index 296b17b0c157..000000000000 --- a/app-editors/atom/files/atom-unbundle-electron.patch +++ /dev/null @@ -1,45 +0,0 @@ -From ea6d1be3558d7610ccc82b3a44dd30657a686639 Mon Sep 17 00:00:00 2001 -From: Elvis Pranskevichus -Date: Thu, 27 Jul 2017 13:18:54 -0400 -Subject: [PATCH] Unbundle electron - ---- - atom.sh | 13 ++++++------- - 1 file changed, 6 insertions(+), 7 deletions(-) - -diff --git a/atom.sh b/atom.sh -index 6b0e94430..ea8e0dc2e 100755 ---- a/atom.sh -+++ b/atom.sh -@@ -102,11 +102,10 @@ 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 -+ export NPM_CONFIG_NODEDIR="{{NPM_CONFIG_NODEDIR}}" -+ export ATOM_RESOURCE_PATH="{{ATOM_RESOURCE_PATH}}" -+ export LOCAL_GIT_DIRECTORY="/usr" -+ ATOM_PATH="{{ATOM_PATH}}" - - ATOM_HOME="${ATOM_HOME:-$HOME/.atom}" - mkdir -p "$ATOM_HOME" -@@ -116,11 +115,11 @@ elif [ $OS == 'Linux' ]; then - [ -x "$ATOM_PATH" ] || ATOM_PATH="$TMPDIR/atom-build/Atom/atom" - - if [ $EXPECT_OUTPUT ]; then -- "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" -+ "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" - exit $? - else - ( -- nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1 -+ nohup "$ATOM_PATH" --app="$ATOM_RESOURCE_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1 - if [ $? -ne 0 ]; then - cat "$ATOM_HOME/nohup.out" - exit $? --- -2.13.3 -- cgit v1.2.3