summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan MacKay2020-06-13 08:16:49 -0700
committerIan MacKay2020-06-13 08:16:49 -0700
commitc65143b606196ac0d2ab80d846cc8c446da10bda (patch)
treebd97d5df1cf7f375ded2c0557c0801c9098a3abf
parent7f2c6dfe8f2139b6d58c72c5adf4db6364c80165 (diff)
downloadaur-c65143b606196ac0d2ab80d846cc8c446da10bda.tar.gz
Numerous fixes and update to 2.5.2
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD11
-rw-r--r--github-desktop.desktop2
3 files changed, 9 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6669ce93ad69..f01076817728 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = github-desktop-git
pkgdesc = GUI for managing Git and GitHub.
- pkgver = 2.4.0
+ pkgver = r26402.48d133718
pkgrel = 1
url = https://desktop.github.com
arch = x86_64
@@ -9,6 +9,7 @@ pkgbase = github-desktop-git
makedepends = nodejs>=10.16.0
makedepends = yarn
makedepends = python2
+ makedepends = unzip
depends = gnome-keyring
depends = libsecret
depends = git
@@ -23,7 +24,7 @@ pkgbase = github-desktop-git
source = git+https://github.com/shiftkey/desktop.git
source = github-desktop.desktop
sha256sums = SKIP
- sha256sums = 2758e15659f5770ae2ac948250372135029e7ac2d4b6bf431a112dfdbcc681d1
+ sha256sums = 932e4c456e8c6db03d27172cf0daa37806bf025bb560d8b3d758c0997d1a618c
pkgname = github-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index 838639950c5f..6c4c706f92eb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,9 +4,8 @@
_pkgname='github-desktop'
pkgname="${_pkgname}-git"
-pkgver=2.4.0
-_pkgver="${pkgver}-linux2"
-gitname="release-${_pkgver}"
+pkgver=r26402.48d133718
+gitname="linux"
pkgrel=1
pkgdesc="GUI for managing Git and GitHub."
arch=('x86_64')
@@ -14,7 +13,7 @@ url="https://desktop.github.com"
license=('MIT')
depends=('gnome-keyring' 'libsecret' 'git' 'curl' 'libxss' 'gconf' 'nss' 'nspr')
optdepends=('hub: CLI interface for GitHub.')
-makedepends=('xorg-server-xvfb' 'nodejs>=10.16.0' 'yarn' 'python2')
+makedepends=('xorg-server-xvfb' 'nodejs>=10.16.0' 'yarn' 'python2' 'unzip')
provides=(${_pkgname})
conflicts=(${_pkgname})
DLAGENTS=("https::/usr/bin/git clone --branch ${gitname} --single-branch %u")
@@ -24,11 +23,11 @@ source=(
)
sha256sums=(
'SKIP'
- 2758e15659f5770ae2ac948250372135029e7ac2d4b6bf431a112dfdbcc681d1
+ 932e4c456e8c6db03d27172cf0daa37806bf025bb560d8b3d758c0997d1a618c
)
pkgver() {
cd desktop
- git describe --long --tags | sed 's/^release.//;s/\([^-]*-g\)/r\1/;s/-/./g'
+ printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
build() {
cd desktop
diff --git a/github-desktop.desktop b/github-desktop.desktop
index c4f5481be92d..a4bc86b313cc 100644
--- a/github-desktop.desktop
+++ b/github-desktop.desktop
@@ -8,4 +8,4 @@ Terminal=false
Type=Application
Icon=github-desktop
Categories=Development;
-MimeType=x-scheme-handler/x-github-client;x-scheme-handler/x-github-desktop-auth;
+MimeType=x-scheme-handler/x-github-client;x-scheme-handler/x-github-desktop-auth;x-scheme-handler/x-github-desktop-dev-auth;