:arrow_up: 1.11.1

3 files changed, 14 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8ce5adad4b0f..7dcfd7a3d383 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = atom-editor-bin
 	pkgdesc = Chrome-based text editor from Github - Precompiled binary from official repository
-	pkgver = 1.10.2
+	pkgver = 1.11.1
 	pkgrel = 1
 	url = https://github.com/atom/atom
 	install = atom-editor-bin.install
@@ -18,15 +18,16 @@ pkgbase = atom-editor-bin
 	depends = alsa-lib
 	depends = libgnome-keyring
 	optdepends = gvfs
+	provides = atom
 	conflicts = atom-editor
 	conflicts = atom-editor-git
 	conflicts = atom-editor-git-tagged
 	options = !strip
-	source = atom-amd64-v1.10.2.deb::https://atom-installer.github.com/v1.10.2/atom-amd64.deb
+	source = atom-amd64-v1.11.1.deb::https://atom-installer.github.com/v1.11.1/atom-amd64.deb
 	source = atom-python.patch
 	source = startupwmclass.patch
-	md5sums = ab5bfe585b59ef6bed817c88dbbc1841
-	md5sums = 9c752be551429c6ce5946d4fcae24464
+	md5sums = 29c246364abaf2899066265ec7e22b69
+	md5sums = 22b4763c2e8607f0ea46311ec13da9ff
 	md5sums = d472858970fc4ba6f63197729b65607c
 
 pkgname = atom-editor-bin
diff --git a/PKGBUILD b/PKGBUILD
index aa4f7d397376..b2f7f834224e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,20 +6,22 @@
 # Upstream URL: https://github.com/atom/atom
 
 pkgname=atom-editor-bin
-pkgver=1.10.2
+pkgver=1.11.1
 pkgrel=1
 pkgdesc="Chrome-based text editor from Github - Precompiled binary from official repository"
 arch=('x86_64')
 url="https://github.com/atom/atom"
 license=('MIT')
+provides=('atom')
+conflicts=('atom')
 options=(!strip)
 depends=('git' 'gconf' 'gtk2' 'libnotify' 'libxtst' 'nss' 'python2' 'xdg-utils' 'desktop-file-utils' 'alsa-lib' 'libgnome-keyring')
 optdepends=('gvfs')
 conflicts=('atom-editor' 'atom-editor-git' 'atom-editor-git-tagged')
 install=$pkgname.install
 
-md5sums=('ab5bfe585b59ef6bed817c88dbbc1841'
-         '9c752be551429c6ce5946d4fcae24464'
+md5sums=('29c246364abaf2899066265ec7e22b69'
+         '22b4763c2e8607f0ea46311ec13da9ff'
          'd472858970fc4ba6f63197729b65607c')
 source=("atom-amd64-v${pkgver}.deb::https://atom-installer.github.com/v${pkgver}/atom-amd64.deb"
          atom-python.patch
@@ -27,7 +29,9 @@ source=("atom-amd64-v${pkgver}.deb::https://atom-installer.github.com/v${pkgver}
 
 package() {
   bsdtar xf data.tar.gz
+  printf "Applying atom-python.patch\n"
   patch -p1 < "${srcdir}"/atom-python.patch
+  printf "Applying startupwmclass.patch\n"
   patch -p1 < "${srcdir}"/startupwmclass.patch
   sed -i 's|env PYTHON=python2 GTK_IM_MODULE= QT_IM_MODULE= XMODIFIERS= /usr/share/atom/atom|/usr/bin/atom|' usr/share/applications/atom.desktop
   chmod -R g-w usr
diff --git a/atom-python.patch b/atom-python.patch
index e54a2fcf78b5..2880faf37597 100644
--- a/atom-python.patch
+++ b/atom-python.patch
@@ -1,42 +1,11 @@
---- a/usr/bin/atom
-+++ b/usr/bin/atom
-@@ -1,5 +1,13 @@
- #!/bin/bash
-
-+# Allow users to override command-line options
-+if [[ -f ~/.config/atom-editor-flags.conf ]]; then
-+  ATOM_USER_FLAGS="$(cat ~/.config/atom-editor-flags.conf)"
-+fi
-+
-+export PYTHON=python2
-+unset GTK_IM_MODULE QT_IM_MODULE XMODIFIERS
-+
- if [ "$(uname)" == 'Darwin' ]; then
-   OS='Mac'
- elif [ "$(expr substr $(uname -s) 1 5)" == 'Linux' ]; then
-@@ -99,11 +107,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" --executed-from="$(pwd)" --pid=$$ $ATOM_USER_FLAGS "$@"
-     exit $?
-   else
-     (
--    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ "$@" > "$ATOM_HOME/nohup.out" 2>&1
-+    nohup "$ATOM_PATH" --executed-from="$(pwd)" --pid=$$ $ATOM_USER_FLAGS "$@" > "$ATOM_HOME/nohup.out" 2>&1
-     if [ $? -ne 0 ]; then
-       cat "$ATOM_HOME/nohup.out"
-       exit $?
-
 --- a/usr/share/applications/atom.desktop
 +++ b/usr/share/applications/atom.desktop
 @@ -2,7 +2,7 @@
  Name=Atom
  Comment=A hackable text editor for the 21st Century.
  GenericName=Text Editor
--Exec=/usr/share/atom/atom %U
-+Exec=env PYTHON=python2 GTK_IM_MODULE= QT_IM_MODULE= XMODIFIERS= /usr/share/atom/atom %U
+-Exec=/usr/share/atom/atom %F
++Exec=env PYTHON=python2 /usr/share/atom/atom %U
  Icon=atom
  Type=Application
  StartupNotify=true