summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan MacKay2018-08-31 08:21:25 -0700
committerIan MacKay2018-08-31 08:21:25 -0700
commit9d1ca86b4c31d77577eefb327bbea121e1e2303e (patch)
tree1cbceaab69ca5e9eb81b53af4f9fce3fe57a5b97
parent8b087078b33b15f68d6cee2a1ee41103f4004c98 (diff)
downloadaur-9d1ca86b4c31d77577eefb327bbea121e1e2303e.tar.gz
Bump version and dependencies until dugite is updated
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD13
2 files changed, 7 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 47b6cb4dd01..e143d36175d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,17 @@
pkgbase = github-desktop-git
pkgdesc = GUI for managing Git and GitHub.
- pkgver = 1.3.4.r1.g513ffaa90
+ pkgver = 1.3.5.beta0.r66.g2b23831bf
pkgrel = 1
url = https://desktop.github.com
arch = x86_64
license = MIT
makedepends = xorg-server-xvfb
- makedepends = nodejs
- makedepends = nvm
+ makedepends = nodejs-lts-carbon
makedepends = yarn
makedepends = python2
depends = gnome-keyring
depends = git
- depends = libcurl-gnutls
+ depends = libcurl-openssl-1.0
optdepends = hub: CLI interface for GitHub.
provides = github-desktop
conflicts = github-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 6c8b6e11313..cb04196893a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,16 +4,16 @@
_pkgname='github-desktop'
pkgname="${_pkgname}-git"
-pkgver=1.3.4.r1.g513ffaa90
+pkgver=1.3.5.beta0.r66.g2b23831bf
gitname="release-${pkgver//_/-}"
pkgrel=1
pkgdesc="GUI for managing Git and GitHub."
arch=('x86_64')
url="https://desktop.github.com"
license=('MIT')
-depends=('gnome-keyring' 'git' 'libcurl-gnutls')
+depends=('gnome-keyring' 'git' 'libcurl-openssl-1.0')
optdepends=('hub: CLI interface for GitHub.')
-makedepends=('xorg-server-xvfb' 'nodejs' 'nvm' 'yarn' 'python2')
+makedepends=('xorg-server-xvfb' 'nodejs-lts-carbon' 'yarn' 'python2')
provides=(${_pkgname})
conflicts=(${_pkgname})
DLAGENTS=("http::/usr/bin/git clone --branch ${gitname} --single-branch %u")
@@ -31,15 +31,10 @@ pkgver() {
}
build() {
cd desktop
- unset npm_config_prefix
- source /usr/share/nvm/init-nvm.sh
- nvm install --lts
- nvm use --lts
export DISPLAY=':99.0'
Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
yarn install
yarn build:prod
- nvm deactivate
}
package() {
install -d "${pkgdir}/opt/${_pkgname}"
@@ -48,5 +43,5 @@ package() {
install -Dm644 "desktop/app/static/logos/1024x1024.png" "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${_pkgname}.png"
install -Dm644 "desktop/app/static/logos/512x512.png" "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${_pkgname}.png"
install -Dm644 "desktop/app/static/logos/256x256.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_pkgname}.png"
- printf "#!/bin/sh\n\n/opt/${_pkgname}/desktop \"$@\"\n" | install -Dm755 /dev/stdin "${pkgdir}/usr/bin/${_pkgname}"
+ printf "#!/bin/sh\n\nLD_PRELOAD=libcurl.so.4 /opt/${_pkgname}/desktop \"$@\"\n" | install -Dm755 /dev/stdin "${pkgdir}/usr/bin/${_pkgname}"
}