applied gccb5b6e patch

2 files changed, 17 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 31c64862ce4b..846878e3e604 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,12 @@
 pkgbase = pasystray-gtk2-standalone
 	pkgdesc = PulseAudio system tray (a replacement for padevchooser gtk2 standalone version)
-	pkgver = 0.6.0
-	pkgrel = 1
+	pkgver = 0.6.0.r13.gccb5b6e
+	pkgrel = 0
 	url = https://github.com/christophgysin/pasystray
 	arch = i686
 	arch = x86_64
 	groups = multimedia
 	license = LGPL
-	makedepends = git
 	depends = gtk2
 	depends = libpulse
 	depends = libnotify
@@ -22,8 +21,8 @@ pkgbase = pasystray-gtk2-standalone
 	optdepends = paprefs: Launch PulseAudio preferences from tray icon
 	provides = pasystray
 	conflicts = pasystray
-	source = pasystray-0.6.0.tar.gz::https://github.com/christophgysin/pasystray/archive/0.6.0.tar.gz
-	md5sums = c7467ac2b75290bd086fc60f8243ad77
+	source = git+https://github.com/christophgysin/pasystray.git
+	sha256sums = SKIP
 
 pkgname = pasystray-gtk2-standalone
 
diff --git a/PKGBUILD b/PKGBUILD
index 8de70cb6e601..2eecd2efd19d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
 
 _pkgname=pasystray
 pkgname=${_pkgname}-gtk2-standalone
-pkgver=0.6.0
-pkgrel=1
+pkgver=0.6.0.r13.gccb5b6e
+pkgrel=0
 pkgdesc="PulseAudio system tray (a replacement for padevchooser gtk2 standalone version)"
 arch=('i686' 'x86_64')
 url="https://github.com/christophgysin/pasystray"
@@ -13,7 +13,6 @@ groups=('multimedia')
 provides=(${_pkgname})
 conflicts=(${_pkgname})
 replace=(${_pkgname})
-makedepends=('git')
 depends=('gtk2' 'libpulse' 'libnotify' 'avahi' 'libx11' 'gnome-icon-theme' 'gtk-update-icon-cache')
 optdepends=(
     'pulseaudio: To control a local pulseaudio instance'
@@ -22,22 +21,28 @@ optdepends=(
     'pavumeter: Launch PulseAudio volume meter from tray icon'
     'paprefs: Launch PulseAudio preferences from tray icon'
 )
-source=($_pkgname-$pkgver.tar.gz::https://github.com/christophgysin/$_pkgname/archive/$pkgver.tar.gz)
-md5sums=('c7467ac2b75290bd086fc60f8243ad77')
+
+source=(git+https://github.com/christophgysin/${_pkgname}.git)
+sha256sums=('SKIP')
+
+pkgver() {
+	cd "$_pkgname"
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
 
 prepare () {
-	cd "$srcdir/${_pkgname}-$pkgver"
+	cd "$srcdir/${_pkgname}"
 	autoreconf -is
 	sed -i -e '/<requires /d' -e '/license_type/d' src/pasystray.glade
 }
 
 build () {
-	cd "$srcdir/${_pkgname}-$pkgver"
+	cd "$srcdir/${_pkgname}"
 	# Do you need appindicator in gtk2?
 	./configure --prefix=/usr --with-gtk=2 --disable-appindicator
 }
 
 package () {
-    cd "$srcdir/${_pkgname}-$pkgver"
+    cd "$srcdir/${_pkgname}"
     make DESTDIR="$pkgdir/" install
 }