[arch-commits] Commit in feedreader/trunk (PKGBUILD)

[Balló György]

    Date: Thursday, July 5, 2018 @ 02:21:46
  Author: bgyorgy
Revision: 352276

upgpkg: feedreader 2.2-1

Update to new version

Modified:
  feedreader/trunk/PKGBUILD

----------+
 PKGBUILD |   20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-05 01:54:55 UTC (rev 352275)
+++ PKGBUILD	2018-07-05 02:21:46 UTC (rev 352276)
@@ -8,7 +8,7 @@
 
 pkgname=feedreader
 _pkgname=FeedReader
-pkgver=2.0.2+559+g78d7ced8
+pkgver=2.2
 pkgrel=1
 pkgdesc="Modern desktop application designed to complement existing web-based RSS accounts"
 arch=(x86_64)
@@ -15,8 +15,8 @@
 url="https://jangernert.github.io/FeedReader/"
 license=(GPL3)
 depends=(curl gnome-online-accounts libgee libpeas)
-makedepends=(cmake git gobject-introspection vala)
-_commit=78d7ced862aa491d64d9b5f135b2ba2d893b79d1  # master
+makedepends=(git gobject-introspection meson vala)
+_commit=61f6331e700421ca917a309df9efa2e119890ba5  # tags/v2.2
 source=("git+https://github.com/jangernert/$_pkgname#commit=$_commit"
         "git+https://github.com/fivefilters/ftr-site-config")
 sha256sums=('SKIP'
@@ -31,16 +31,18 @@
   cd $_pkgname
   git config submodule.data/GrabberConfig.url "$srcdir/ftr-site-config"
   git submodule update --init
-  mkdir build
+
+  # Revert bad commit
+  # https://github.com/jangernert/FeedReader/issues/677
+  git revert -n ccb7a52d67d9fe78f663cf6cc991ea51882f453e
+  git revert -n b5ab26de2928e011ceafeb87e0f20131764e7021
 }
 
 build() {
-  cd $_pkgname/build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DGSETTINGS_COMPILE=OFF
-  make -j1
+  arch-meson $_pkgname build
+  ninja -C build
 }
 
 package() {
-  cd $_pkgname/build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -C build install
 }