diff --git a/SOURCES/0006-Added-yandex-disk-webdav-support.patch b/SOURCES/0001-Added-yandex-disk-webdav-support.patch similarity index 88% rename from SOURCES/0006-Added-yandex-disk-webdav-support.patch rename to SOURCES/0001-Added-yandex-disk-webdav-support.patch index f6cbb93..016b5d4 100644 --- a/SOURCES/0006-Added-yandex-disk-webdav-support.patch +++ b/SOURCES/0001-Added-yandex-disk-webdav-support.patch @@ -1,7 +1,7 @@ -From 7dfaa155f698408a23f3502ac82a00be5377dd16 Mon Sep 17 00:00:00 2001 +From 7e3e59a4ab72c7fdcedf00e28247f565cdc3f84d Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Mon, 21 Aug 2023 16:56:22 +0300 -Subject: [PATCH 6/7] Added yandex disk webdav support +Subject: [PATCH] Added yandex disk webdav support --- src/goabackend/goayandexprovider.c | 4 ++-- @@ -30,5 +30,5 @@ index ab74283..acaa599 100644 g_free (uri_drive); -- -2.44.0 +2.39.1 diff --git a/SOURCES/0005-Added-yandex-provider-prebuild-version.patch b/SOURCES/0001-Added-yandex-provider-prebuild-version.patch similarity index 98% rename from SOURCES/0005-Added-yandex-provider-prebuild-version.patch rename to SOURCES/0001-Added-yandex-provider-prebuild-version.patch index 9538772..6b24cd1 100644 --- a/SOURCES/0005-Added-yandex-provider-prebuild-version.patch +++ b/SOURCES/0001-Added-yandex-provider-prebuild-version.patch @@ -1,7 +1,7 @@ -From 08780efef7e06a98a4bf2327a7de5ae5f7371373 Mon Sep 17 00:00:00 2001 -From: Alexey Berezhok -Date: Tue, 2 May 2023 15:51:50 +0300 -Subject: [PATCH 5/7] Added yandex provider (prebuild version) +From 3ad24eb010fbc7d7d888093e82e76a3b6089cb6c Mon Sep 17 00:00:00 2001 +From: tigro +Date: Wed, 3 Apr 2024 14:25:09 +0300 +Subject: [PATCH] Added yandex provider prebuild version --- config.h.in | 13 + @@ -48,7 +48,7 @@ index f0b0354..40ca01d 100644 #undef GOA_IMAP_SMTP_ENABLED diff --git a/configure.ac b/configure.ac -index 70962d6..960bc26 100644 +index 70962d6..8e1ffda 100644 --- a/configure.ac +++ b/configure.ac @@ -265,6 +265,32 @@ if test "$enable_google" != "no"; then @@ -88,7 +88,7 @@ index 70962d6..960bc26 100644 Flickr provider: ${enable_flickr} (OAuth 1.0, key:${with_flickr_consumer_key} secret:${with_flickr_consumer_secret}) Foursquare provider: ${enable_foursquare} (id:${with_foursquare_client_id}) Google provider: ${enable_google} (OAuth 2.0, id:${with_google_client_id} secret:${with_google_client_secret}) -+ Yandex provider: ${enable_yandex} (OAuth 2.0, id:${with_yandex_client_id} secret:${with_yandex_client_secret}) ++ Yandex provider: ${enable_yandex} (OAuth 2.0, id:${with_yandex_client_id} secret:${with_yandex_client_secret}) IMAP/SMTP provider: ${enable_imap_smtp} Media Server provider: ${enable_media_server} Microsoft Exchange provider: ${enable_exchange} @@ -243,14 +243,14 @@ index 0000000..528713f + style="stroke-width:0.869772" /> + diff --git a/src/goabackend/Makefile.am b/src/goabackend/Makefile.am -index c7e00a4..c2a2fca 100644 +index c7e00a4..90d5bd7 100644 --- a/src/goabackend/Makefile.am +++ b/src/goabackend/Makefile.am @@ -91,6 +91,7 @@ libgoa_backend_1_0_la_SOURCES = \ goaobjectskeletonutils.h goaobjectskeletonutils.c \ goautils.h goautils.c \ nautilus-floating-bar.h nautilus-floating-bar.c \ -+ goayandexprovider.h goayandexprovider.c \ ++ goayandexprovider.h goayandexprovider.c \ $(top_builddir)/src/goaidentity/org.gnome.Identity.c \ $(top_srcdir)/src/goaidentity/goaidentitymanagererror.c \ $(NULL) diff --git a/SOURCES/0007-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch b/SOURCES/0001-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch similarity index 90% rename from SOURCES/0007-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch rename to SOURCES/0001-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch index 42ed8f1..05b38b1 100644 --- a/SOURCES/0007-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch +++ b/SOURCES/0001-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch @@ -1,7 +1,7 @@ -From 549dcda8b5183fef83c1f8b17940de22a1d699a0 Mon Sep 17 00:00:00 2001 +From 5bbb3baca5f77b0f2148cb3b3efdeda61de4e121 Mon Sep 17 00:00:00 2001 From: Alexey Berezhok Date: Mon, 18 Sep 2023 21:39:04 +0300 -Subject: [PATCH 7/7] Fix bug when two accounts of yandex disk displayed as one +Subject: [PATCH] Fix bug when two accounts of yandex disk displayed as one --- src/goabackend/goayandexprovider.c | 11 +++++++++-- @@ -45,5 +45,5 @@ index acaa599..fc78421 100644 -- -2.44.0 +2.39.1 diff --git a/SOURCES/0001-Removed-deprecated-code-form-yandex-provider.patch b/SOURCES/0001-Removed-deprecated-code-form-yandex-provider.patch new file mode 100644 index 0000000..4200d66 --- /dev/null +++ b/SOURCES/0001-Removed-deprecated-code-form-yandex-provider.patch @@ -0,0 +1,48 @@ +From c53ed2fcbef8a3a3a8add9d3164ebb324ec0a47c Mon Sep 17 00:00:00 2001 +From: Alexey Berezhok +Date: Wed, 3 Apr 2024 15:58:41 +0300 +Subject: [PATCH] Removed deprecated code form yandex provider + +--- + src/goabackend/goayandexprovider.c | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) + +diff --git a/src/goabackend/goayandexprovider.c b/src/goabackend/goayandexprovider.c +index fc78421..f414164 100644 +--- a/src/goabackend/goayandexprovider.c ++++ b/src/goabackend/goayandexprovider.c +@@ -197,14 +197,6 @@ get_identity_sync (GoaOAuth2Provider *oauth2_provider, + + /* ---------------------------------------------------------------------------------------------------- */ + +-static gboolean +-is_identity_node (GoaOAuth2Provider *oauth2_provider, WebKitDOMHTMLInputElement *element) +-{ +- return FALSE; +-} +- +-/* ---------------------------------------------------------------------------------------------------- */ +- + static gboolean + build_object (GoaProvider *provider, + GoaObjectSkeleton *object, +@@ -270,7 +262,7 @@ build_object (GoaProvider *provider, + if (mail != NULL) + goa_object_skeleton_set_mail (object, NULL); + } +- ++ + /* Calendar */ + calendar_enabled = g_key_file_get_boolean (key_file, group, "CalendarEnabled", NULL); + uri_caldav = g_strconcat ("https://caldav.yandex.ru/", NULL); +@@ -370,7 +362,6 @@ goa_yandex_provider_class_init (GoaYandexProviderClass *klass) + oauth2_class->get_identity_sync = get_identity_sync; + oauth2_class->get_redirect_uri = get_redirect_uri; + oauth2_class->get_scope = get_scope; +- oauth2_class->is_identity_node = is_identity_node; + oauth2_class->get_token_uri = get_token_uri; + oauth2_class->add_account_key_values = add_account_key_values; + } +-- +2.31.1 + diff --git a/SOURCES/0004-Drop-dependency-on-WebKitGTK-139.patch b/SOURCES/0003-Drop-dependency-on-WebKitGTK-139.patch similarity index 98% rename from SOURCES/0004-Drop-dependency-on-WebKitGTK-139.patch rename to SOURCES/0003-Drop-dependency-on-WebKitGTK-139.patch index 37311b5..c7773a1 100644 --- a/SOURCES/0004-Drop-dependency-on-WebKitGTK-139.patch +++ b/SOURCES/0003-Drop-dependency-on-WebKitGTK-139.patch @@ -1,51 +1,3 @@ -From 8f0ac9727250a4ee9862f32ea878b91938162afb Mon Sep 17 00:00:00 2001 -From: tigro -Date: Wed, 3 Apr 2024 12:34:10 +0300 -Subject: [PATCH 4/7] Drop dependency on WebKitGTK 139 - ---- - configure.ac | 20 +- - data/Makefile.am | 16 + - ...org.gnome.OnlineAccounts.OAuth2.desktop.in | 6 + - doc/goa-docs.xml | 1 - - doc/goa-sections.txt | 30 - - doc/goa.types | 1 - - po/POTFILES.in | 1 - - src/goabackend/Makefile.am | 48 +- - src/goabackend/goafacebookprovider.c | 26 - - src/goabackend/goaflickrprovider.c | 364 ---- - src/goabackend/goaflickrprovider.h | 37 - - src/goabackend/goafoursquareprovider.c | 26 - - src/goabackend/goagoogleprovider.c | 84 +- - src/goabackend/goaoauth2handler.c | 173 ++ - src/goabackend/goaoauth2provider-priv.h | 17 - - .../goaoauth2provider-web-extension.h | 40 - - src/goabackend/goaoauth2provider-web-view.h | 37 - - src/goabackend/goaoauth2provider.c | 483 +++-- - src/goabackend/goaoauthprovider.c | 1638 ----------------- - src/goabackend/goaoauthprovider.h | 143 -- - src/goabackend/goaprovider.c | 4 - - src/goabackend/goawebextension.c | 268 --- - src/goabackend/goawebextension.h | 37 - - src/goabackend/goawebextensionmain.c | 46 - - src/goabackend/goawebview.c | 515 ------ - src/goabackend/goawebview.h | 38 - - src/goabackend/goawindowsliveprovider.c | 34 +- - 27 files changed, 504 insertions(+), 3629 deletions(-) - create mode 100644 data/org.gnome.OnlineAccounts.OAuth2.desktop.in - delete mode 100644 src/goabackend/goaflickrprovider.c - delete mode 100644 src/goabackend/goaflickrprovider.h - create mode 100644 src/goabackend/goaoauth2handler.c - delete mode 100644 src/goabackend/goaoauth2provider-web-extension.h - delete mode 100644 src/goabackend/goaoauth2provider-web-view.h - delete mode 100644 src/goabackend/goaoauthprovider.c - delete mode 100644 src/goabackend/goaoauthprovider.h - delete mode 100644 src/goabackend/goawebextension.c - delete mode 100644 src/goabackend/goawebextension.h - delete mode 100644 src/goabackend/goawebextensionmain.c - delete mode 100644 src/goabackend/goawebview.c - delete mode 100644 src/goabackend/goawebview.h - diff --git a/configure.ac b/configure.ac index 332a0bf..70962d6 100644 --- a/configure.ac @@ -4774,6 +4726,3 @@ index be35746..0ac5efb 100644 - oauth2_class->is_identity_node = is_identity_node; oauth2_class->add_account_key_values = add_account_key_values; } --- -2.44.0 - diff --git a/SPECS/gnome-online-accounts.spec b/SPECS/gnome-online-accounts.spec index f99276f..86c9489 100644 --- a/SPECS/gnome-online-accounts.spec +++ b/SPECS/gnome-online-accounts.spec @@ -13,19 +13,20 @@ 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 +Patch1: 0001-Remove-Documents-support.patch # 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 +Patch2: 0001-google-Remove-Photos-support.patch -Patch2: kerberos-fixes.patch -Patch3: 0004-Drop-dependency-on-WebKitGTK-139.patch +Patch3: kerberos-fixes.patch +Patch4: 0003-Drop-dependency-on-WebKitGTK-139.patch # MSVSphere -Patch200: 0005-Added-yandex-provider-prebuild-version.patch -Patch201: 0006-Added-yandex-disk-webdav-support.patch -Patch202: 0007-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch +Patch1000: 0001-Added-yandex-provider-prebuild-version.patch +Patch1001: 0001-Added-yandex-disk-webdav-support.patch +Patch1002: 0001-Fix-bug-when-two-accounts-of-yandex-disk-displayed-a.patch +Patch1003: 0001-Removed-deprecated-code-form-yandex-provider.patch Obsoletes: gnome-online-accounts-oauth2 < 3.40.0-5 @@ -68,7 +69,15 @@ The %{name}-devel package contains libraries and header files for developing applications that use %{name}. %prep -%autosetup -p1 +%setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch1000 -p1 +%patch1001 -p1 +%patch1002 -p1 +%patch1003 -p1 %build aclocal -I m4 @@ -78,7 +87,6 @@ libtoolize autoconf %configure \ - --disable-kerberos \ --disable-fedora \ --disable-facebook \ --disable-flickr \ @@ -93,6 +101,7 @@ autoconf --enable-google \ --enable-gtk-doc \ --enable-imap-smtp \ + --enable-kerberos \ --enable-owncloud \ --enable-windows-live %make_build @@ -140,11 +149,8 @@ find $RPM_BUILD_ROOT -name '*.la' -delete %{_datadir}/vala/ %changelog -* Wed Apr 03 2024 Arkady L. Shane 3.40.0-6.inferit -- Disaple Fedora provides +* Wed Apr 3 2023 Arkady L. Shane - 3.40.0-6.inferit - Added Yandex support -- I have tears in my eyes, what Red Hat doing with patches -- Disable kerberos * Wed Nov 15 2023 Milan Crha - 3.40.0-6 - Related: RHEL-10492 (Add margin around OAuth2 prompt content)