From edd82170526543c736004ad1e92fe1aac3256bfb Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Fri, 30 Oct 2015 18:41:44 +0100 Subject: [PATCH] atom: update to 1.1.0. --- srcpkgs/atom/patches/desktop.patch | 6 +++--- srcpkgs/atom/template | 16 +++------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/srcpkgs/atom/patches/desktop.patch b/srcpkgs/atom/patches/desktop.patch index d87460f66a7..137fe0b9fc6 100644 --- a/srcpkgs/atom/patches/desktop.patch +++ b/srcpkgs/atom/patches/desktop.patch @@ -10,11 +10,11 @@ index 1969e3f..71c19ca 100644 Name=Atom Comment=<%= description %> GenericName=Text Editor --Exec=<%= executable %> %U --Icon=<%= iconName %> +-Exec=<%= installDir %>/share/<%= appFileName %>/atom %U +-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 8cb522a01ad..34c6abb1ef7 100644 --- a/srcpkgs/atom/template +++ b/srcpkgs/atom/template @@ -1,32 +1,22 @@ # Template file for 'atom' pkgname=atom -version=1.0.19 +version=1.1.0 revision=1 nocross=yes nostrip=yes -hostmakedepends="git pkg-config python-devel curl" +hostmakedepends="git pkg-config python-devel nodejs" makedepends="python-devel GConf-devel libgnome-keyring-devel" short_desc="Chrome-based text editor from Github" maintainer="Andrea Brancaleoni " license="MIT" homepage="https://atom.io" distfiles="https://github.com/$pkgname/$pkgname/archive/v$version.tar.gz" -checksum=775742460826ab7d6b0ffd035632019041b0a1ae40f47e15f4098241744252b5 -_NODE_VERSION=0.12.7 +checksum=25a64813b2741540fc26dfa0cf82e5769b324c016317fa3ff0593679fd5e88e9 -pre_build() { - local NVM_VERSION=0.26.1 - curl -o- https://raw.githubusercontent.com/creationix/nvm/v$NVM_VERSION/install.sh | bash - source ~/.nvm/nvm.sh - nvm install $_NODE_VERSION - nvm use $_NODE_VERSION -} do_build() { script/build } do_install() { - source ~/.nvm/nvm.sh - nvm use $_NODE_VERSION script/grunt install --install-dir ${DESTDIR}/usr sed -i "s|${DESTDIR}||g" ${DESTDIR}/usr/share/applications/atom.desktop vlicense LICENSE.md