From 84f3553dfda61ab4cf5ca842eec7243a83b49151 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Wed, 10 Jan 2024 10:41:46 -0600 Subject: [PATCH] 3.49.0 --- .gitignore | 1 + ...abackend-Fix-build-with-libxml2-2.12.patch | 25 ----------------- gcr_error.patch | 11 ++++++++ gnome-online-accounts.spec | 27 +++++++++---------- sources | 2 +- 5 files changed, 26 insertions(+), 40 deletions(-) delete mode 100644 0001-goabackend-Fix-build-with-libxml2-2.12.patch create mode 100644 gcr_error.patch diff --git a/.gitignore b/.gitignore index 8e42bcc..2641bdd 100644 --- a/.gitignore +++ b/.gitignore @@ -129,3 +129,4 @@ /gnome-online-accounts-3.46.0.tar.xz /gnome-online-accounts-3.47.1.tar.xz /gnome-online-accounts-3.48.0.tar.xz +/gnome-online-accounts-3.49.0.tar.xz diff --git a/0001-goabackend-Fix-build-with-libxml2-2.12.patch b/0001-goabackend-Fix-build-with-libxml2-2.12.patch deleted file mode 100644 index 233e969..0000000 --- a/0001-goabackend-Fix-build-with-libxml2-2.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b9638e2418408be4906752297e700506766dcf20 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?J=C3=BCrg=20Billeter?= -Date: Fri, 24 Nov 2023 16:19:47 +0100 -Subject: [PATCH] goabackend: Fix build with libxml2 2.12 - -libxml/xmlIO.h no longer includes libxml/parser.h. ---- - src/goabackend/goaewsclient.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/goabackend/goaewsclient.c b/src/goabackend/goaewsclient.c -index 4cb23581..01a52d14 100644 ---- a/src/goabackend/goaewsclient.c -+++ b/src/goabackend/goaewsclient.c -@@ -27,6 +27,7 @@ - #include - - #include -+#include - #include - - #include "goaewsclient.h" --- -GitLab - diff --git a/gcr_error.patch b/gcr_error.patch new file mode 100644 index 0000000..cc88b7b --- /dev/null +++ b/gcr_error.patch @@ -0,0 +1,11 @@ +--- src/goabackend/goafedoraprovider.c~ 2024-01-10 03:53:11.000000000 -0600 ++++ src/goabackend/goafedoraprovider.c 2024-01-10 10:27:43.435590831 -0600 +@@ -1193,7 +1193,7 @@ + if (!gcr_secret_exchange_receive (secret_exchange, return_key)) + { + g_set_error (error, +- GCR_ERROR, ++ GCR_DATA_ERROR, + GCR_ERROR_UNRECOGNIZED, + _("Identity service returned invalid key")); + goto out; diff --git a/gnome-online-accounts.spec b/gnome-online-accounts.spec index f1dee28..99c0452 100644 --- a/gnome-online-accounts.spec +++ b/gnome-online-accounts.spec @@ -5,24 +5,22 @@ %global webkit2gtk_version 2.33.1 Name: gnome-online-accounts -Version: 3.48.0 -Release: 4%{?dist} +Version: 3.49.0 +Release: 1%{?dist} Summary: Single sign-on framework for GNOME License: LGPL-2.0-or-later URL: https://wiki.gnome.org/Projects/GnomeOnlineAccounts -Source0: https://download.gnome.org/sources/gnome-online-accounts/3.48/%{name}-%{version}.tar.xz +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 -# Fix build with libxml2 2.12 -# https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/145 -Patch1: 0001-goabackend-Fix-build-with-libxml2-2.12.patch +Patch1: gcr_error.patch -BuildRequires: pkgconfig(gcr-3) +BuildRequires: pkgconfig(gcr-4) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gobject-2.0) >= %{glib2_version} @@ -68,10 +66,10 @@ developing applications that use %{name}. %setup -q %if 0%{?rhel} >= 9 -%patch0 -p1 +%patch -P 0 -p1 %endif -%patch 1 -p1 +%patch -P 1 -p0 %build %meson \ @@ -83,8 +81,6 @@ developing applications that use %{name}. -Dgoogle=true \ -Dimap_smtp=true \ -Dkerberos=true \ - -Dlastfm=false \ - -Dmedia_server=false \ -Downcloud=true \ -Dwindows_live=true \ -Dman=true \ @@ -101,7 +97,7 @@ developing applications that use %{name}. %files -f %{name}.lang %license COPYING -%doc NEWS README +%doc NEWS README.md %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/Goa-1.0.typelib %{_libdir}/libgoa-1.0.so.0 @@ -110,16 +106,16 @@ developing applications that use %{name}. %{_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/goa-daemon %{_prefix}/libexec/goa-identity-service +%{_prefix}/libexec/goa-oauth2-handler %{_datadir}/dbus-1/services/org.gnome.OnlineAccounts.service %{_datadir}/dbus-1/services/org.gnome.Identity.service %{_datadir}/glib-2.0/schemas/org.gnome.online-accounts.gschema.xml %{_mandir}/man8/goa-daemon.8* %endif %{_datadir}/icons/hicolor/*/apps/goa-*.svg +%{_datadir}/applications/org.gnome.OnlineAccounts.OAuth2.desktop %files devel %{_includedir}/goa-1.0/ @@ -138,6 +134,9 @@ developing applications that use %{name}. %{_datadir}/vala/ %changelog +* Wed Jan 10 2024 Gwyn Ciesla - 3.49.0-1 +- 3.49.0 + * Tue Dec 12 2023 Yaakov Selkowitz - 3.48.0-4 - Fix build with libxml2 2.12 diff --git a/sources b/sources index 4307aab..0d9836d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gnome-online-accounts-3.48.0.tar.xz) = 67e6c39d38187dc58175f6b694c66a92d9b9152b179db41ee05a8c512db5b16f1dd1eb1503c7d732b09126942abc00206ba956f7a54c6ae7a285a9e3101be7a5 +SHA512 (gnome-online-accounts-3.49.0.tar.xz) = 700d3c096f994f7dadba0934319db75bf59523341c1ee02eedeaf35fe6ed159bef346dc0fa3b88ef5361a2927a4c07cfd1199e865c3846a5441458ed50e3f4ee