From c802a9e8d44a7d5a4234e34ebb80663bfe2a473e Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 11 Jan 2024 10:02:47 +0100 Subject: [PATCH] Adapt packaging for the latest release Remove the RHEL specific patch for dropping Google Photos support as the support was dropped upstream. Remove WebKitGTK requirements as GOA now opens your default browser instead of using the embedded web view. --- 0001-google-Remove-Photos-support.patch | 86 ------------------------- gnome-online-accounts.spec | 18 ++---- 2 files changed, 6 insertions(+), 98 deletions(-) delete mode 100644 0001-google-Remove-Photos-support.patch diff --git a/0001-google-Remove-Photos-support.patch b/0001-google-Remove-Photos-support.patch deleted file mode 100644 index c554e5e..0000000 --- a/0001-google-Remove-Photos-support.patch +++ /dev/null @@ -1,86 +0,0 @@ -From f17c21fc97e465b86ed27acceeea331624e66cd6 Mon Sep 17 00:00:00 2001 -From: Debarshi Ray -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 - diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec index 99c0452..c692bd5 100644 --- a/gnome-online-accounts.spec +++ b/gnome-online-accounts.spec @@ -2,7 +2,6 @@ %global glib2_version 2.67.4 %global gtk3_version 3.19.12 %global libsoup_version 3.0 -%global webkit2gtk_version 2.33.1 Name: gnome-online-accounts Version: 3.49.0 @@ -13,11 +12,6 @@ License: LGPL-2.0-or-later URL: https://wiki.gnome.org/Projects/GnomeOnlineAccounts Source0: https://download.gnome.org/sources/gnome-online-accounts/3.49/%{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 -Patch0: 0001-google-Remove-Photos-support.patch - Patch1: gcr_error.patch BuildRequires: pkgconfig(gcr-4) @@ -32,7 +26,6 @@ BuildRequires: meson BuildRequires: vala %if !0%{?flatpak} BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} -BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version} BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version} @@ -44,7 +37,6 @@ Requires: glib2%{?_isa} >= %{glib2_version} %if !0%{?flatpak} Requires: gtk3%{?_isa} >= %{gtk3_version} Requires: libsoup3%{?_isa} >= %{libsoup_version} -Requires: webkit2gtk4.1%{?_isa} >= %{webkit2gtk_version} Requires: gvfs-goa %endif @@ -65,10 +57,6 @@ developing applications that use %{name}. %prep %setup -q -%if 0%{?rhel} >= 9 -%patch -P 0 -p1 -%endif - %patch -P 1 -p0 %build @@ -134,6 +122,12 @@ developing applications that use %{name}. %{_datadir}/vala/ %changelog +* Thu Jan 11 2024 Tomas Popela - 3.49.0-2 +- Don't require WebKitGTK anymore as GOA now spawns your default web browser + instead of using the web view +- Remove the RHEL patch for dropping Google Photos support as it has + been dropped upstream. + * Wed Jan 10 2024 Gwyn Ciesla - 3.49.0-1 - 3.49.0