diff -Nru shotwell-0.28.4/debian/changelog shotwell-0.28.4/debian/changelog
--- shotwell-0.28.4/debian/changelog	2018-11-12 10:52:35.000000000 +0000
+++ shotwell-0.28.4/debian/changelog	2020-04-30 08:58:37.000000000 +0000
@@ -1,3 +1,11 @@
+shotwell (0.28.4-0ubuntu2) bionic; urgency=medium
+
+  * debian/patches/git_flickr_login.patch:
+    - backport some fixes for the flickr service authentification
+      (lp: #1875864)
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Thu, 30 Apr 2020 10:58:37 +0200
+
 shotwell (0.28.4-0ubuntu1) bionic; urgency=medium
 
   * New bugfix update (lp: #1802895)
diff -Nru shotwell-0.28.4/debian/patches/git_flicker_login.patch shotwell-0.28.4/debian/patches/git_flicker_login.patch
--- shotwell-0.28.4/debian/patches/git_flicker_login.patch	1970-01-01 00:00:00.000000000 +0000
+++ shotwell-0.28.4/debian/patches/git_flicker_login.patch	2020-04-30 08:58:37.000000000 +0000
@@ -0,0 +1,51 @@
+From 720a43f82becda4a2f26ead30656b83f2d9dd2ac Mon Sep 17 00:00:00 2001
+From: Jens Georg <mail@jensge.org>
+Date: Tue, 13 Nov 2018 19:27:34 +0100
+Subject: [PATCH] authenticator: Fix google and flickr authenticator
+
+There is probably an issue with webkit or how we are using webkit since
+the custom scheme is registered, but out call-back is not called.
+
+Fixes #80
+---
+ .../authenticator/shotwell/FlickrPublishingAuthenticator.vala  | 3 ++-
+ plugins/authenticator/shotwell/GoogleAuthenticator.vala        | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+Index: shotwell-0.28.4/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+===================================================================
+--- shotwell-0.28.4.orig/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
++++ shotwell-0.28.4/plugins/authenticator/shotwell/FlickrPublishingAuthenticator.vala
+@@ -50,12 +50,17 @@ namespace Publishing.Authenticator.Shotw
+ 
+             var ctx = WebKit.WebContext.get_default();
+             ctx.register_uri_scheme("shotwell-auth", this.on_shotwell_auth_request_cb);
++
++            var mgr = ctx.get_security_manager();
++            mgr.register_uri_scheme_as_secure("shotwell-auth");
++            mgr.register_uri_scheme_as_cors_enabled("shotwell-auth");
+         }
+ 
+         public override void on_page_load() {
+             var uri = new Soup.URI(get_view().get_uri());
+             if (uri.scheme == "shotwell-auth" && this.auth_code == null) {
+-                this.error();
++                var form_data = Soup.Form.decode (uri.query);
++                this.auth_code = form_data.lookup("oauth_verifier");
+             }
+ 
+             if (this.auth_code != null) {
+Index: shotwell-0.28.4/plugins/authenticator/shotwell/GoogleAuthenticator.vala
+===================================================================
+--- shotwell-0.28.4.orig/plugins/authenticator/shotwell/GoogleAuthenticator.vala
++++ shotwell-0.28.4/plugins/authenticator/shotwell/GoogleAuthenticator.vala
+@@ -23,7 +23,8 @@ namespace Publishing.Authenticator.Shotw
+         public override void on_page_load() {
+             var uri = new Soup.URI(get_view().get_uri());
+             if (uri.scheme == REVERSE_CLIENT_ID && this.auth_code == null) {
+-                this.error();
++                var form_data = Soup.Form.decode (uri.query);
++                this.auth_code = form_data.lookup("code");
+             }
+ 
+             if (this.auth_code != null) {
diff -Nru shotwell-0.28.4/debian/patches/series shotwell-0.28.4/debian/patches/series
--- shotwell-0.28.4/debian/patches/series	2018-11-12 10:49:35.000000000 +0000
+++ shotwell-0.28.4/debian/patches/series	2020-04-30 08:58:37.000000000 +0000
@@ -1,2 +1,3 @@
 0100-ios8.patch
 git_notifications_segfault.patch
+git_flicker_login.patch