Date: Friday, October 4, 2019 @ 10:23:01 Author: bgyorgy Revision: 512702
upgpkg: feedreader 2.10.0-2 Fix build with GNOME 3.34 Added: feedreader/trunk/fix-build.patch Modified: feedreader/trunk/PKGBUILD -----------------+ PKGBUILD | 13 ++++++++++--- fix-build.patch | 23 +++++++++++++++++++++++ 2 files changed, 33 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-04 08:50:53 UTC (rev 512701) +++ PKGBUILD 2019-10-04 10:23:01 UTC (rev 512702) @@ -8,7 +8,7 @@ pkgname=feedreader _pkgname=FeedReader pkgver=2.10.0 -pkgrel=1 +pkgrel=2 pkgdesc="Modern desktop application designed to complement existing web-based RSS accounts" arch=(x86_64) url="https://jangernert.github.io/FeedReader/"; @@ -16,8 +16,10 @@ depends=(curl gnome-keyring 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";) -sha256sums=('SKIP') +source=("git+https://github.com/jangernert/$_pkgname#commit=$_commit"; + fix-build.patch) +sha256sums=('SKIP' + 'e0086e131ebc7b30fb3265db0b52f209b9f2e2b8a146f93e6a7d66d5b9676d96') pkgver() { cd $_pkgname @@ -24,6 +26,11 @@ 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 Added: fix-build.patch =================================================================== --- fix-build.patch (rev 0) +++ fix-build.patch 2019-10-04 10:23:01 UTC (rev 512702) @@ -0,0 +1,23 @@ +From 056d1ac485643a528ed9b4bf84940b9165369a2a Mon Sep 17 00:00:00 2001 +From: Bilal Elmoussaoui <[email protected]> +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?
