diff options
-rw-r--r-- | .SRCINFO | 13 | ||||
-rw-r--r-- | PKGBUILD | 20 |
2 files changed, 18 insertions, 15 deletions
@@ -1,6 +1,6 @@ -pkgbase = github-desktop-git +pkgbase = github-desktop pkgdesc = GUI for managing Git and GitHub. - pkgver = 1.0.14.beta1.r37.g86edf4c6e + pkgver = 1.3.0_beta4 pkgrel = 1 url = https://desktop.github.com arch = x86_64 @@ -8,6 +8,8 @@ pkgbase = github-desktop-git makedepends = libcurl-openssl-1.0 makedepends = xorg-server-xvfb makedepends = yarn + makedepends = python2 + makedepends = nvm depends = gnome-keyring depends = git depends = electron @@ -15,12 +17,9 @@ pkgbase = github-desktop-git depends = libcurl-compat depends = libcurl-gnutls optdepends = hub: CLI interface for GitHub. - provides = github-desktop - conflicts = github-desktop - source = git+https://github.com/desktop/desktop.git + source = git+https://github.com/desktop/desktop.git#tag=release-1.1.1 source = github-desktop.desktop sha256sums = SKIP sha256sums = be057e4a392e64760f7a40203ac886b7cf5551de254ad55c706376dca8aa4341 -pkgname = github-desktop-git - +pkgname = github-desktop @@ -1,11 +1,11 @@ # Maintainer: Ian MacKay <immackay0@gmail.com> -# -# Gnome Keyring requires setup if you are using a window manager -# You will need to import 5CC908FDB71E12C2 for libcurl-openssl-1.0 +# Prior Maintainer: Mikel Pintado <mikelaitornube2010@gmail.com> +# Contributor: Jiawen Geng _pkgname='github-desktop' pkgname="${_pkgname}-git" -pkgver=1.0.14.beta1.r37.g86edf4c6e +pkgver=1.3.0_beta4 +gitname="release-${pkgver//_/-}" pkgrel=1 pkgdesc="GUI for managing Git and GitHub." arch=('x86_64') @@ -13,9 +13,8 @@ url="https://desktop.github.com" license=('MIT') depends=('gnome-keyring' 'git' 'electron' 'nodejs' 'libcurl-compat' 'libcurl-gnutls') optdepends=('hub: CLI interface for GitHub.') -makedepends=('libcurl-openssl-1.0' 'xorg-server-xvfb' 'yarn') -provides=('github-desktop') -conflicts=('github-desktop') +makedepends=('libcurl-openssl-1.0' 'xorg-server-xvfb' 'yarn' 'python2' 'nvm') +DLAGENTS=("http::/usr/bin/git clone --branch ${gitname} --single-branch %u") source=( git+https://github.com/desktop/desktop.git ${_pkgname}.desktop @@ -30,15 +29,20 @@ 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}" cp -r --preserve=mode desktop/dist/desktop-linux-x64/* "${pkgdir}/opt/${_pkgname}/" - printf '#!/bin/sh\n\n/opt/github-desktop/desktop "$@"\n' | install -Dm755 /dev/stdin "${pkgdir}/usr/bin/github-desktop" + printf '#!/bin/sh\n\nLD_PRELOAD=libcurl.so.3 /opt/github-desktop/desktop "$@"\n' | install -Dm755 /dev/stdin "${pkgdir}/usr/bin/github-desktop" install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop" 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" |