atom: update to 1.23.1

Closes: #10341 [via git-merge-pr]
This commit is contained in:
Wilson Birney 2018-01-01 18:17:30 -05:00 committed by Jürgen Buchmüller
parent 8528a66c65
commit 752f1c62c2
2 changed files with 6 additions and 72 deletions

View file

@ -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;
--

View file

@ -1,66 +1,20 @@
# Template file for 'atom' # Template file for 'atom'
pkgname=atom pkgname=atom
version=1.22.0 version=1.23.1
revision=2 revision=1
nocross=yes nocross=yes
nostrip=yes nostrip=yes
hostmakedepends="git pkg-config python-devel nodejs curl gtk+ libXtst libXScrnSaver nss python alsa-lib" 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" makedepends="python-devel GConf-devel libgnome-keyring-devel libX11-devel libxkbfile-devel libsecret-devel"
short_desc="Chrome-based text editor from Github" short_desc="Chrome-based text editor from Github"
maintainer="Orphaned <orphan@voidlinux.eu>" maintainer="Wilson Birney <wpb@360scada.com>"
license="MIT" license="MIT"
homepage="https://atom.io" homepage="https://atom.io"
distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" distfiles="https://github.com/atom/atom/archive/v${version}.tar.gz"
checksum=28f2db2c92e2ee12fedbcf8e21f91df7a8308f05babc7b93f196f61f0b975103 checksum=56147093f1b8fd98e1cdf9671888694b732ed6b83f7641c199ddbc54df76544f
only_for_archs="i686 x86_64" 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() { do_install() {
vbin atom.sh atom script/build --install=$DESTDIR/usr
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
vlicense LICENSE.md 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
} }