[arch-commits] Commit in feedreader/repos/community-x86_64 (PKGBUILD PKGBUILD)

[Balló György]

    Date: Thursday, July 5, 2018 @ 02:21:50
  Author: bgyorgy
Revision: 352277

archrelease: copy trunk to community-x86_64

Added:
  feedreader/repos/community-x86_64/PKGBUILD
    (from rev 352276, feedreader/trunk/PKGBUILD)
Deleted:
  feedreader/repos/community-x86_64/PKGBUILD

----------+
 PKGBUILD |   94 +++++++++++++++++++++++++++++++------------------------------
 1 file changed, 48 insertions(+), 46 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-07-05 02:21:46 UTC (rev 352276)
+++ PKGBUILD	2018-07-05 02:21:50 UTC (rev 352277)
@@ -1,46 +0,0 @@
-# $Id$
-# Maintainer: Balló György <ballogyor+arch at gmail dot com>
-# Contributor: Andrew O'Neill <andrew at meanjollies dot com>
-# Contributor: poisonby <poisonby at tutanota.com>
-# Contributor: Jason Scurtu (scujas) <jscurtu at gmail.com>
-# Contributor: Marcin Tydelski <marcin.tydelski at gmail.com>
-# Contributor: Jan Lukas Gernert (JeanLuc) <https://launchpad.net/~eviltwin1>
-
-pkgname=feedreader
-_pkgname=FeedReader
-pkgver=2.0.2+559+g78d7ced8
-pkgrel=1
-pkgdesc="Modern desktop application designed to complement existing web-based RSS accounts"
-arch=(x86_64)
-url="https://jangernert.github.io/FeedReader/"
-license=(GPL3)
-depends=(curl gnome-online-accounts libgee libpeas)
-makedepends=(cmake git gobject-introspection vala)
-_commit=78d7ced862aa491d64d9b5f135b2ba2d893b79d1  # master
-source=("git+https://github.com/jangernert/$_pkgname#commit=$_commit"
-        "git+https://github.com/fivefilters/ftr-site-config")
-sha256sums=('SKIP'
-            'SKIP')
-
-pkgver() {
-  cd $_pkgname
-  git describe --tags | sed 's/^v//;s/-/+/g'
-}
-
-prepare() {
-  cd $_pkgname
-  git config submodule.data/GrabberConfig.url "$srcdir/ftr-site-config"
-  git submodule update --init
-  mkdir build
-}
-
-build() {
-  cd $_pkgname/build
-  cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_INSTALL_LIBDIR=lib -DGSETTINGS_COMPILE=OFF
-  make -j1
-}
-
-package() {
-  cd $_pkgname/build
-  make DESTDIR="$pkgdir" install
-}

Copied: feedreader/repos/community-x86_64/PKGBUILD (from rev 352276, feedreader/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-07-05 02:21:50 UTC (rev 352277)
@@ -0,0 +1,48 @@
+# $Id$
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Andrew O'Neill <andrew at meanjollies dot com>
+# Contributor: poisonby <poisonby at tutanota.com>
+# Contributor: Jason Scurtu (scujas) <jscurtu at gmail.com>
+# Contributor: Marcin Tydelski <marcin.tydelski at gmail.com>
+# Contributor: Jan Lukas Gernert (JeanLuc) <https://launchpad.net/~eviltwin1>
+
+pkgname=feedreader
+_pkgname=FeedReader
+pkgver=2.2
+pkgrel=1
+pkgdesc="Modern desktop application designed to complement existing web-based RSS accounts"
+arch=(x86_64)
+url="https://jangernert.github.io/FeedReader/"
+license=(GPL3)
+depends=(curl gnome-online-accounts libgee libpeas)
+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'
+            'SKIP')
+
+pkgver() {
+  cd $_pkgname
+  git describe --tags | sed 's/^v//;s/-/+/g'
+}
+
+prepare() {
+  cd $_pkgname
+  git config submodule.data/GrabberConfig.url "$srcdir/ftr-site-config"
+  git submodule update --init
+
+  # Revert bad commit
+  # https://github.com/jangernert/FeedReader/issues/677
+  git revert -n ccb7a52d67d9fe78f663cf6cc991ea51882f453e
+  git revert -n b5ab26de2928e011ceafeb87e0f20131764e7021
+}
+
+build() {
+  arch-meson $_pkgname build
+  ninja -C build
+}
+
+package() {
+  DESTDIR="$pkgdir" ninja -C build install
+}