Compare commits

..

No commits in common. "5d128e95f3916300b4104e8153c842479bfb24de" and "926614be1031aa942d9bfae27afe1692704a1463" have entirely different histories.

5 changed files with 36 additions and 178 deletions

View File

@ -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

Binary file not shown.

Binary file not shown.

View File

@ -1,55 +1,32 @@
%global gettext_version 0.19.8
%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.38.2
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
Name: gnome-online-accounts
Version: 3.48.0
Release: 1
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.48/%{name}-%{version}.tar.xz
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
Patch0: 0001-google-Remove-Photos-support.patch
BuildRequires: gcr-devel
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: gtk-doc
BuildRequires: krb5-devel
BuildRequires: meson
BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version}
BuildRequires: pkgconfig(json-glib-1.0)
BuildRequires: pkgconfig(libsecret-1)
BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
BuildRequires: pkgconfig(rest-1.0)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: vala
Requires: glib2%{?_isa} >= %{glib2_version}
Requires: gtk3%{?_isa} >= %{gtk3_version}
Requires: libsoup3%{?_isa} >= %{libsoup_version}
Requires: webkit2gtk4.1%{?_isa} >= %{webkit2gtk_version}
Requires: glib2%{?_isa} >= 2.52 gtk3%{?_isa} >= 3.19.12 libsoup%{?_isa} >= 2.42 webkit2gtk3%{?_isa} >= 2.12.0
%description
GNOME Online Accounts provides interfaces so that applications and libraries
in GNOME can access the user's online accounts. It has providers for Google,
Nextcloud, Flickr, Foursquare, Microsoft Account, Microsoft Exchange, Fedora,
IMAP/SMTP and Kerberos.
GNOME Online Accounts Single sign-on framework for GNOME. It aims to provide
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: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
Summary: Libraries and header files
Requires: %{name}%{?_isa} = %{version}-%{release}
%description devel
The %{name}-devel package contains libraries and header files for
developing applications that use %{name}.
This package includes libraries and header files for
developing with gnome-online-accounts.
%package help
Summary: Man pages for gnome-online-accounts
@ -61,23 +38,16 @@ Man pages for gnome-online-accounts.
%autosetup -n %{name}-%{version} -p1
%build
%meson \
-Dexchange=true \
-Dgoogle=true \
-Dimap_smtp=true \
-Dfedora=false \
-Dkerberos=false \
-Dlastfm=false \
-Dmedia_server=false \
-Downcloud=true \
-Dwindows_live=true \
-Dman=true \
%{nil}
%configure --disable-lastfm --disable-media-server --disable-pocket \
--disable-silent-rules --disable-static --disable-todoist --enable-documentation \
--enable-facebook --enable-foursquare --enable-exchange --enable-flickr \
--enable-google --enable-gtk-doc --enable-imap-smtp --enable-kerberos \
--enable-owncloud --enable-windows-live
%meson_build
%make_build
%install
%meson_install
%make_install
%delete_la_and_a
@ -88,31 +58,20 @@ Man pages for gnome-online-accounts.
%files -f %{name}.lang
%license COPYING
%doc NEWS README
%dir %{_libdir}/girepository-1.0
%{_libdir}/girepository-1.0/Goa-1.0.typelib
%{_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}/libgoa*.so.*
%{_libdir}/goa-1.0/web-extensions/libgoawebextension.so
%{_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
%{_prefix}/libexec/*
%{_datadir}/dbus-1/services/*.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-1.0.so
%{_libdir}/libgoa-backend-1.0.so
%dir %{_datadir}/gir-1.0
%{_libdir}/libgoa*.so
%{_datadir}/gir-1.0/Goa-1.0.gir
%{_libdir}/pkgconfig/goa-1.0.pc
%{_libdir}/pkgconfig/goa-backend-1.0.pc
%{_libdir}/pkgconfig/goa*.pc
%{_datadir}/gtk-doc/html/goa/
%{_libdir}/goa-1.0/include
%{_datadir}/vala/
@ -120,22 +79,7 @@ Man pages for gnome-online-accounts.
%{_datadir}/man/man8/goa-daemon.8*
%changelog
* Thu Nov 23 2023 lwg <liweiganga@uniontech.com> - 3.48.0-1
- update to version 3.48.0
* Mon Dec 5 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.46.0-1
- update to 3.46.0 for gnome 43
* Mon Jun 6 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.44.0-1
- update to 3.44.0
* Thu May 19 2022 loong_C <loong_c@yeah.net> - 3.43.1-3
- update gnome-online-accounts.spec
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 3.43.1-2
- update to 3.43.1-2
* Tue Jul 20 2021 liuyumeng <liuyumeng5@huawei.com> - 3.38.2-2
* Thu Jul 20 2021 liuyumeng <liuyumeng5@huawei.com> - 3.38.2-2
- delete gdb in buildrequires
* Mon May 24 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 3.38.2-1

View File

@ -1,4 +1,4 @@
version_control: gitlab.gnome
src_repo: gnome-online-accounts
tag_prefix: ^v
separator: .
seperator: .