Date: Wednesday, May 27, 2020 @ 10:20:23 Author: bgyorgy Revision: 635879
upgpkg: feedreader 2.11.0-1: Update to new version Modified: feedreader/trunk/PKGBUILD Deleted: feedreader/trunk/fix-build.patch -----------------+ PKGBUILD | 17 +++++------------ fix-build.patch | 23 ----------------------- 2 files changed, 5 insertions(+), 35 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2020-05-27 10:13:46 UTC (rev 635878) +++ PKGBUILD 2020-05-27 10:20:23 UTC (rev 635879) @@ -7,8 +7,8 @@ pkgname=feedreader _pkgname=FeedReader -pkgver=2.10.0 -pkgrel=3 +pkgver=2.11.0 +pkgrel=1 pkgdesc="Modern desktop application designed to complement existing web-based RSS accounts" arch=(x86_64) url="https://jangernert.github.io/FeedReader/" @@ -15,11 +15,9 @@ license=(GPL3) depends=(curl org.freedesktop.secrets gnome-online-accounts gumbo-parser libgee libpeas) makedepends=(git gobject-introspection meson vala) -_commit=fb074d3e6a5ade2ceb1cdeafbca3cac4a0807c26 # tags/v2.10.0 -source=("git+https://github.com/jangernert/$_pkgname#commit=$_commit" - fix-build.patch) -sha256sums=('SKIP' - 'e0086e131ebc7b30fb3265db0b52f209b9f2e2b8a146f93e6a7d66d5b9676d96') +_commit=5910f1e570780fc3116738eceac5399917bc0435 # tags/v2.11.0 +source=("git+https://github.com/jangernert/$_pkgname#commit=$_commit") +sha256sums=('SKIP') pkgver() { cd $_pkgname @@ -26,11 +24,6 @@ git describe --tags | sed 's/^v//;s/-/+/g' } -prepare() { - cd $_pkgname - patch -Np1 -i ../fix-build.patch -} - build() { arch-meson $_pkgname build ninja -C build Deleted: fix-build.patch =================================================================== --- fix-build.patch 2020-05-27 10:13:46 UTC (rev 635878) +++ fix-build.patch 2020-05-27 10:20:23 UTC (rev 635879) @@ -1,23 +0,0 @@ -From 056d1ac485643a528ed9b4bf84940b9165369a2a Mon Sep 17 00:00:00 2001 -From: Bilal Elmoussaoui <bil.elmoussa...@gmail.com> -Date: Fri, 13 Sep 2019 14:09:20 +0200 -Subject: [PATCH] Correct secret collection flag - -Backported patch from Flathub build with GNOME 3.34 runtime ---- - src/Backend/FeedServer.vala | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Backend/FeedServer.vala b/src/Backend/FeedServer.vala -index 76600454..ce39f747 100644 ---- a/src/Backend/FeedServer.vala -+++ b/src/Backend/FeedServer.vala -@@ -57,7 +57,7 @@ public class FeedReader.FeedServer : GLib.Object { - var secrets = Secret.Collection.for_alias_sync(secret_service, Secret.COLLECTION_DEFAULT, Secret.CollectionFlags.NONE); - if(secrets == null) - { -- secrets = Secret.Collection.create_sync(secret_service, "Login", Secret.COLLECTION_DEFAULT, Secret.CollectionCreateFlags.COLLECTION_CREATE_NONE); -+ secrets = Secret.Collection.create_sync(secret_service, "Login", Secret.COLLECTION_DEFAULT, Secret.CollectionCreateFlags.NONE); - } - - var settings_backend = null; // FIXME: Why does SettingsBackend.get_default() crash on Arch Linux?