From 08565212e733e4cb2becfc7fd1d63bca806dbf6b Mon Sep 17 00:00:00 2001
From: Gwyn Ciesla <gwync@protonmail.com>
Date: Mon, 12 Feb 2024 13:13:53 -0600
Subject: [PATCH] 3.49.1

---
 .gitignore                 |  1 +
 gcr_error.patch            | 11 -----------
 gnome-online-accounts.spec | 23 ++++++++++++-----------
 sources                    |  2 +-
 4 files changed, 14 insertions(+), 23 deletions(-)
 delete mode 100644 gcr_error.patch

diff --git a/.gitignore b/.gitignore
index 2641bdd..aaae7ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -130,3 +130,4 @@
 /gnome-online-accounts-3.47.1.tar.xz
 /gnome-online-accounts-3.48.0.tar.xz
 /gnome-online-accounts-3.49.0.tar.xz
+/gnome-online-accounts-3.49.1.tar.xz
diff --git a/gcr_error.patch b/gcr_error.patch
deleted file mode 100644
index cc88b7b..0000000
--- a/gcr_error.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 c9e1a53..2fd32d5 100644
--- a/gnome-online-accounts.spec
+++ b/gnome-online-accounts.spec
@@ -1,31 +1,31 @@
-%global gettext_version 0.19.8
-%global glib2_version 2.67.4
-%global gtk3_version 3.19.12
+%global gettext_version 0.22
+%global glib2_version 2.78.3
+%global gtk4_version 4.12.4
 %global libsoup_version 3.0
 
 Name:		gnome-online-accounts
-Version:	3.49.0
-Release:	4%{?dist}
+Version:	3.49.1
+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.49/%{name}-%{version}.tar.xz
 
-Patch1:         gcr_error.patch
-
 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}
 BuildRequires:	pkgconfig(gobject-introspection-1.0)
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(libadwaita-1)
 BuildRequires:	gettext >= %{gettext_version}
 BuildRequires:	gtk-doc
 BuildRequires:	krb5-devel
 BuildRequires:	meson
 BuildRequires:	vala
 %if !0%{?flatpak}
-BuildRequires:	pkgconfig(gtk+-3.0) >= %{gtk3_version}
+BuildRequires:	pkgconfig(gtk4) >= %{gtk4_version}
 BuildRequires:	pkgconfig(json-glib-1.0)
 BuildRequires:	pkgconfig(libsecret-1)
 BuildRequires:	pkgconfig(libsoup-3.0) >= %{libsoup_version}
@@ -35,7 +35,7 @@ BuildRequires:	pkgconfig(libxml-2.0)
 
 Requires:	glib2%{?_isa} >= %{glib2_version}
 %if !0%{?flatpak}
-Requires:	gtk3%{?_isa} >= %{gtk3_version}
+Requires:	gtk4%{?_isa} >= %{gtk4_version}
 Requires:	libsoup3%{?_isa} >= %{libsoup_version}
 Requires:	gvfs-goa
 %endif
@@ -57,8 +57,6 @@ developing applications that use %{name}.
 %prep
 %setup -q
 
-%patch -P 1 -p0
-
 %build
 %meson \
 %if 0%{?flatpak}
@@ -122,6 +120,9 @@ developing applications that use %{name}.
 %{_datadir}/vala/
 
 %changelog
+* Mon Feb 12 2024 Gwyn Ciesla <gwync@protonmail.com> - 3.49.1-1
+- 3.49.1
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.49.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 0d9836d..2411b8c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-online-accounts-3.49.0.tar.xz) = 700d3c096f994f7dadba0934319db75bf59523341c1ee02eedeaf35fe6ed159bef346dc0fa3b88ef5361a2927a4c07cfd1199e865c3846a5441458ed50e3f4ee
+SHA512 (gnome-online-accounts-3.49.1.tar.xz) = 17eb8aba19dd7f85808b899f3e08fb20312ceb7a9e394ddb3f118ef5ce86058b98b945753f7ffd4e5a07b35ee0b1c2cf3df7121b64b9206c59f203a5eadb0ebc