Resolves: #2021055 (Add patch to correct ICalCompIter component's usage)
This commit is contained in:
parent
50ce8c9287
commit
3b4c4c6069
49
evolution-data-server-3.40.4-icalcompiter.patch
Normal file
49
evolution-data-server-3.40.4-icalcompiter.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
diff --git a/src/calendar/backends/file/e-cal-backend-file.c b/src/calendar/backends/file/e-cal-backend-file.c
|
||||||
|
index f40bf807c..79ae53632 100644
|
||||||
|
--- a/src/calendar/backends/file/e-cal-backend-file.c
|
||||||
|
+++ b/src/calendar/backends/file/e-cal-backend-file.c
|
||||||
|
@@ -904,6 +904,7 @@ scan_vcalendar (ECalBackendFile *cbfile)
|
||||||
|
if (e_cal_component_set_icalcomponent (comp, icomp)) {
|
||||||
|
/* Thus it's not freed while being used in the 'comp' */
|
||||||
|
g_object_ref (icomp);
|
||||||
|
+ i_cal_object_set_owner (I_CAL_OBJECT (icomp), G_OBJECT (priv->vcalendar));
|
||||||
|
|
||||||
|
check_dup_uid (cbfile, comp);
|
||||||
|
|
||||||
|
diff --git a/src/calendar/backends/http/e-cal-backend-http.c b/src/calendar/backends/http/e-cal-backend-http.c
|
||||||
|
index a7e930ca0..bfe9b4554 100644
|
||||||
|
--- a/src/calendar/backends/http/e-cal-backend-http.c
|
||||||
|
+++ b/src/calendar/backends/http/e-cal-backend-http.c
|
||||||
|
@@ -477,13 +477,18 @@ ecb_http_get_changes_sync (ECalMetaBackend *meta_backend,
|
||||||
|
} else {
|
||||||
|
iter = i_cal_component_begin_component (maincomp, I_CAL_VCALENDAR_COMPONENT);
|
||||||
|
subcomp = i_cal_comp_iter_deref (iter);
|
||||||
|
+ if (subcomp)
|
||||||
|
+ i_cal_object_set_owner (I_CAL_OBJECT (subcomp), G_OBJECT (maincomp));
|
||||||
|
}
|
||||||
|
|
||||||
|
while (subcomp && success) {
|
||||||
|
ICalComponent *next_subcomp = NULL;
|
||||||
|
|
||||||
|
- if (iter)
|
||||||
|
+ if (iter) {
|
||||||
|
next_subcomp = i_cal_comp_iter_next (iter);
|
||||||
|
+ if (next_subcomp)
|
||||||
|
+ i_cal_object_set_owner (I_CAL_OBJECT (next_subcomp), G_OBJECT (maincomp));
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (i_cal_component_isa (subcomp) == I_CAL_VCALENDAR_COMPONENT) {
|
||||||
|
success = e_cal_meta_backend_gather_timezones_sync (meta_backend, subcomp, TRUE, cancellable, error);
|
||||||
|
diff --git a/src/calendar/libecal/e-cal-component.c b/src/calendar/libecal/e-cal-component.c
|
||||||
|
index a3dddcc8f..c7629813a 100644
|
||||||
|
--- a/src/calendar/libecal/e-cal-component.c
|
||||||
|
+++ b/src/calendar/libecal/e-cal-component.c
|
||||||
|
@@ -95,6 +95,8 @@ foreach_subcomponent (ICalComponent *icalcomp,
|
||||||
|
while (subcomp) {
|
||||||
|
ICalComponent *next_subcomp;
|
||||||
|
|
||||||
|
+ i_cal_object_set_owner (I_CAL_OBJECT (subcomp), G_OBJECT (icalcomp));
|
||||||
|
+
|
||||||
|
next_subcomp = i_cal_comp_iter_next (iter);
|
||||||
|
|
||||||
|
if (!func (icalcomp, subcomp, user_data)) {
|
@ -54,12 +54,14 @@
|
|||||||
|
|
||||||
Name: evolution-data-server
|
Name: evolution-data-server
|
||||||
Version: 3.40.4
|
Version: 3.40.4
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Backend data server for Evolution
|
Summary: Backend data server for Evolution
|
||||||
License: LGPLv2+
|
License: LGPLv2+
|
||||||
URL: https://wiki.gnome.org/Apps/Evolution
|
URL: https://wiki.gnome.org/Apps/Evolution
|
||||||
Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
|
Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
|
||||||
|
|
||||||
|
Patch01: evolution-data-server-3.40.4-icalcompiter.patch
|
||||||
|
|
||||||
Provides: evolution-webcal = %{version}
|
Provides: evolution-webcal = %{version}
|
||||||
Obsoletes: evolution-webcal < 2.24.0
|
Obsoletes: evolution-webcal < 2.24.0
|
||||||
|
|
||||||
@ -475,6 +477,9 @@ find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
|
|||||||
%{_datadir}/installed-tests
|
%{_datadir}/installed-tests
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Nov 08 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-2
|
||||||
|
- Resolves: #2021055 (Add patch to correct ICalCompIter component's usage)
|
||||||
|
|
||||||
* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-1
|
* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-1
|
||||||
- Related: #1992450 (Update to 3.40.4)
|
- Related: #1992450 (Update to 3.40.4)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user