From 872eeb737df2ab20f751ef2fcd6d4d33626fb2f7 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Fri, 15 Oct 2021 20:22:40 +0200 Subject: [PATCH] Update to 3.43.1 --- .gitignore | 1 + 0001-Remove-Documents-support.patch | 284 ---------------------------- gnome-online-accounts.spec | 17 +- sources | 2 +- 4 files changed, 10 insertions(+), 294 deletions(-) delete mode 100644 0001-Remove-Documents-support.patch diff --git a/.gitignore b/.gitignore index 5850413..af2fabb 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ /gnome-online-accounts-3.38.0.tar.xz /gnome-online-accounts-3.39.92.tar.xz /gnome-online-accounts-3.40.0.tar.xz +/gnome-online-accounts-3.43.1.tar.xz diff --git a/0001-Remove-Documents-support.patch b/0001-Remove-Documents-support.patch deleted file mode 100644 index d4ba5b1..0000000 --- a/0001-Remove-Documents-support.patch +++ /dev/null @@ -1,284 +0,0 @@ -From 8d4d29d2122887c101e58df6f4c61a3c0f5e3a73 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -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. ---- - 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 47a72c9aa07c..db5d6a7b4d58 100644 ---- a/data/dbus-interfaces.xml -+++ b/data/dbus-interfaces.xml -@@ -654,6 +654,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. - --> - - -diff --git a/src/goabackend/goabackendenums.h b/src/goabackend/goabackendenums.h -index 58a4d8aba979..5676e1631111 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 cc9a8f891ff7..beaa9ec7f918 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; -@@ -280,7 +279,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; -@@ -343,10 +341,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); -@@ -366,7 +360,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); -@@ -383,10 +376,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), -@@ -418,7 +407,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 e2ec3e73e9b3..783815c79998 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 0ebdb15ee4bd..d6cba50f68ca 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 65248dd3b688..58107764a6dd 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), -@@ -752,7 +741,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.19.2 - diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec index e0f4872..28940ec 100644 --- a/gnome-online-accounts.spec +++ b/gnome-online-accounts.spec @@ -5,21 +5,18 @@ %global webkit2gtk3_version 2.26.0 Name: gnome-online-accounts -Version: 3.40.0 -Release: 4%{?dist} +Version: 3.43.1 +Release: 1%{?dist} Summary: Single sign-on framework for GNOME License: LGPLv2+ URL: https://wiki.gnome.org/Projects/GnomeOnlineAccounts -Source0: https://download.gnome.org/sources/gnome-online-accounts/3.40/%{name}-%{version}.tar.xz - -# https://pagure.io/fedora-workstation/issue/83 -Patch0: 0001-Remove-Documents-support.patch +Source0: https://download.gnome.org/sources/gnome-online-accounts/3.43/%{name}-%{version}.tar.xz # RHEL >=9 specific # https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/issues/63 # https://bugzilla.redhat.com/show_bug.cgi?id=1913641 -Patch1: 0001-google-Remove-Photos-support.patch +Patch0: 0001-google-Remove-Photos-support.patch BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} @@ -60,10 +57,9 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -p1 %if 0%{?rhel} >= 9 -%patch1 -p1 +%patch0 -p1 %endif %build @@ -137,6 +133,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_datadir}/vala/ %changelog +* Fri Oct 15 2021 Debarshi Ray - 3.43.1-1 +- Update to 3.43.1 + * Thu Jul 22 2021 Fedora Release Engineering - 3.40.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index e85c1ef..7675f33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-online-accounts-3.40.0.tar.xz) = ac90226023e2a69ad9cd12faf637844a029814282f164cc905810bf54af6693069b9019ca58211deb8487f6a32886eb072a1223fca32bc4e3fe0bc91ce8f2d6c +SHA512 (gnome-online-accounts-3.43.1.tar.xz) = a8a11660471062dae6050164c8d225269843a0b470a8328d5a5043934e2095127556a652cbd449b98774eaffa7a1ab7d16b1c5afaf9ba2d018cd1f1b45b8e854