fix the build and build with GTK3

2 files changed, 17 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d7af84cb54f1..f7f0b01d390c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,17 @@
 pkgbase = cbatticon-git
-	pkgdesc = A lightweight and fast battery icon that sits in your system tray
-	pkgver = 0.r116.7ee9555
+	pkgdesc = Lightweight battery icon for the system tray
+	pkgver = 1.6.12.r0.g63aaeaa
 	pkgrel = 1
 	url = https://github.com/valr/cbatticon
-	arch = i686
 	arch = x86_64
-	arch = armv7h
+	arch = i686
 	license = GPL2
 	makedepends = git
+	depends = gtk3
 	depends = libnotify
-	depends = gtk2
 	provides = cbatticon
 	conflicts = cbatticon
 	source = cbatticon::git+https://github.com/valr/cbatticon.git
 	md5sums = SKIP
 
 pkgname = cbatticon-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 85eab803309e..2734356f7360 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,32 +1,31 @@
 # Contributor: Colin Jones (xentalion) <colin@ergoeclectic.com>
-# Maintainer: Valère Monseur <valere dot monseur at ymail dot com>
+# Maintainer: Valère Monseur <archlinux at vale dot re>
 
 _pkgname=cbatticon
 pkgname=cbatticon-git
-pkgver=0.r116.7ee9555
+pkgver=1.6.12.r0.g63aaeaa
 pkgrel=1
-pkgdesc='A lightweight and fast battery icon that sits in your system tray'
-arch=('i686' 'x86_64' 'armv7h')
+pkgdesc='Lightweight battery icon for the system tray'
+arch=(x86_64 i686)
 url='https://github.com/valr/cbatticon'
-license=('GPL2')
-depends=('libnotify' 'gtk2')
-makedepends=('git')
-provides=('cbatticon')
-conflicts=('cbatticon')
+license=(GPL2)
+depends=(gtk3 libnotify)
+makedepends=(git)
+provides=(cbatticon)
+conflicts=(cbatticon)
 
 source=("$_pkgname"::'git+https://github.com/valr/cbatticon.git')
 md5sums=('SKIP')
 
 pkgver() {
-  cd "${srcdir}/${_pkgname}"
-
-  printf "0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  cd "$_pkgname"
+  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-  make -C "${_pkgname}" WITH_NOTIFY=1 WITH_GTK3=0
+  make -C "$_pkgname" WITH_NOTIFY=1 WITH_GTK3=1
 }
 
 package() {
-  make -C "${_pkgname}" PREFIX="${pkgdir}/usr" install
+  make -C "$_pkgname" PREFIX="$pkgdir/usr" install
 }