Bump version, migrate to meson

2 files changed, 13 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c3b72686143c..60b8d1e6f60e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = feedreader-git
 	pkgdesc = FeedReader is a modern desktop application designed to complement existing web-based RSS accounts.
-	pkgver = 2.0.2.r2459.d52e0476
+	pkgver = 2.2.r2633
 	pkgrel = 1
 	url = https://github.com/jangernert/FeedReader
 	arch = i686
@@ -9,7 +9,7 @@ pkgbase = feedreader-git
 	makedepends = git
 	makedepends = vala
 	makedepends = gobject-introspection
-	makedepends = cmake
+	makedepends = meson
 	depends = sqlite3
 	depends = gtk3
 	depends = webkit2gtk
diff --git a/PKGBUILD b/PKGBUILD
index b01a8c27964b..70e1b5e80830 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,6 @@
-# Maintainer: Grigorii Horos <horosgrisa@gmail.com>
+# Maintainer: asm0dey <pavel.finkelshtein+AUR@gmail.com>
 pkgname=feedreader-git
-pkgver=2.0.2.r2459.d52e0476
-_pkgver=2.0.2 # Must be manually bumped when a new stable version is released (see pkgver())
+pkgver=2.2.r2633
 pkgrel=1
 pkgdesc="FeedReader is a modern desktop application designed to complement existing web-based RSS accounts."
 arch=('i686' 'x86_64')
@@ -9,7 +8,7 @@ url="https://github.com/jangernert/FeedReader"
 license=('GPL3')
 groups=()
 depends=('sqlite3' 'gtk3' 'webkit2gtk' 'libnotify' 'libsoup' 'libgee' 'json-glib' 'libsecret' 'libpeas' 'gnome-online-accounts' 'curl')
-makedepends=('git' 'vala' 'gobject-introspection' 'cmake')
+makedepends=('git' 'vala' 'gobject-introspection' 'meson')
 provides=("${pkgname%-*}")
 conflicts=("${pkgname%-*}")
 source=('git+https://github.com/jangernert/FeedReader.git')
@@ -19,22 +18,22 @@ sha256sums=('SKIP')
 # Therefore, we use the "no tags" version, but manually prepended by the latest stable.
 pkgver() {
   cd "$srcdir/FeedReader"
-  printf "${_pkgver}.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "%s.r%s" $(git tag | tail -n1 | sed 's/^v//') "$(git rev-list --count HEAD)"
 }
 
+prepare() {
+  cd "$srcdir/FeedReader"
+  git submodule init; git submodule update
+}
 
 build() {
   mkdir -p "$srcdir/FeedReader/build"
   cd "$srcdir/FeedReader/build"
-  cmake \
-	  -DCMAKE_INSTALL_PREFIX=/usr \
-	  -DGSETTINGS_COMPILE=OFF \
-	  -DCMAKE_INSTALL_LIBDIR=lib \
-	  ..
-  make
+  arch-meson
+  ninja
 }
 
 package() {
   cd "$srcdir/FeedReader/build"
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja install
 }