Compare commits

...

No commits in common. 'c9' and 'i8c-beta' have entirely different histories.
c9 ... i8c-beta

2
.gitignore vendored

@ -1 +1 @@
SOURCES/gnome-online-accounts-3.40.0.tar.xz SOURCES/gnome-online-accounts-3.28.2.tar.xz

@ -1 +1 @@
547da191a47b8f35ced486fa94145b85ad45c864 SOURCES/gnome-online-accounts-3.40.0.tar.xz 382053cff81f8b054d4beb02c0430ee4accb65ed SOURCES/gnome-online-accounts-3.28.2.tar.xz

@ -1,286 +0,0 @@
From 0820053ff418bf64db56fa8e63133c3d2e504807 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Fri, 23 Nov 2018 14:07:09 +0100
Subject: [PATCH] Remove Documents support
In theory, online integration for documents is still desired. However,
these days, GNOME Documents is weekly maintained and doesn't receive
much attention from designers and developers. Therefore, it needs to be
withdrawn from the set of core applications until the situation
changes.
https://pagure.io/fedora-workstation/issue/83
---
data/dbus-interfaces.xml | 3 +++
src/goabackend/goabackendenums.h | 2 +-
src/goabackend/goagoogleprovider.c | 12 ------------
src/goabackend/goaobjectskeletonutils.c | 23 -----------------------
src/goabackend/goaobjectskeletonutils.h | 3 ---
src/goabackend/goaowncloudprovider.c | 12 ------------
src/goabackend/goawindowsliveprovider.c | 17 ++---------------
7 files changed, 6 insertions(+), 66 deletions(-)
diff --git a/data/dbus-interfaces.xml b/data/dbus-interfaces.xml
index 21c42c13d003..072d6aaca3b6 100644
--- a/data/dbus-interfaces.xml
+++ b/data/dbus-interfaces.xml
@@ -668,6 +668,9 @@
An account object implements this interface if it provides
documents-like capabilities.
+
+ The #org.gnome.OnlineAccounts.Documents interface is not used
+ by any account.
-->
<interface name="org.gnome.OnlineAccounts.Documents">
</interface>
diff --git a/src/goabackend/goabackendenums.h b/src/goabackend/goabackendenums.h
index 638674aaf4e0..38f46fa8c193 100644
--- a/src/goabackend/goabackendenums.h
+++ b/src/goabackend/goabackendenums.h
@@ -63,7 +63,7 @@ typedef enum
* @GOA_PROVIDER_FEATURE_CALENDAR: Calendaring services (ie. CalDAV).
* @GOA_PROVIDER_FEATURE_CONTACTS: Addressbook services (ie. CardDAV).
* @GOA_PROVIDER_FEATURE_CHAT: Instant messaging services (ie. XMPP, IRC).
- * @GOA_PROVIDER_FEATURE_DOCUMENTS: Documents storage services (ie. Google Documents).
+ * @GOA_PROVIDER_FEATURE_DOCUMENTS: Documents storage services (ie. Google Documents); currently unused.
* @GOA_PROVIDER_FEATURE_PHOTOS: Photos storage services (ie. Flickr).
* @GOA_PROVIDER_FEATURE_FILES: Files storage services (ie. WebDAV).
* @GOA_PROVIDER_FEATURE_TICKETING: Ticketing services (ie. Kerberos).
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index 9e331c110119..9332c0fdca0b 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -69,7 +69,6 @@ get_provider_features (GoaProvider *provider)
GOA_PROVIDER_FEATURE_MAIL |
GOA_PROVIDER_FEATURE_CALENDAR |
GOA_PROVIDER_FEATURE_CONTACTS |
- GOA_PROVIDER_FEATURE_DOCUMENTS |
GOA_PROVIDER_FEATURE_PHOTOS |
GOA_PROVIDER_FEATURE_FILES |
GOA_PROVIDER_FEATURE_PRINTERS;
@@ -281,7 +280,6 @@ build_object (GoaProvider *provider,
gboolean mail_enabled;
gboolean calendar_enabled;
gboolean contacts_enabled;
- gboolean documents_enabled;
gboolean files_enabled;
gboolean photos_enabled;
gboolean printers_enabled;
@@ -344,10 +342,6 @@ build_object (GoaProvider *provider,
contacts_enabled,
FALSE);
- /* Documents */
- documents_enabled = g_key_file_get_boolean (key_file, group, "DocumentsEnabled", NULL);
- goa_object_skeleton_attach_documents (object, documents_enabled);
-
/* Photos */
photos_enabled = g_key_file_get_boolean (key_file, group, "PhotosEnabled", NULL);
goa_object_skeleton_attach_photos (object, photos_enabled);
@@ -367,7 +361,6 @@ build_object (GoaProvider *provider,
goa_account_set_mail_disabled (account, !mail_enabled);
goa_account_set_calendar_disabled (account, !calendar_enabled);
goa_account_set_contacts_disabled (account, !contacts_enabled);
- goa_account_set_documents_disabled (account, !documents_enabled);
goa_account_set_photos_disabled (account, !photos_enabled);
goa_account_set_files_disabled (account, !files_enabled);
goa_account_set_printers_disabled (account, !printers_enabled);
@@ -384,10 +377,6 @@ build_object (GoaProvider *provider,
"notify::contacts-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
(gpointer) "ContactsEnabled");
- g_signal_connect (account,
- "notify::documents-disabled",
- G_CALLBACK (goa_util_account_notify_property_cb),
- (gpointer) "DocumentsEnabled");
g_signal_connect (account,
"notify::photos-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
@@ -419,7 +408,6 @@ add_account_key_values (GoaOAuth2Provider *oauth2_provider,
g_variant_builder_add (builder, "{ss}", "MailEnabled", "true");
g_variant_builder_add (builder, "{ss}", "CalendarEnabled", "true");
g_variant_builder_add (builder, "{ss}", "ContactsEnabled", "true");
- g_variant_builder_add (builder, "{ss}", "DocumentsEnabled", "true");
g_variant_builder_add (builder, "{ss}", "PhotosEnabled", "true");
g_variant_builder_add (builder, "{ss}", "FilesEnabled", "true");
g_variant_builder_add (builder, "{ss}", "PrintersEnabled", "true");
diff --git a/src/goabackend/goaobjectskeletonutils.c b/src/goabackend/goaobjectskeletonutils.c
index 657bffd712f3..610c6ee26233 100644
--- a/src/goabackend/goaobjectskeletonutils.c
+++ b/src/goabackend/goaobjectskeletonutils.c
@@ -109,29 +109,6 @@ goa_object_skeleton_attach_contacts (GoaObjectSkeleton *object,
g_clear_object (&contacts);
}
-void
-goa_object_skeleton_attach_documents (GoaObjectSkeleton *object,
- gboolean documents_enabled)
-{
- GoaDocuments *documents;
-
- documents = goa_object_get_documents (GOA_OBJECT (object));
- if (documents_enabled)
- {
- if (documents == NULL)
- {
- documents = goa_documents_skeleton_new ();
- goa_object_skeleton_set_documents (object, documents);
- }
- }
- else
- {
- if (documents != NULL)
- goa_object_skeleton_set_documents (object, NULL);
- }
- g_clear_object (&documents);
-}
-
void
goa_object_skeleton_attach_photos (GoaObjectSkeleton *object,
gboolean photos_enabled)
diff --git a/src/goabackend/goaobjectskeletonutils.h b/src/goabackend/goaobjectskeletonutils.h
index 699695285028..6bc413c38f55 100644
--- a/src/goabackend/goaobjectskeletonutils.h
+++ b/src/goabackend/goaobjectskeletonutils.h
@@ -38,9 +38,6 @@ void goa_object_skeleton_attach_contacts (GoaObjectSkeleton *o
gboolean contacts_enabled,
gboolean accept_ssl_errors);
-void goa_object_skeleton_attach_documents (GoaObjectSkeleton *object,
- gboolean documents_enabled);
-
void goa_object_skeleton_attach_files (GoaObjectSkeleton *object,
const gchar *uri,
gboolean files_enabled,
diff --git a/src/goabackend/goaowncloudprovider.c b/src/goabackend/goaowncloudprovider.c
index 29d461a880d8..d1429661fe2e 100644
--- a/src/goabackend/goaowncloudprovider.c
+++ b/src/goabackend/goaowncloudprovider.c
@@ -72,7 +72,6 @@ get_provider_features (GoaProvider *provider)
return GOA_PROVIDER_FEATURE_BRANDED |
GOA_PROVIDER_FEATURE_CALENDAR |
GOA_PROVIDER_FEATURE_CONTACTS |
- GOA_PROVIDER_FEATURE_DOCUMENTS |
GOA_PROVIDER_FEATURE_FILES;
}
@@ -145,7 +144,6 @@ build_object (GoaProvider *provider,
gboolean accept_ssl_errors;
gboolean calendar_enabled;
gboolean contacts_enabled;
- gboolean documents_enabled;
gboolean files_enabled;
gboolean ret = FALSE;
const gchar *identity;
@@ -196,10 +194,6 @@ build_object (GoaProvider *provider,
goa_object_skeleton_attach_contacts (object, uri_carddav, contacts_enabled, accept_ssl_errors);
g_free (uri_carddav);
- /* Documents */
- documents_enabled = g_key_file_get_boolean (key_file, group, "DocumentsEnabled", NULL);
- goa_object_skeleton_attach_documents (object, documents_enabled);
-
/* Files */
files_enabled = g_key_file_get_boolean (key_file, group, "FilesEnabled", NULL);
uri_webdav = get_webdav_uri (uri);
@@ -210,7 +204,6 @@ build_object (GoaProvider *provider,
{
goa_account_set_calendar_disabled (account, !calendar_enabled);
goa_account_set_contacts_disabled (account, !contacts_enabled);
- goa_account_set_documents_disabled (account, !documents_enabled);
goa_account_set_files_disabled (account, !files_enabled);
g_signal_connect (account,
@@ -221,10 +214,6 @@ build_object (GoaProvider *provider,
"notify::contacts-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
(gpointer) "ContactsEnabled");
- g_signal_connect (account,
- "notify::documents-disabled",
- G_CALLBACK (goa_util_account_notify_property_cb),
- (gpointer) "DocumentsEnabled");
g_signal_connect (account,
"notify::files-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
@@ -750,7 +739,6 @@ add_account (GoaProvider *provider,
g_variant_builder_init (&details, G_VARIANT_TYPE ("a{ss}"));
g_variant_builder_add (&details, "{ss}", "CalendarEnabled", "true");
g_variant_builder_add (&details, "{ss}", "ContactsEnabled", "true");
- g_variant_builder_add (&details, "{ss}", "DocumentsEnabled", "true");
g_variant_builder_add (&details, "{ss}", "FilesEnabled", "true");
g_variant_builder_add (&details, "{ss}", "Uri", uri);
g_variant_builder_add (&details, "{ss}", "AcceptSslErrors", (accept_ssl_errors) ? "true" : "false");
diff --git a/src/goabackend/goawindowsliveprovider.c b/src/goabackend/goawindowsliveprovider.c
index 10c2dcff4738..be357465230a 100644
--- a/src/goabackend/goawindowsliveprovider.c
+++ b/src/goabackend/goawindowsliveprovider.c
@@ -73,8 +73,7 @@ static GoaProviderFeatures
get_provider_features (GoaProvider *provider)
{
return GOA_PROVIDER_FEATURE_BRANDED |
- GOA_PROVIDER_FEATURE_MAIL |
- GOA_PROVIDER_FEATURE_DOCUMENTS;
+ GOA_PROVIDER_FEATURE_MAIL;
}
static const gchar *
@@ -102,14 +101,13 @@ get_scope (GoaOAuth2Provider *oauth2_provider)
{
return "wl.imap,"
"wl.offline_access,"
- "wl.skydrive_update,"
"wl.emails";
}
static guint
get_credentials_generation (GoaProvider *provider)
{
- return 3;
+ return 4;
}
static const gchar *
@@ -276,7 +274,6 @@ build_object (GoaProvider *provider,
GoaAccount *account = NULL;
GoaMail *mail = NULL;
gboolean mail_enabled;
- gboolean documents_enabled;
gboolean ret = FALSE;
const gchar *email_address;
@@ -323,23 +320,14 @@ build_object (GoaProvider *provider,
goa_object_skeleton_set_mail (object, NULL);
}
- /* Documents */
- documents_enabled = g_key_file_get_boolean (key_file, group, "DocumentsEnabled", NULL);
- goa_object_skeleton_attach_documents (object, documents_enabled);
-
if (just_added)
{
goa_account_set_mail_disabled (account, !mail_enabled);
- goa_account_set_documents_disabled (account, !documents_enabled);
g_signal_connect (account,
"notify::mail-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
(gpointer) "MailEnabled");
- g_signal_connect (account,
- "notify::documents-disabled",
- G_CALLBACK (goa_util_account_notify_property_cb),
- (gpointer) "DocumentsEnabled");
}
ret = TRUE;
@@ -357,7 +345,6 @@ add_account_key_values (GoaOAuth2Provider *oauth2_provider,
GVariantBuilder *builder)
{
g_variant_builder_add (builder, "{ss}", "MailEnabled", "true");
- g_variant_builder_add (builder, "{ss}", "DocumentsEnabled", "true");
}
/* ---------------------------------------------------------------------------------------------------- */
--
2.30.2

@ -1,86 +0,0 @@
From f17c21fc97e465b86ed27acceeea331624e66cd6 Mon Sep 17 00:00:00 2001
From: Debarshi Ray <debarshir@gnome.org>
Date: Thu, 22 Apr 2021 01:51:52 +0200
Subject: [PATCH] google: Remove Photos support
In theory, support for photos is still desired. However, right now the
implementation of the Google PicasaWeb API in libgdata no longer works.
Until that's fixed, there's no point in advertising support for photos.
https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/issues/63
https://bugzilla.redhat.com/show_bug.cgi?id=1913641
---
src/goabackend/goagoogleprovider.c | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/src/goabackend/goagoogleprovider.c b/src/goabackend/goagoogleprovider.c
index 9332c0fdca0b..b3c0f8fdcc66 100644
--- a/src/goabackend/goagoogleprovider.c
+++ b/src/goabackend/goagoogleprovider.c
@@ -69,7 +69,6 @@ get_provider_features (GoaProvider *provider)
GOA_PROVIDER_FEATURE_MAIL |
GOA_PROVIDER_FEATURE_CALENDAR |
GOA_PROVIDER_FEATURE_CONTACTS |
- GOA_PROVIDER_FEATURE_PHOTOS |
GOA_PROVIDER_FEATURE_FILES |
GOA_PROVIDER_FEATURE_PRINTERS;
}
@@ -117,9 +116,6 @@ get_scope (GoaOAuth2Provider *oauth2_provider)
"https://docs.googleusercontent.com/ "
"https://spreadsheets.google.com/feeds/ "
- /* Google PicasaWeb API (GData) */
- "https://picasaweb.google.com/data/ "
-
/* GMail IMAP and SMTP access */
"https://mail.google.com/ "
@@ -281,7 +277,6 @@ build_object (GoaProvider *provider,
gboolean calendar_enabled;
gboolean contacts_enabled;
gboolean files_enabled;
- gboolean photos_enabled;
gboolean printers_enabled;
const gchar *email_address;
@@ -342,10 +337,6 @@ build_object (GoaProvider *provider,
contacts_enabled,
FALSE);
- /* Photos */
- photos_enabled = g_key_file_get_boolean (key_file, group, "PhotosEnabled", NULL);
- goa_object_skeleton_attach_photos (object, photos_enabled);
-
/* Files */
files_enabled = g_key_file_get_boolean (key_file, group, "FilesEnabled", NULL);
uri_drive = g_strconcat ("google-drive://", email_address, "/", NULL);
@@ -361,7 +352,6 @@ build_object (GoaProvider *provider,
goa_account_set_mail_disabled (account, !mail_enabled);
goa_account_set_calendar_disabled (account, !calendar_enabled);
goa_account_set_contacts_disabled (account, !contacts_enabled);
- goa_account_set_photos_disabled (account, !photos_enabled);
goa_account_set_files_disabled (account, !files_enabled);
goa_account_set_printers_disabled (account, !printers_enabled);
@@ -377,10 +367,6 @@ build_object (GoaProvider *provider,
"notify::contacts-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
(gpointer) "ContactsEnabled");
- g_signal_connect (account,
- "notify::photos-disabled",
- G_CALLBACK (goa_util_account_notify_property_cb),
- (gpointer) "PhotosEnabled");
g_signal_connect (account,
"notify::files-disabled",
G_CALLBACK (goa_util_account_notify_property_cb),
@@ -408,7 +394,6 @@ add_account_key_values (GoaOAuth2Provider *oauth2_provider,
g_variant_builder_add (builder, "{ss}", "MailEnabled", "true");
g_variant_builder_add (builder, "{ss}", "CalendarEnabled", "true");
g_variant_builder_add (builder, "{ss}", "ContactsEnabled", "true");
- g_variant_builder_add (builder, "{ss}", "PhotosEnabled", "true");
g_variant_builder_add (builder, "{ss}", "FilesEnabled", "true");
g_variant_builder_add (builder, "{ss}", "PrintersEnabled", "true");
}
--
2.30.2

@ -0,0 +1,229 @@
diff -up gnome-online-accounts-3.28.2/src/goabackend/goautils.c.mute-debug-prints gnome-online-accounts-3.28.2/src/goabackend/goautils.c
--- gnome-online-accounts-3.28.2/src/goabackend/goautils.c.mute-debug-prints 2019-02-10 20:18:08.000000000 +0100
+++ gnome-online-accounts-3.28.2/src/goabackend/goautils.c 2022-09-02 12:02:45.020910337 +0200
@@ -380,7 +380,7 @@ goa_utils_delete_credentials_for_id_sync
NULL);
if (sec_error != NULL)
{
- g_warning ("secret_password_clear_sync() failed: %s", sec_error->message);
+ g_debug ("secret_password_clear_sync() failed: %s", sec_error->message);
g_set_error_literal (error,
GOA_ERROR,
GOA_ERROR_FAILED, /* TODO: more specific */
@@ -428,7 +428,7 @@ goa_utils_lookup_credentials_sync (GoaPr
NULL);
if (sec_error != NULL)
{
- g_warning ("secret_password_lookup_sync() failed: %s", sec_error->message);
+ g_debug ("secret_password_lookup_sync() failed: %s", sec_error->message);
g_set_error_literal (error,
GOA_ERROR,
GOA_ERROR_FAILED, /* TODO: more specific */
@@ -438,7 +438,7 @@ goa_utils_lookup_credentials_sync (GoaPr
}
else if (password == NULL)
{
- g_warning ("secret_password_lookup_sync() returned NULL");
+ g_debug ("secret_password_lookup_sync() returned NULL");
g_set_error_literal (error,
GOA_ERROR,
GOA_ERROR_FAILED, /* TODO: more specific */
@@ -509,7 +509,7 @@ goa_utils_store_credentials_for_id_sync
"goa-identity", password_key,
NULL))
{
- g_warning ("secret_password_store_sync() failed: %s", sec_error->message);
+ g_debug ("secret_password_store_sync() failed: %s", sec_error->message);
g_set_error_literal (error,
GOA_ERROR,
GOA_ERROR_FAILED, /* TODO: more specific */
@@ -562,11 +562,11 @@ goa_utils_keyfile_copy_group (GKeyFile
keys = g_key_file_get_keys (src_key_file, src_group_name, NULL, &error);
if (error != NULL)
{
- g_warning ("Error getting keys from group %s: %s (%s, %d)",
- src_group_name,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error getting keys from group %s: %s (%s, %d)",
+ src_group_name,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_error_free (error);
goto out;
}
@@ -580,12 +580,12 @@ goa_utils_keyfile_copy_group (GKeyFile
src_value = g_key_file_get_value (src_key_file, src_group_name, keys[i], &error);
if (error != NULL)
{
- g_warning ("Error reading key %s from group %s: %s (%s, %d)",
- keys[i],
- src_group_name,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error reading key %s from group %s: %s (%s, %d)",
+ keys[i],
+ src_group_name,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_error_free (error);
continue;
}
@@ -597,12 +597,12 @@ goa_utils_keyfile_copy_group (GKeyFile
if (!g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_GROUP_NOT_FOUND)
&& !g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND))
{
- g_warning ("Error reading key %s from group %s: %s (%s, %d)",
- keys[i],
- src_group_name,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error reading key %s from group %s: %s (%s, %d)",
+ keys[i],
+ src_group_name,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
}
g_error_free (error);
@@ -635,12 +635,12 @@ goa_utils_keyfile_get_boolean (GKeyFile
{
if (!g_error_matches (error, G_KEY_FILE_ERROR, G_KEY_FILE_ERROR_KEY_NOT_FOUND))
{
- g_warning ("Error reading key %s from group %s in keyfile: %s (%s, %d)",
- key,
- group_name,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error reading key %s from group %s in keyfile: %s (%s, %d)",
+ key,
+ group_name,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
}
g_error_free (error);
@@ -667,11 +667,11 @@ goa_utils_keyfile_remove_key (GoaAccount
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
&error))
{
- g_warning ("Error loading keyfile %s: %s (%s, %d)",
- path,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error loading keyfile %s: %s (%s, %d)",
+ path,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_error_free (error);
goto out;
}
@@ -683,7 +683,7 @@ goa_utils_keyfile_remove_key (GoaAccount
if (!g_key_file_save_to_file (key_file, path, &error))
{
g_prefix_error (&error, "Error writing key-value-file %s: ", path);
- g_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
+ g_debug ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
@@ -714,11 +714,11 @@ goa_utils_keyfile_set_boolean (GoaAccoun
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
&error))
{
- g_warning ("Error loading keyfile %s: %s (%s, %d)",
- path,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error loading keyfile %s: %s (%s, %d)",
+ path,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_error_free (error);
goto out;
}
@@ -727,12 +727,12 @@ goa_utils_keyfile_set_boolean (GoaAccoun
old_value = g_key_file_get_boolean (key_file, group, key, &error);
if (error != NULL)
{
- g_warning ("Error reading key %s from keyfile %s: %s (%s, %d)",
- key,
- path,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error reading key %s from keyfile %s: %s (%s, %d)",
+ key,
+ path,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
needs_update = TRUE;
g_error_free (error);
}
@@ -750,7 +750,7 @@ goa_utils_keyfile_set_boolean (GoaAccoun
if (!g_key_file_save_to_file (key_file, path, &error))
{
g_prefix_error (&error, "Error writing key-value-file %s: ", path);
- g_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
+ g_debug ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}
@@ -781,11 +781,11 @@ goa_utils_keyfile_set_string (GoaAccount
G_KEY_FILE_KEEP_COMMENTS | G_KEY_FILE_KEEP_TRANSLATIONS,
&error))
{
- g_warning ("Error loading keyfile %s: %s (%s, %d)",
- path,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error loading keyfile %s: %s (%s, %d)",
+ path,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
g_error_free (error);
goto out;
}
@@ -794,12 +794,12 @@ goa_utils_keyfile_set_string (GoaAccount
old_value = g_key_file_get_string (key_file, group, key, &error);
if (error != NULL)
{
- g_warning ("Error reading key %s from keyfile %s: %s (%s, %d)",
- key,
- path,
- error->message,
- g_quark_to_string (error->domain),
- error->code);
+ g_debug ("Error reading key %s from keyfile %s: %s (%s, %d)",
+ key,
+ path,
+ error->message,
+ g_quark_to_string (error->domain),
+ error->code);
needs_update = TRUE;
g_error_free (error);
}
@@ -817,7 +817,7 @@ goa_utils_keyfile_set_string (GoaAccount
if (!g_key_file_save_to_file (key_file, path, &error))
{
g_prefix_error (&error, "Error writing key-value-file %s: ", path);
- g_warning ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
+ g_debug ("%s (%s, %d)", error->message, g_quark_to_string (error->domain), error->code);
g_error_free (error);
goto out;
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -2,25 +2,20 @@
%global glib2_version 2.52 %global glib2_version 2.52
%global gtk3_version 3.19.12 %global gtk3_version 3.19.12
%global libsoup_version 2.42 %global libsoup_version 2.42
%global webkit2gtk3_version 2.26.0
Name: gnome-online-accounts Name: gnome-online-accounts
Version: 3.40.0 Version: 3.28.2
Release: 3%{?dist} Release: 7%{?dist}
Summary: Single sign-on framework for GNOME Summary: Single sign-on framework for GNOME
License: LGPLv2+ License: LGPLv2+
URL: https://wiki.gnome.org/Projects/GnomeOnlineAccounts URL: https://wiki.gnome.org/Projects/GnomeOnlineAccounts
Source0: https://download.gnome.org/sources/gnome-online-accounts/3.40/%{name}-%{version}.tar.xz Source0: https://download.gnome.org/sources/gnome-online-accounts/3.28/%{name}-%{version}.tar.xz
# https://pagure.io/fedora-workstation/issue/83 Patch01: 0001-mute-debug-prints.patch
Patch: 0001-Remove-Documents-support.patch Patch02: 0002-Drop-dependency-on-WebKitGTK-139.patch
# https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/issues/63 Obsoletes: gnome-online-accounts-oauth2 < 3.28.2-6
# https://bugzilla.redhat.com/show_bug.cgi?id=1913641
Patch: 0001-google-Remove-Photos-support.patch
Patch: kerberos-fixes.patch
BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gcr-3)
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
@ -31,26 +26,27 @@ BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: gettext >= %{gettext_version} BuildRequires: gettext >= %{gettext_version}
BuildRequires: gtk-doc BuildRequires: gtk-doc
BuildRequires: krb5-devel BuildRequires: krb5-devel
BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk3_version}
BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libsecret-1) >= 0.7 BuildRequires: pkgconfig(libsecret-1) >= 0.7
BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
BuildRequires: pkgconfig(rest-0.7) BuildRequires: pkgconfig(rest-0.7)
%if ! 0%{?fedora} && 0%{?rhel} <= 7
BuildRequires: pkgconfig(telepathy-glib)
%endif
BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: vala BuildRequires: vala
BuildRequires: make BuildRequires: autoconf
BuildRequires: git BuildRequires: automake
Requires: glib2%{?_isa} >= %{glib2_version} Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gtk3%{?_isa} >= %{gtk3_version} Requires: gtk3%{?_isa} >= %{gtk3_version}
Requires: libsoup%{?_isa} >= %{libsoup_version} Requires: libsoup%{?_isa} >= %{libsoup_version}
Requires: webkit2gtk3%{?_isa} >= %{webkit2gtk3_version}
%description %description
GNOME Online Accounts provides interfaces so that applications and libraries GNOME Online Accounts provides interfaces so that applications and libraries
in GNOME can access the user's online accounts. It has providers for Google, in GNOME can access the user's online accounts. It has providers for Google,
Nextcloud, Microsoft Account, Microsoft Exchange, Fedora, IMAP/SMTP and ownCloud, Facebook, Foursquare, Microsoft Account, Pocket, Microsoft
Kerberos. Exchange, IMAP/SMTP and Kerberos.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
@ -61,9 +57,18 @@ The %{name}-devel package contains libraries and header files for
developing applications that use %{name}. developing applications that use %{name}.
%prep %prep
%autosetup -S git %setup -q
%patch01 -p1 -b .mute-debug-prints
%patch02 -p1 -b .no-webkitgtk
%build %build
aclocal -I m4
autoheader
automake --add-missing
libtoolize
#intltoolize --force
autoconf
%configure \ %configure \
--disable-facebook \ --disable-facebook \
--disable-flickr \ --disable-flickr \
@ -72,15 +77,15 @@ developing applications that use %{name}.
--disable-media-server \ --disable-media-server \
--disable-silent-rules \ --disable-silent-rules \
--disable-static \ --disable-static \
--enable-compile-warnings=yes \ --disable-telepathy \
--enable-documentation \ --disable-todoist \
--enable-fedora \
--enable-exchange \ --enable-exchange \
--enable-google \ --enable-google \
--enable-gtk-doc \ --enable-gtk-doc \
--enable-imap-smtp \ --enable-imap-smtp \
--enable-kerberos \ --enable-kerberos \
--enable-owncloud \ --enable-owncloud \
--enable-pocket \
--enable-windows-live --enable-windows-live
%make_build %make_build
@ -90,9 +95,18 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%find_lang %{name} %find_lang %{name}
%if ! 0%{?fedora} && 0%{?rhel} <= 7
%find_lang %{name}-tpaw
%endif
%ldconfig_scriptlets %ldconfig_scriptlets
%if ! 0%{?fedora} && 0%{?rhel} <= 7
%files -f %{name}.lang -f %{name}-tpaw.lang
%else
%files -f %{name}.lang %files -f %{name}.lang
%endif
%license COPYING %license COPYING
%doc COPYING %doc COPYING
%dir %{_libdir}/girepository-1.0 %dir %{_libdir}/girepository-1.0
@ -102,16 +116,24 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_libdir}/libgoa-backend-1.0.so.1 %{_libdir}/libgoa-backend-1.0.so.1
%{_libdir}/libgoa-backend-1.0.so.1.0.0 %{_libdir}/libgoa-backend-1.0.so.1.0.0
%dir %{_libdir}/goa-1.0 %dir %{_libdir}/goa-1.0
%dir %{_libdir}/goa-1.0/web-extensions
%{_libdir}/goa-1.0/web-extensions/libgoawebextension.so
%{_prefix}/libexec/goa-daemon %{_prefix}/libexec/goa-daemon
%{_prefix}/libexec/goa-identity-service %{_prefix}/libexec/goa-identity-service
%{_prefix}/libexec/goa-oauth2-handler
%{_datadir}/applications/org.gnome.OnlineAccounts.OAuth2.desktop
%{_datadir}/dbus-1/services/org.gnome.OnlineAccounts.service %{_datadir}/dbus-1/services/org.gnome.OnlineAccounts.service
%{_datadir}/dbus-1/services/org.gnome.Identity.service %{_datadir}/dbus-1/services/org.gnome.Identity.service
%{_datadir}/icons/hicolor/*/apps/goa-*.svg %{_datadir}/icons/hicolor/*/apps/goa-*.png
%{_datadir}/man/man8/goa-daemon.8* %{_datadir}/man/man8/goa-daemon.8*
%{_datadir}/glib-2.0/schemas/org.gnome.online-accounts.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.online-accounts.gschema.xml
%if ! 0%{?fedora} && 0%{?rhel} <= 7
%{_datadir}/icons/hicolor/*/apps/im-*.png
%{_datadir}/icons/hicolor/*/apps/im-*.svg
%dir %{_datadir}/%{name}
%{_datadir}/%{name}/irc-networks.xml
%endif
%files devel %files devel
%{_includedir}/goa-1.0/ %{_includedir}/goa-1.0/
%{_libdir}/libgoa-1.0.so %{_libdir}/libgoa-1.0.so
@ -120,117 +142,38 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_datadir}/gir-1.0/Goa-1.0.gir %{_datadir}/gir-1.0/Goa-1.0.gir
%{_libdir}/pkgconfig/goa-1.0.pc %{_libdir}/pkgconfig/goa-1.0.pc
%{_libdir}/pkgconfig/goa-backend-1.0.pc %{_libdir}/pkgconfig/goa-backend-1.0.pc
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/goa/ %{_datadir}/gtk-doc/html/goa/
%{_libdir}/goa-1.0/include %{_libdir}/goa-1.0/include
%{_datadir}/vala/ %{_datadir}/vala/
%changelog %changelog
* Tue Jun 06 2023 Ray Strode <rstrode@redhat.com> - 3.40.0-3 * Fri Mar 29 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 3.28.2-7
- Backport various kerberos fixes from upstream - Rebuilt for MSVSphere 8.10 beta
Resolves: #2177765
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.0-2
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Thu Apr 22 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.40.0-1
- Update to 3.40.0
- Disable the Facebook, Flickr and Foursquare providers
- Remove Photos support from the Google provider
Resolves: #1913641
* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.39.92-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Tue Mar 16 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.39.92-1
- Update to 3.39.92
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Oct 16 2020 Kalev Lember <klember@redhat.com> - 3.38.0-1
- Update to 3.38.0
* Mon Aug 10 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.37.90-1
- Update to 3.37.90
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.36.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Mar 10 2020 Kalev Lember <klember@redhat.com> - 3.36.0-1
- Update to 3.36.0
* Tue Feb 11 2020 Kalev Lember <klember@redhat.com> - 3.35.90-1
- Update to 3.35.90
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Sat Jan 04 2020 Debarshi Ray <rishi@fedoraproject.org> - 3.35.3-1
- Update to 3.35.3
* Tue Oct 15 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.35.1-1
- Update to 3.35.1
* Wed Sep 11 2019 Kalev Lember <klember@redhat.com> - 3.34.0-1
- Update to 3.34.0
* Tue Sep 03 2019 Kalev Lember <klember@redhat.com> - 3.33.92-1
- Update to 3.33.92
* Wed Aug 21 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.33.91-1
- Update to 3.33.91
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.32.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Mar 29 2019 Kalev Lember <klember@redhat.com> - 3.32.0-1
- Update to 3.32.0
* Sat Feb 09 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.31.90-1
- Update to 3.31.90
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.3-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Mon Dec 17 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.31.3-2
- Drop the documents integration (fedora-workstation/issue/83)
* Wed Dec 12 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.31.3-1
- Update to 3.31.3
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.30.0-3
- Rebuilt against fixed atk (#1626575)
* Fri Sep 07 2018 Kalev Lember <klember@redhat.com> - 3.30.0-2 * Wed Nov 15 2023 Milan Crha <mcrha@redhat.com> - 3.28.2-7
- Fix gtk-doc directory ownership - Related: RHEL-10493 (Add margin around OAuth2 prompt content)
* Mon Sep 03 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.30.0-1 * Thu Nov 09 2023 Milan Crha <mcrha@redhat.com> - 3.28.2-6
- Update to 3.30.0 - Resolves: RHEL-10493 (Move account types that depend on WebKitGTK into separate optional subpackage)
- Disable Pocket - backport upstream fix to use external browser for OAuth2
* Thu Aug 16 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.29.91-1 * Wed Oct 11 2023 Milan Crha <mcrha@redhat.com> - 3.28.2-5
- Update to 3.29.91 - Resolves: RHEL-10493 (Move account types that depend on WebKitGTK into separate optional subpackage)
* Thu Aug 9 2018 Owen Taylor <otaylor@redhat.com> - 3.29.4-2 * Fri Sep 02 2022 Milan Crha <mcrha@redhat.com> - 3.28.2-4
- Remove Requires: gettext-libs - it is extraneous - Resolves: #2068010 (Turn runtime warnings around libsecret into debug prints)
- Use a glob for man page, to handle variations in man page compression.
* Wed Jul 18 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.29.4-1 * Sat Apr 24 2021 Debarshi Ray <rishi@fedoraproject.org> - 3.28.2-3
- Update to 3.29.4 - Disable the Facebook and Foursquare providers
Resolves: #1951086, #1952136
* Mon Jul 16 2018 Debarshi Ray <rishi@fedoraproject.org> - 3.29.1-1 * Mon Feb 01 2021 Tomas Popela <tpopela@redhat.com> - 3.28.2-2
- Update to 3.29.1 - Rebuild to fix multilib issues
- Drop RHEL 7 compatibility because Telepathy is no longer supported Resolves: #1765627
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.28.0-2 * Tue Nov 05 2019 Debarshi Ray <rishi@fedoraproject.org> - 3.28.2-1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - Update to 3.28.2
Resolves: #1674535
* Thu Mar 15 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1 * Thu Mar 15 2018 Kalev Lember <klember@redhat.com> - 3.28.0-1
- Update to 3.28.0 - Update to 3.28.0

Loading…
Cancel
Save