diff --git a/syncevolution-1.5.3-eds-libecal-2.0-b.patch b/syncevolution-1.5.3-eds-libecal-2.0-b.patch new file mode 100644 index 0000000..0fa627b --- /dev/null +++ b/syncevolution-1.5.3-eds-libecal-2.0-b.patch @@ -0,0 +1,15 @@ +diff -up syncevolution-1.5.3/src/backends/evolution/EvolutionCalendarSource.cpp.eds-libecal-2.0-b syncevolution-1.5.3/src/backends/evolution/EvolutionCalendarSource.cpp +--- syncevolution-1.5.3/src/backends/evolution/EvolutionCalendarSource.cpp.eds-libecal-2.0-b 2019-11-11 09:27:55.148982120 +0100 ++++ syncevolution-1.5.3/src/backends/evolution/EvolutionCalendarSource.cpp 2019-11-11 09:27:56.117982106 +0100 +@@ -370,7 +370,11 @@ static void list_revisions(const GSList + const GSList *l; + + for (l = objects; l; l = l->next) { ++#ifdef HAVE_LIBECAL_2_0 ++ ICalComponent *icomp = (ICalComponent*)l->data; ++#else + icalcomponent *icomp = (icalcomponent*)l->data; ++#endif + EvolutionCalendarSource::ItemID id = EvolutionCalendarSource::getItemID(icomp); + string luid = id.getLUID(); + string modTime = EvolutionCalendarSource::getItemModTime(icomp); diff --git a/syncevolution.spec b/syncevolution.spec index aee6674..58270e5 100644 --- a/syncevolution.spec +++ b/syncevolution.spec @@ -2,7 +2,7 @@ Summary: SyncML client for evolution Name: syncevolution Epoch: 1 Version: 1.5.3 -Release: 9%{?dist} +Release: 10%{?dist} License: LGPLv2+ URL: http://syncevolution.org/ Source: http://downloads.syncevolution.org/%{name}/sources/%{name}-%{version}.tar.gz @@ -11,6 +11,7 @@ Patch0: syncevolution-1.4.1-akonadi.patch Patch1: syncevolution-1.5.1-libical2.patch Patch2: syncevolution-1.5.3-eds-libecal-2.0.patch Patch3: syncevolution-1.5.3-python3.patch +Patch4: syncevolution-1.5.3-eds-libecal-2.0-b.patch BuildRequires: pkgconfig(dbus-glib-1) @@ -97,6 +98,7 @@ Akonadi backend for %{name}. %patch1 -p1 -b .libical2 %patch2 -p1 -b .eds-libecal-2.0 %patch3 -p1 -b .python3 +%patch4 -p1 -b .eds-libecal-2.0-b # use the ac macros in Makefile.am sed -i '/^ACLOCAL_AMFLAGS/{ /m4-repo/!s/$/ -I m4-repo/ }' Makefile*.am @@ -197,6 +199,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/sync.desktop %{_datadir}/syncevolution/xml/*.pl %changelog +* Mon Nov 11 2019 Milan Crha - 1:1.5.3-10 +- Add patch to fix a crash when synchronizing events (related to libecal-2.0 port) + * Sat Jul 27 2019 Fedora Release Engineering - 1:1.5.3-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild