Updating

6 files changed, 127 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9da3937961f6..c405b420e796 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Oct 15 14:26:51 UTC 2016
+# Sun Oct 23 15:23:13 UTC 2016
 pkgbase = atom-editor-git
 	pkgdesc = Hackable text editor for the 21st Century, based on web technologies - git channel.
-	pkgver = 1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30208
+	pkgver = 1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30263
 	pkgrel = 1
 	url = https://github.com/atom/atom
 	install = atom-git.install
@@ -26,7 +26,7 @@ pkgbase = atom-editor-git
 	source = atom-git
 	sha256sums = SKIP
 	sha256sums = b172e3f81eb42eeb1ad6ef70300c33a79a2015110ea87c413b5857c9694d10e9
-	sha256sums = 542c10ffb540bd91a441682867517a02a959a20625293f72f33fab71cd3602be
+	sha256sums = 20d3c386dd60e85977511f9138e32921af051fd7e573d3052822219bd7210be9
 
 pkgname = atom-editor-git
 
diff --git a/.SRCINFO.orig b/.SRCINFO.orig
new file mode 100644
index 000000000000..9da3937961f6
--- /dev/null
+++ b/.SRCINFO.orig
@@ -0,0 +1,32 @@
+# Generated by mksrcinfo v8
+# Sat Oct 15 14:26:51 UTC 2016
+pkgbase = atom-editor-git
+	pkgdesc = Hackable text editor for the 21st Century, based on web technologies - git channel.
+	pkgver = 1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30208
+	pkgrel = 1
+	url = https://github.com/atom/atom
+	install = atom-git.install
+	arch = x86_64
+	arch = i686
+	license = MIT
+	makedepends = git
+	makedepends = npm
+	depends = alsa-lib
+	depends = gconf
+	depends = gtk2
+	depends = libgnome-keyring
+	depends = libnotify
+	depends = libxtst
+	depends = nodejs
+	depends = nss
+	depends = python2
+	optdepends = gvfs: file deletion support
+	source = git+https://github.com/atom/atom.git
+	source = atom-git.desktop
+	source = atom-git
+	sha256sums = SKIP
+	sha256sums = b172e3f81eb42eeb1ad6ef70300c33a79a2015110ea87c413b5857c9694d10e9
+	sha256sums = 542c10ffb540bd91a441682867517a02a959a20625293f72f33fab71cd3602be
+
+pkgname = atom-editor-git
+
diff --git a/.SRCINFO.rej b/.SRCINFO.rej
new file mode 100644
index 000000000000..c5ea2cbed374
--- /dev/null
+++ b/.SRCINFO.rej
@@ -0,0 +1,22 @@
+--- .SRCINFO
++++ .SRCINFO
+@@ -1,8 +1,8 @@
+ # Generated by mksrcinfo v8
+-# Sat Oct 15 14:26:51 UTC 2016
++# Sun Oct 23 14:38:06 UTC 2016
+ pkgbase = atom-editor-git
+        pkgdesc = Hackable text editor for the 21st Century, based on web technologies - git channel.
+-       pkgver = 1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30208
++       pkgver = 1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30263
+        pkgrel = 1
+        url = https://github.com/atom/atom
+        install = atom-git.install
+@@ -26,7 +26,7 @@ pkgbase = atom-editor-git
+        source = atom-git
+        sha256sums = SKIP
+        sha256sums = b172e3f81eb42eeb1ad6ef70300c33a79a2015110ea87c413b5857c9694d10e9
+-       sha256sums = 542c10ffb540bd91a441682867517a02a959a20625293f72f33fab71cd3602be
++       sha256sums = 20d3c386dd60e85977511f9138e32921af051fd7e573d3052822219bd7210be9
+ 
+ pkgname = atom-editor-git
+ 
diff --git a/PKGBUILD b/PKGBUILD
index 15884577f641..9ebdb587b269 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@ _language_unix_shell_ver=0.38.2
 _language_vala_modern_ver=0.3.2
 
 pkgname=${_pkgname}-editor-${_version}
-pkgver=1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30208
+pkgver=1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30263
 pkgrel=1
 pkgdesc='Hackable text editor for the 21st Century, based on web technologies - git channel.'
 arch=('x86_64' 'i686')
@@ -30,7 +30,7 @@ source=("git+${url}.git"
 "${_pkgname}-${_version}")
 sha256sums=('SKIP'
             'b172e3f81eb42eeb1ad6ef70300c33a79a2015110ea87c413b5857c9694d10e9'
-            '542c10ffb540bd91a441682867517a02a959a20625293f72f33fab71cd3602be')
+            '20d3c386dd60e85977511f9138e32921af051fd7e573d3052822219bd7210be9')
 
 pkgver() {
   cd $srcdir/$_pkgname
diff --git a/atom-git b/atom-git
index f5dd9498311d..69ef3f07024a 100644
--- a/atom-git
+++ b/atom-git
@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# Always disable environment shell grab, causes lockups
+export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
+
 while getopts ":wtfvh-:" opt; do
   case "$opt" in
     -)
diff --git a/noel.patch b/noel.patch
new file mode 100644
index 000000000000..5ad891a5159b
--- /dev/null
+++ b/noel.patch
@@ -0,0 +1,64 @@
+ .SRCINFO | 6 +++---
+ PKGBUILD | 4 ++--
+ atom-git | 4 ++++
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/.SRCINFO b/.SRCINFO
+index 9da3937..dbdca45 100644
+--- a/.SRCINFO
++++ b/.SRCINFO
+@@ -1,8 +1,8 @@
+ # Generated by mksrcinfo v8
+-# Sat Oct 15 14:26:51 UTC 2016
++# Sun Oct 23 14:38:06 UTC 2016
+ pkgbase = atom-editor-git
+        pkgdesc = Hackable text editor for the 21st Century, based on web technologies - git channel.
+-       pkgver = 1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30208
++       pkgver = 1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30263
+        pkgrel = 1
+        url = https://github.com/atom/atom
+        install = atom-git.install
+@@ -26,7 +26,7 @@ pkgbase = atom-editor-git
+        source = atom-git
+        sha256sums = SKIP
+        sha256sums = b172e3f81eb42eeb1ad6ef70300c33a79a2015110ea87c413b5857c9694d10e9
+-       sha256sums = 542c10ffb540bd91a441682867517a02a959a20625293f72f33fab71cd3602be
++       sha256sums = 20d3c386dd60e85977511f9138e32921af051fd7e573d3052822219bd7210be9
+
+ pkgname = atom-editor-git
+
+diff --git a/PKGBUILD b/PKGBUILD
+index 1588457..9ebdb58 100644
+--- a/PKGBUILD
++++ b/PKGBUILD
+@@ -15,7 +15,7 @@ _language_unix_shell_ver=0.38.2
+ _language_vala_modern_ver=0.3.2
+
+ pkgname=${_pkgname}-editor-${_version}
+-pkgver=1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30208
++pkgver=1.13.0.dev.i1.18.3.l0.5.1.m0.92.2.p1.0.0.u0.38.2.v0.3.2.c30263
+ pkgrel=1
+ pkgdesc='Hackable text editor for the 21st Century, based on web technologies - git channel.'
+ arch=('x86_64' 'i686')
+@@ -30,7 +30,7 @@ source=("git+${url}.git"
+ "${_pkgname}-${_version}")
+ sha256sums=('SKIP'
+             'b172e3f81eb42eeb1ad6ef70300c33a79a2015110ea87c413b5857c9694d10e9'
+-            '542c10ffb540bd91a441682867517a02a959a20625293f72f33fab71cd3602be')
++            '20d3c386dd60e85977511f9138e32921af051fd7e573d3052822219bd7210be9')
+
+ pkgver() {
+   cd $srcdir/$_pkgname
+diff --git a/atom-git b/atom-git
+index f5dd949..69ef3f0 100644
+--- a/atom-git
++++ b/atom-git
+@@ -1,4 +1,8 @@
+ #!/bin/bash
++
++# Always disable environment shell grab, causes lockups
++export ATOM_DISABLE_SHELLING_OUT_FOR_ENVIRONMENT=true
++
+ while getopts ":wtfvh-:" opt; do
+   case "$opt" in
+     -)