Update

3 files changed, 15 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d32015184d26..3e09be2d1e12 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
 # Generated by mksrcinfo v8
-# Thu Sep 29 07:49:35 UTC 2016
+# Wed Dec 14 09:52:35 UTC 2016
 pkgbase = feedreader-git
 	pkgdesc = FeedReader is a modern desktop application designed to complement existing web-based RSS accounts.
-	pkgver = 1.6.1
-	pkgrel = 2
+	pkgver = 1.6.2.r1672.b538ade
+	pkgrel = 1
 	url = https://github.com/jangernert/FeedReader
-	install = feedreader.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = git
 	makedepends = vala
 	makedepends = gobject-introspection
 	makedepends = cmake
@@ -21,7 +21,8 @@ pkgbase = feedreader-git
 	depends = json-glib
 	depends = libsecret
 	depends = libpeas
-	depends = gvfs-goa
+	depends = gnome-online-accounts
+	depends = curl
 	provides = feedreader
 	conflicts = feedreader
 	source = git+https://github.com/jangernert/FeedReader.git
diff --git a/PKGBUILD b/PKGBUILD
index 2e9c3428195e..e2e9861f4677 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,31 +1,32 @@
 # Maintainer: Grigorii Horos <horosgrisa@gmail.com>
 pkgname=feedreader-git
-pkgver=1.6.1
-pkgrel=2
+pkgver=1.6.2.r1672.b538ade
+_pkgver=1.6.2 # Must be manually bumped when a new stable version is released (see pkgver())
+pkgrel=1
 pkgdesc="FeedReader is a modern desktop application designed to complement existing web-based RSS accounts."
 arch=('i686' 'x86_64')
 url="https://github.com/jangernert/FeedReader"
 license=('GPL3')
 groups=()
-depends=('sqlite3' 'gtk3' 'webkit2gtk' 'libnotify' 'libsoup' 'libgee' 'json-glib' 'libsecret' 'libpeas' 'gvfs-goa')
-makedepends=('vala' 'gobject-introspection' 'cmake')
+depends=('sqlite3' 'gtk3' 'webkit2gtk' 'libnotify' 'libsoup' 'libgee' 'json-glib' 'libsecret' 'libpeas' 'gnome-online-accounts' 'curl')
+makedepends=('git' 'vala' 'gobject-introspection' 'cmake')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
-install="${pkgname%-*}.install"
 source=('git+https://github.com/jangernert/FeedReader.git')
 sha256sums=('SKIP')
 
+# Upstream tags point releases in a "stable" branch, so these are not reachable from master.
+# Therefore, we use the "no tags" version, but manually prepended by the latest stable.
 pkgver() {
   cd "$srcdir/FeedReader"
-  # cutting off 'foo-' prefix that presents in the git tag
-  printf $(git describe --tags --long | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g')
+  printf "${_pkgver}.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 
 build() {
   mkdir -p "$srcdir/FeedReader/build"
   cd "$srcdir/FeedReader/build"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr -DUSE_WEBKIT_4=ON -DGSETTINGS_COMPILE=OFF -DWITH_LIBUNITY=OFF ..
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DGSETTINGS_COMPILE=OFF ..
   make
 }
 
diff --git a/feedreader.install b/feedreader.install
deleted file mode 100755
index 826f632e9bfa..000000000000
--- a/feedreader.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-post_remove() {
-  glib-compile-schemas usr/share/glib-2.0/schemas
-  gtk-update-icon-cache -ftq usr/share/icons/hicolor
-}
-
-# vim: ts=2 sw=2 et:
\ No newline at end of file