update to 3.43.1-2

This commit is contained in:
zhang__3125 2022-04-13 11:42:25 +08:00
parent 926614be10
commit 6443de83b8
4 changed files with 139 additions and 13 deletions

View File

@ -0,0 +1,86 @@
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

Binary file not shown.

Binary file not shown.

View File

@ -1,17 +1,37 @@
%global gettext_version 0.19.8
%global glib2_version 2.52
%global gtk3_version 3.19.12
%global libsoup_version 2.42
%global webkit2gtk3_version 2.26.0
Name: gnome-online-accounts
Version: 3.38.2
Version: 3.43.1
Release: 2
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.38/%{name}-%{version}.tar.xz
Source0: https://download.gnome.org/sources/gnome-online-accounts/3.43/%{name}-%{version}.tar.xz
Patch0: 0001-google-Remove-Photos-support.patch
BuildRequires: glib2-devel >= 2.52 gcr-devel gtk3-devel >= 3.19.12 libxml2-devel
BuildRequires: gobject-introspection-devel gettext >= 0.19.8 gtk-doc krb5-devel
BuildRequires: webkit2gtk3-devel >= 2.12.0 json-glib-devel libsoup-devel >= 2.42
BuildRequires: libsecret-devel >= 0.7 rest-devel vala
BuildRequires: make vala gtk-doc krb5-devel
BuildRequires: pkgconfig(gcr-3)
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gobject-2.0) >= %{glib2_version}
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
BuildRequires: pkgconfig(gobject-introspection-1.0)
BuildRequires: gettext >= %{gettext_version}
BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk3_version}
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libsecret-1) >= 0.7
BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
BuildRequires: pkgconfig(rest-0.7)
BuildRequires: pkgconfig(libxml-2.0)
Requires: glib2%{?_isa} >= 2.52 gtk3%{?_isa} >= 3.19.12 libsoup%{?_isa} >= 2.42 webkit2gtk3%{?_isa} >= 2.12.0
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gtk3%{?_isa} >= %{gtk3_version}
Requires: libsoup%{?_isa} >= %{libsoup_version}
Requires: webkit2gtk3%{?_isa} >= %{webkit2gtk3_version}
%description
GNOME Online Accounts Single sign-on framework for GNOME. It aims to provide
@ -19,7 +39,6 @@ a way for users to setup online accounts to be used by the core system and
core applications only. Calendar entries show up in GNOME Shell, e-mail in
Evolution, online storages are exposed as GVolumes, and so on.
%package devel
Summary: Libraries and header files
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -36,6 +55,10 @@ Man pages for gnome-online-accounts.
%prep
%autosetup -n %{name}-%{version} -p1
#%setup -q
#%if 0%{?rhel} >= 9
#%patch0 -p1
#%endif
%build
%configure --disable-lastfm --disable-media-server --disable-pocket \
@ -58,19 +81,33 @@ Man pages for gnome-online-accounts.
%files -f %{name}.lang
%license COPYING
%doc COPYING
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/Goa-1.0.typelib
%{_libdir}/libgoa*.so.*
%{_libdir}/libgoa-1.0.so.0
%{_libdir}/libgoa-1.0.so.0.0.0
%{_libdir}/libgoa-backend-1.0.so.1
%{_libdir}/libgoa-backend-1.0.so.1.0.0
%dir %{_libdir}/goa-1.0
%dir %{_libdir}/goa-1.0/web-extensions
%{_libdir}/goa-1.0/web-extensions/libgoawebextension.so
%{_prefix}/libexec/*
%{_datadir}/dbus-1/services/*.service
%{_prefix}/libexec/goa-daemon
%{_prefix}/libexec/goa-identity-service
%{_datadir}/dbus-1/services/org.gnome.OnlineAccounts.service
%{_datadir}/dbus-1/services/org.gnome.Identity.service
%{_datadir}/icons/hicolor/*/apps/goa-*.svg
%{_datadir}/glib-2.0/schemas/org.gnome.online-accounts.gschema.xml
%files devel
%{_includedir}/goa-1.0/
%{_libdir}/libgoa*.so
%{_libdir}/libgoa-1.0.so
%{_libdir}/libgoa-backend-1.0.so
%dir %{_datadir}/gir-1.0
%{_datadir}/gir-1.0/Goa-1.0.gir
%{_libdir}/pkgconfig/goa*.pc
%{_libdir}/pkgconfig/goa-1.0.pc
%{_libdir}/pkgconfig/goa-backend-1.0.pc
%dir %{_datadir}/gtk-doc
%dir %{_datadir}/gtk-doc/html
%{_datadir}/gtk-doc/html/goa/
%{_libdir}/goa-1.0/include
%{_datadir}/vala/
@ -79,6 +116,9 @@ Man pages for gnome-online-accounts.
%{_datadir}/man/man8/goa-daemon.8*
%changelog
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.43.1-2
- update to 3.43.1-2
* Thu Jul 20 2021 liuyumeng <liuyumeng5@huawei.com> - 3.38.2-2
- delete gdb in buildrequires