From c6fea363716f41bbd8d8c78e7dbf492215ca0a8c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Aug 2022 11:18:09 +0200 Subject: [PATCH] Update to 3.45.2 --- ...on-data-server-3.44.3-glib-none-flag.patch | 51 ------------------- evolution-data-server.spec | 21 ++++---- sources | 2 +- 3 files changed, 11 insertions(+), 63 deletions(-) delete mode 100644 evolution-data-server-3.44.3-glib-none-flag.patch diff --git a/evolution-data-server-3.44.3-glib-none-flag.patch b/evolution-data-server-3.44.3-glib-none-flag.patch deleted file mode 100644 index a1d1b04..0000000 --- a/evolution-data-server-3.44.3-glib-none-flag.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/src/calendar/libecal/e-cal-client.c b/src/calendar/libecal/e-cal-client.c -index 420e7186f..1ac37d4d4 100644 ---- a/src/calendar/libecal/e-cal-client.c -+++ b/src/calendar/libecal/e-cal-client.c -@@ -5212,13 +5212,13 @@ e_cal_client_modify_objects_sync (ECalClient *client, - - mod_flags = g_string_new (NULL); - flags_class = g_type_class_ref (E_TYPE_CAL_OBJ_MOD_TYPE); -- flags_value = g_flags_get_first_value (flags_class, mod); -- while (flags_value != NULL) { -+ for (flags_value = g_flags_get_first_value (flags_class, mod); -+ flags_value && mod; -+ flags_value = g_flags_get_first_value (flags_class, mod)) { - if (mod_flags->len > 0) - g_string_append_c (mod_flags, ':'); - g_string_append (mod_flags, flags_value->value_nick); - mod &= ~flags_value->value; -- flags_value = g_flags_get_first_value (flags_class, mod); - } - - strv = g_new0 (gchar *, g_slist_length (icalcomps) + 1); -@@ -5572,13 +5572,13 @@ e_cal_client_remove_objects_sync (ECalClient *client, - - mod_flags = g_string_new (NULL); - flags_class = g_type_class_ref (E_TYPE_CAL_OBJ_MOD_TYPE); -- flags_value = g_flags_get_first_value (flags_class, mod); -- while (flags_value != NULL) { -+ for (flags_value = g_flags_get_first_value (flags_class, mod); -+ flags_value && mod; -+ flags_value = g_flags_get_first_value (flags_class, mod)) { - if (mod_flags->len > 0) - g_string_append_c (mod_flags, ':'); - g_string_append (mod_flags, flags_value->value_nick); - mod &= ~flags_value->value; -- flags_value = g_flags_get_first_value (flags_class, mod); - } - - g_variant_builder_init (&builder, G_VARIANT_TYPE ("a(ss)")); -diff --git a/src/libedataserver/e-source.c b/src/libedataserver/e-source.c -index 31d851e21..23b82f7b1 100644 ---- a/src/libedataserver/e-source.c -+++ b/src/libedataserver/e-source.c -@@ -4622,7 +4622,7 @@ e_source_invoke_credentials_required_sync (ESource *source, - - flags_class = g_type_class_ref (G_TYPE_TLS_CERTIFICATE_FLAGS); - for (flags_value = g_flags_get_first_value (flags_class, certificate_errors); -- flags_value; -+ flags_value && certificate_errors; - flags_value = g_flags_get_first_value (flags_class, certificate_errors)) { - if (certificate_errors_str->len) - g_string_append_c (certificate_errors_str, ':'); diff --git a/evolution-data-server.spec b/evolution-data-server.spec index ddd630c..03fd2e2 100644 --- a/evolution-data-server.spec +++ b/evolution-data-server.spec @@ -53,15 +53,13 @@ ### Abstract ### Name: evolution-data-server -Version: 3.45.1 -Release: 3%{?dist} +Version: 3.45.2 +Release: 1%{?dist} Summary: Backend data server for Evolution License: LGPLv2+ URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.45/%{name}-%{version}.tar.xz -Patch01: evolution-data-server-3.44.3-glib-none-flag.patch - Provides: evolution-webcal = %{version} Obsoletes: evolution-webcal < 2.24.0 @@ -98,7 +96,7 @@ BuildRequires: pkgconfig(gio-unix-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} BuildRequires: pkgconfig(icu-i18n) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} -#BuildRequires: pkgconfig(goa-1.0) >= %{goa_version} +BuildRequires: pkgconfig(goa-1.0) >= %{goa_version} BuildRequires: pkgconfig(gweather4) >= %{libgweather_version} BuildRequires: pkgconfig(libical-glib) >= %{libical_version} BuildRequires: pkgconfig(libsecret-unstable) >= %{libsecret_version} @@ -140,7 +138,7 @@ by other packages. Summary: Development files for building against %{name} Requires: %{name}%{?_isa} = %{version}-%{release} -#Requires: pkgconfig(goa-1.0) >= %{goa_version} +Requires: pkgconfig(goa-1.0) >= %{goa_version} Requires: pkgconfig(gweather4) >= %{libgweather_version} Requires: pkgconfig(libical-glib) >= %{libical_version} Requires: pkgconfig(libsecret-unstable) >= %{libsecret_version} @@ -256,8 +254,6 @@ export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-d %cmake -G Ninja \ -DENABLE_MAINTAINER_MODE=OFF \ - -DENABLE_GOA=OFF \ - -DENABLE_GOOGLE=OFF \ -DENABLE_FILE_LOCKING=fcntl \ -DENABLE_DOT_LOCKING=OFF \ -DENABLE_INTROSPECTION=ON \ @@ -392,20 +388,20 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{camel_provider_dir}/libcamelsmtp.urls # e-d-s extensions: -#%{credential_modules_dir}/module-credentials-goa.so +%{credential_modules_dir}/module-credentials-goa.so %{ebook_backends_dir}/libebookbackendcarddav.so %{ebook_backends_dir}/libebookbackendfile.so %{ebook_backends_dir}/libebookbackendldap.so %{ecal_backends_dir}/libecalbackendcaldav.so %{ecal_backends_dir}/libecalbackendcontacts.so %{ecal_backends_dir}/libecalbackendfile.so -#%{ecal_backends_dir}/libecalbackendgtasks.so +%{ecal_backends_dir}/libecalbackendgtasks.so %{ecal_backends_dir}/libecalbackendhttp.so %{ecal_backends_dir}/libecalbackendweather.so %{ecal_backends_dir}/libecalbackendwebdavnotes.so %{modules_dir}/module-cache-reaper.so %{modules_dir}/module-google-backend.so -#%{modules_dir}/module-gnome-online-accounts.so +%{modules_dir}/module-gnome-online-accounts.so %{modules_dir}/module-oauth2-services.so %{modules_dir}/module-outlook-backend.so %{modules_dir}/module-secret-monitor.so @@ -487,6 +483,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \; %{_datadir}/installed-tests %changelog +* Fri Aug 05 2022 Milan Crha - 3.45.2-1 +- Update to 3.45.2 + * Mon Aug 01 2022 Frantisek Zatloukal - 3.45.1-3 - Rebuilt for ICU 71.1 diff --git a/sources b/sources index a43de62..5bc22ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-data-server-3.45.1.tar.xz) = 6c1d353ca42404b6d8fdd65d64634e13d2ca25bd9961b855db4c6c596f7194efcb9f998714668917a49673cbb6dad865f0bfd832630c6e0effe0ec5f996fc83b +SHA512 (evolution-data-server-3.45.2.tar.xz) = da7ecd974b8be4fdc40fa67d687266c197cd0796b37a4afbab238c8eb3a2c3c3668daf23dc60d2081c46f6d08acfbb6b273e78599992b9730f7a0430ee0600cb