Control: tags 951986 + patch
Control: tags 951986 + pending
Dear maintainer,
I've prepared an NMU for feedreader (versioned as 2.10.0-1.1) and
uploaded it to mentors. Please feel free to tell me if I should remove it.
Regards,
Håvard
diff -Nru feedreader-2.10.0/debian/changelog feedreader-2.10.0/debian/changelog
--- feedreader-2.10.0/debian/changelog 2019-07-21 13:34:34.000000000 +0200
+++ feedreader-2.10.0/debian/changelog 2020-04-14 14:16:14.000000000 +0200
@@ -1,3 +1,11 @@
+feedreader (2.10.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Cherry-pick upstream commit. closes: #951986
+ 0002-Fix-infinite-loading-icon-after-opening-article-in-b.patch
+
+ -- Håvard Flaget Aasen <haavard_aa...@yahoo.no> Tue, 14 Apr 2020 14:16:14 +0200
+
feedreader (2.10.0-1) unstable; urgency=medium
* New upstream release.
diff -Nru feedreader-2.10.0/debian/patches/0002-Fix-infinite-loading-icon-after-opening-article-in-b.patch feedreader-2.10.0/debian/patches/0002-Fix-infinite-loading-icon-after-opening-article-in-b.patch
--- feedreader-2.10.0/debian/patches/0002-Fix-infinite-loading-icon-after-opening-article-in-b.patch 1970-01-01 01:00:00.000000000 +0100
+++ feedreader-2.10.0/debian/patches/0002-Fix-infinite-loading-icon-after-opening-article-in-b.patch 2020-04-13 17:45:18.000000000 +0200
@@ -0,0 +1,34 @@
+From: PopeRigby <poperi...@tuta.io>
+Date: Wed, 15 Jan 2020 16:28:42 -0800
+Subject: Fix infinite loading icon after opening article in browser
+
+---
+ src/Backend/FeedServer.vala | 2 +-
+ src/Widgets/SharePopover.vala | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/Backend/FeedServer.vala b/src/Backend/FeedServer.vala
+index 7660045..ce39f74 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?
+diff --git a/src/Widgets/SharePopover.vala b/src/Widgets/SharePopover.vala
+index 0998f92..3c45ff7 100644
+--- a/src/Widgets/SharePopover.vala
++++ b/src/Widgets/SharePopover.vala
+@@ -136,6 +136,7 @@ public class FeedReader.SharePopover : Gtk.Popover {
+ shareInternal(id, url);
+ string idString = (id == null || id == "") ? "" : @" to $id";
+ Logger.debug(@"bookmark: $url$idString");
++ shareDone();
+ }
+ }
+
diff -Nru feedreader-2.10.0/debian/patches/series feedreader-2.10.0/debian/patches/series
--- feedreader-2.10.0/debian/patches/series 2019-07-21 13:34:34.000000000 +0200
+++ feedreader-2.10.0/debian/patches/series 2020-04-13 18:00:00.000000000 +0200
@@ -1 +1,2 @@
fix_some_spelling_errors.patch
+0002-Fix-infinite-loading-icon-after-opening-article-in-b.patch
