summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIan Mackay2017-11-27 22:43:18 -0800
committerIan Mackay2017-11-27 22:43:18 -0800
commit9c2a1194783f3b4fce1718721c7eba0f7ba99b9d (patch)
tree045970ea982557c75bfa2ef880b81f689b9c93b6
parent2ff918e6650a3b5a72aa0a6562a40b7876d89f4d (diff)
downloadaur-9c2a1194783f3b4fce1718721c7eba0f7ba99b9d.tar.gz
Removed patch that has been added to upstream
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD26
2 files changed, 12 insertions, 20 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e5bd696f7a1..4f1e3676448 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = github-desktop-git
pkgdesc = GUI for managing Git and GitHub.
- pkgver = 1.0.10.beta0.r29.gc6a57140e
- pkgrel = 1
+ pkgver = 1.0.10.beta2.r59.g97b1f2fb5
+ pkgrel = 2
url = https://desktop.github.com
arch = x86_64
license = MIT
@@ -19,10 +19,8 @@ pkgbase = github-desktop-git
conflicts = github-desktop
source = git+https://github.com/desktop/desktop.git
source = github-desktop.desktop
- source = github-desktop.patch
sha256sums = SKIP
sha256sums = ce0dae70066703df656aa6f509f9a7f4f59e081e8f05be8aa7a81ee4605661c3
- sha256sums = 25979a1e08c87361d457a277cb39327bdd82cadb3207f21bd11580579d9ecc62
pkgname = github-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index f23c4e811e5..29e502fa811 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
_pkgname='github-desktop'
pkgname="${_pkgname}-git"
-pkgver=1.0.10.beta0.r29.gc6a57140e
-pkgrel=1
+pkgver=1.0.10.beta2.r59.g97b1f2fb5
+pkgrel=2
pkgdesc="GUI for managing Git and GitHub."
arch=('x86_64')
url="https://desktop.github.com"
@@ -18,22 +18,16 @@ provides=('github-desktop')
conflicts=('github-desktop')
source=(
git+https://github.com/desktop/desktop.git
- $_pkgname.desktop
- $_pkgname.patch
+ ${_pkgname}.desktop
)
sha256sums=(
'SKIP'
ce0dae70066703df656aa6f509f9a7f4f59e081e8f05be8aa7a81ee4605661c3
- 25979a1e08c87361d457a277cb39327bdd82cadb3207f21bd11580579d9ecc62
)
pkgver() {
cd desktop
git describe --long --tags | sed 's/^release.//;s/\([^-]*-g\)/r\1/;s/-/./g'
}
-prepare() {
- cd desktop
- patch -p1 -i "$srcdir/$_pkgname.patch"
-}
build() {
cd desktop
export DISPLAY=':99.0'
@@ -42,11 +36,11 @@ build() {
yarn build:prod
}
package() {
- install -d "$pkgdir/opt/$_pkgname"
- cp -r --preserve=mode desktop/dist/GitHub\ Desktop-linux-x64/* "$pkgdir/opt/$_pkgname/"
- printf '#!/bin/sh\n\nLD_PRELOAD=libcurl.so.3 /opt/github-desktop/GitHub\ Desktop "$@"\n' | install -Dm755 /dev/stdin "$pkgdir/usr/bin/github-desktop"
- install -D "$_pkgname.desktop" "$pkgdir/usr/share/applications/$_pkgname.desktop"
- install -D "desktop/app/static/logos/1024x1024.png" "$pkgdir/usr/share/icons/hicolor/1024x1024/apps/$_pkgname.png"
- install -D "desktop/app/static/logos/512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/$_pkgname.png"
- install -D "desktop/app/static/logos/256x256.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/$_pkgname.png"
+ install -d "${pkgdir}/opt/${_pkgname}"
+ cp -r --preserve=mode desktop/dist/GitHub\ Desktop-linux-x64/* "${pkgdir}/opt/${_pkgname}/"
+ printf '#!/bin/sh\n\n/opt/github-desktop/GitHub\ Desktop "$@"\n' | install -Dm755 /dev/stdin "${pkgdir}/usr/bin/github-desktop"
+ install -D "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
+ install -D "desktop/app/static/logos/1024x1024.png" "${pkgdir}/usr/share/icons/hicolor/1024x1024/apps/${_pkgname}.png"
+ install -D "desktop/app/static/logos/512x512.png" "${pkgdir}/usr/share/icons/hicolor/512x512/apps/${_pkgname}.png"
+ install -D "desktop/app/static/logos/256x256.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_pkgname}.png"
}