Notification time stamped 2020-01-31 22:55:09 UTC
From f89f97784f2c05b995df6a09a07bbb461e6e0e2d Mon Sep 17 00:00:00 2001
From: Fabio Valentini <decathorpe(a)gmail.com>
Date: Jan 31 2020 22:54:53 +0000
Subject: add upstream patch to fix FTBFS with vala 0.47+
---
diff --git a/00-vala-045-fix.patch b/00-vala-045-fix.patch
new file mode 100644
index 0000000..b67848e
--- /dev/null
+++ b/00-vala-045-fix.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Authentification/Dialog.vala b/src/Authentification/Dialog.vala
+index d3c4a7b..d34f5da 100644
+--- a/src/Authentification/Dialog.vala
++++ b/src/Authentification/Dialog.vala
+@@ -43,7 +43,7 @@ public abstract class OnlineAccounts.Dialog : Gtk.Grid {
+ public string request_id;
+ public OnlineAccounts.SignonUIError error_code;
+
+- public Dialog (HashTable<string, Variant> parameter) {
++ protected Dialog (HashTable<string, Variant> parameter) {
+ error_code = OnlineAccounts.SignonUIError.NONE;
+ this.parameters = parameter;
+ plug.hide_request.connect (() => {
diff --git a/01-vala-047-fix.patch b/01-vala-047-fix.patch
new file mode 100644
index 0000000..7e3810f
--- /dev/null
+++ b/01-vala-047-fix.patch
@@ -0,0 +1,14 @@
+diff --git a/src/Authentification/WebDialog.vala b/src/Authentification/WebDialog.vala
+index 84d0f5c..eeec195 100644
+--- a/src/Authentification/WebDialog.vala
++++ b/src/Authentification/WebDialog.vala
+@@ -109,8 +109,7 @@ public class OnlineAccounts.WebDialog : OnlineAccounts.Dialog {
+ return true;
+ }
+
+- private bool on_load_uri_failed (WebKit.LoadEvent load_event, string failing_uri,
void* _error) {
+- var error = (GLib.Error)_error;
++ private bool on_load_uri_failed (WebKit.LoadEvent load_event, string failing_uri,
GLib.Error error) {
+ warning ("Loading uri '%s' failed, error : %s", failing_uri,
error.message);
+ if (GLib.strcmp (failing_uri, oauth_open_url) == 0) {
+ error_code = OnlineAccounts.SignonUIError.NOT_AVAILABLE;
diff --git a/5fa2882.patch b/5fa2882.patch
deleted file mode 100644
index 06a84b5..0000000
--- a/5fa2882.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 5fa2882f765076d20c6ef4886198a34a05159f8a Mon Sep 17 00:00:00 2001
-From: Rico Tzschichholz <ricotz(a)ubuntu.com>
-Date: Mon, 18 Mar 2019 14:55:02 +0100
-Subject: [PATCH] Constructors of abstract classes should not be public
-
----
- src/Authentification/Dialog.vala | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/Authentification/Dialog.vala b/src/Authentification/Dialog.vala
-index d3c4a7b..d34f5da 100644
---- a/src/Authentification/Dialog.vala
-+++ b/src/Authentification/Dialog.vala
-@@ -43,7 +43,7 @@ public abstract class OnlineAccounts.Dialog : Gtk.Grid {
- public string request_id;
- public OnlineAccounts.SignonUIError error_code;
-
-- public Dialog (HashTable<string, Variant> parameter) {
-+ protected Dialog (HashTable<string, Variant> parameter) {
- error_code = OnlineAccounts.SignonUIError.NONE;
- this.parameters = parameter;
- plug.hide_request.connect (() => {
diff --git a/switchboard-plug-onlineaccounts.spec b/switchboard-plug-onlineaccounts.spec
index c3aa441..225aa37 100644
--- a/switchboard-plug-onlineaccounts.spec
+++ b/switchboard-plug-onlineaccounts.spec
@@ -6,15 +6,19 @@
Name: switchboard-plug-onlineaccounts
Summary: Switchboard Online Accounts plug
Version: 2.0.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
URL:
https://github.com/elementary/%{name}
Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
-# upstream patch to fix new compiler errors with vala 0.45+
+# backported patch to fix new compiler errors with vala 0.45+
#
https://github.com/elementary/switchboard-plug-onlineaccounts/commit/5fa2882
-Patch0: 5fa2882.patch
+Patch0: 00-vala-045-fix.patch
+
+# backported patch to fix new compiler errors with vala 0.47+
+#
https://github.com/elementary/switchboard-plug-onlineaccounts/commit/34164a9
+Patch1: 01-vala-047-fix.patch
BuildRequires: gettext
BuildRequires: meson
@@ -82,6 +86,9 @@ Obsoletes: pantheon-online-accounts-devel <
%{obsoleted_version}
%changelog
+* Fri Jan 31 2020 Fabio Valentini <decathorpe(a)gmail.com> - 2.0.1-6
+- Add upstream patch to fix FTBFS with vala 0.47+.
+
* Fri Jan 31 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.1-5
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
https://src.fedoraproject.org/rpms/switchboard-plug-onlineaccounts/c/f89f...