atom: update to version 1.22

Closes #9035.
This commit is contained in:
Thomas Bernard 2017-10-31 21:04:38 +01:00 committed by Enno Boland
parent 4cc28055c8
commit aaf5688e17
3 changed files with 19 additions and 10 deletions

View File

@ -355,6 +355,7 @@ libnssdbm3.so nss-3.12.4_1
libnssckbi.so nss-3.12.4_1 libnssckbi.so nss-3.12.4_1
libnss3.so nss-3.12.4_1 libnss3.so nss-3.12.4_1
libcurl.so.4 libcurl-7.19_1 libcurl.so.4 libcurl-7.19_1
libcurl-gnutls.so.4 libcurl-7.19_1
libdaemon.so.0 libdaemon-0.14_1 libdaemon.so.0 libdaemon-0.14_1
libavahi-common.so.3 avahi-libs-0.6.25_1 libavahi-common.so.3 avahi-libs-0.6.25_1
libavahi-core.so.7 avahi-libs-0.6.25_1 libavahi-core.so.7 avahi-libs-0.6.25_1

View File

@ -1,25 +1,25 @@
# Template file for 'atom' # Template file for 'atom'
pkgname=atom pkgname=atom
version=1.19.0 version=1.22.0
revision=1 revision=2
nocross=yes nocross=yes
nostrip=yes nostrip=yes
hostmakedepends="git pkg-config python-devel nodejs curl" 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="Orphaned <orphan@voidlinux.eu>"
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/$pkgname/$pkgname/archive/v$version.tar.gz"
checksum=233b699eac07b098627dfef064da4836b5d595796403ae07bcdce2d9cf7cc114 checksum=28f2db2c92e2ee12fedbcf8e21f91df7a8308f05babc7b93f196f61f0b975103
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" #broken="https://build.voidlinux.eu/builders/x86_64_builder/builds/4126/steps/shell_3/logs/stdio"
pre_build() { pre_build() {
local NVM_VERSION=0.33.2 local NVM_VERSION=0.33.6
local NODE_VERSION=6 local NODE_VERSION=6.9.5
curl -o- https://raw.githubusercontent.com/creationix/nvm/v$NVM_VERSION/install.sh | bash curl -o- https://raw.githubusercontent.com/creationix/nvm/v$NVM_VERSION/install.sh | bash
source $HOME/.nvm/nvm.sh source $HOME/.nvm/nvm.sh
nvm install $NODE_VERSION nvm install $NODE_VERSION
@ -32,7 +32,14 @@ pre_build() {
resources/linux/atom.desktop.in > resources/linux/Atom.desktop resources/linux/atom.desktop.in > resources/linux/Atom.desktop
} }
do_build() { do_build() {
script/build || script/build # FIXME: bug with overlayfs, build twice to fix 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() {

View File

@ -1,7 +1,7 @@
# Template build file for 'curl'. # Template build file for 'curl'.
pkgname=curl pkgname=curl
version=7.56.1 version=7.56.1
revision=2 revision=3
build_style=gnu-configure build_style=gnu-configure
configure_args="ac_cv_sizeof_off_t=8 configure_args="ac_cv_sizeof_off_t=8
--enable-threaded-resolver --enable-ipv6 $(vopt_with rtmp) --enable-threaded-resolver --enable-ipv6 $(vopt_with rtmp)
@ -22,7 +22,6 @@ license="MIT"
homepage="https://curl.haxx.se" homepage="https://curl.haxx.se"
distfiles="$homepage/download/$pkgname-$version.tar.bz2" distfiles="$homepage/download/$pkgname-$version.tar.bz2"
checksum=2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90 checksum=2594670367875e7d87b0f129b5e4690150780884d90244ba0fe3e74a778b5f90
build_options="gnutls gssapi ldap rtmp ssh ssl" build_options="gnutls gssapi ldap rtmp ssh ssl"
build_options_default="ssh ssl" build_options_default="ssh ssl"
vopt_conflict ssl gnutls vopt_conflict ssl gnutls
@ -39,8 +38,10 @@ post_install() {
libcurl_package() { libcurl_package() {
short_desc="The multiprotocol file transfer library" short_desc="The multiprotocol file transfer library"
shlib_provides="libcurl-gnutls.so.4"
pkg_install() { pkg_install() {
vmove "usr/lib/*.so.*" vmove "usr/lib/*.so.*"
ln -sf ${PKGDESTDIR}/usr/lib/libcurl.so.4.5.0 ${PKGDESTDIR}/usr/lib/libcurl-gnutls.so.4
} }
} }
libcurl-devel_package() { libcurl-devel_package() {