From 752f1c62c279f134d26ca89f6773a0571b7bbbf2 Mon Sep 17 00:00:00 2001
From: Wilson Birney <wpb@360scada.com>
Date: Mon, 1 Jan 2018 18:17:30 -0500
Subject: [PATCH] atom: update to 1.23.1

Closes: #10341 [via git-merge-pr]
---
 srcpkgs/atom/patches/desktop.patch | 20 -----------
 srcpkgs/atom/template              | 58 ++++--------------------------
 2 files changed, 6 insertions(+), 72 deletions(-)
 delete mode 100644 srcpkgs/atom/patches/desktop.patch

diff --git a/srcpkgs/atom/patches/desktop.patch b/srcpkgs/atom/patches/desktop.patch
deleted file mode 100644
index 4f3b064af6d..00000000000
--- a/srcpkgs/atom/patches/desktop.patch
+++ /dev/null
@@ -1,20 +0,0 @@
----
- resources/linux/atom.desktop.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git resources/linux/atom.desktop.in resources/linux/atom.desktop.in
-index 1969e3f..71c19ca 100644
---- resources/linux/atom.desktop.in
-+++ resources/linux/atom.desktop.in
-@@ -2,8 +2,8 @@
- Name=Atom
- Comment=<%= description %>
- GenericName=Text Editor
--Exec=<%= installDir %>/share/<%= appFileName %>/atom %F
--Icon=<%= iconPath %>
-+Exec=/usr/share/atom/atom %U
-+Icon=/usr/share/atom/resources/app/resources/atom.png
- Type=Application
- StartupNotify=true
- Categories=GNOME;GTK;Utility;TextEditor;Development;
---
diff --git a/srcpkgs/atom/template b/srcpkgs/atom/template
index 13679abf8be..34598699665 100644
--- a/srcpkgs/atom/template
+++ b/srcpkgs/atom/template
@@ -1,66 +1,20 @@
 # Template file for 'atom'
 pkgname=atom
-version=1.22.0
-revision=2
+version=1.23.1
+revision=1
 nocross=yes
 nostrip=yes
 hostmakedepends="git pkg-config python-devel nodejs curl gtk+ libXtst libXScrnSaver nss python alsa-lib"
 makedepends="python-devel GConf-devel libgnome-keyring-devel libX11-devel libxkbfile-devel libsecret-devel"
 short_desc="Chrome-based text editor from Github"
-maintainer="Orphaned <orphan@voidlinux.eu>"
+maintainer="Wilson Birney <wpb@360scada.com>"
 license="MIT"
 homepage="https://atom.io"
-distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz"
-checksum=28f2db2c92e2ee12fedbcf8e21f91df7a8308f05babc7b93f196f61f0b975103
-
+distfiles="https://github.com/atom/atom/archive/v${version}.tar.gz"
+checksum=56147093f1b8fd98e1cdf9671888694b732ed6b83f7641c199ddbc54df76544f
 only_for_archs="i686 x86_64"
 
-#broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/4126/steps/shell_3/logs/stdio"
-
-pre_build() {
-	local NVM_VERSION=0.33.6
-	local NODE_VERSION=6.9.5
-	curl -o- https://raw.githubusercontent.com/creationix/nvm/v$NVM_VERSION/install.sh | bash
-	source $HOME/.nvm/nvm.sh
-	nvm install $NODE_VERSION
-	nvm use $NODE_VERSION
-
-	sed -e "s/<%= description %>/$pkgdesc/" \
-		-e "s|<%= appName %>|Atom|"\
-		-e "s|<%= installDir %>/share/<%= appFileName %>|/usr/bin|"\
-		-e "s|<%= iconPath %>|atom|"\
-		resources/linux/atom.desktop.in > resources/linux/Atom.desktop
-}
-do_build() {
-	if [ -e ./apm/package-lock.json ]; then
-		rm ./apm/package-lock.json
-	fi
-	script/build
-	if [ -e ./apm/package-lock.json ]; then
-		rm ./apm/package-lock.json
-	fi
-	script/build
-}
-
 do_install() {
-	vbin atom.sh atom
-	vinstall resources/linux/Atom.desktop 644 usr/share/applications atom.desktop
-	vinstall resources/app-icons/stable/png/1024.png 644 usr/share/pixmaps atom.png
-
-	case "$XBPS_TARGET_MACHINE" in
-		i686*) targetarch=i386;;
-		x86_64*) targetarch=amd64;;
-		*) targetarch=$hostarch;;
-	esac
-
-
-	vmkdir usr/share/atom
-	ls -lah
-	vcopy out/atom-$version-$targetarch/* usr/share/atom
+	script/build --install=$DESTDIR/usr
 	vlicense LICENSE.md
-
-	ln -s /usr/share/atom/resources/app/apm/node_modules/.bin/apm "$DESTDIR/usr/bin/apm"
-
-	# remove useless static libs
-	find ${DESTDIR} -type f -name \*.a -delete
 }