diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild
index f58cb57..996c9c2 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.42.2.ebuild
@@ -90,9 +90,6 @@ src_prepare() {
 	gnome2_src_prepare
 
 	eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch
-	# From gnome-41 branch:
-	eapply "${FILESDIR}"/${PV}-fix-build.patch
-	eapply "${FILESDIR}"/${PV}-fix-calendar-crash.patch
 
 	# Make CMakeLists versioned vala enabled
 	sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \
diff --git a/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch b/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch
deleted file mode 100644
index a0fde02..0000000
--- a/gnome-extra/evolution-data-server/files/3.42.1-fix-build.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c802adfdc5e16f3fc210e8e83bb3b972cd8fdc86 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 1 Nov 2021 16:10:13 +0100
-Subject: [PATCH 1/2] I#364 - Camel: Add a missing header include into
- camel-hostname-utils.c
-
-Change suggested by Rainer Herzog.
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/364
----
- src/camel/camel-hostname-utils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/camel/camel-hostname-utils.c b/src/camel/camel-hostname-utils.c
-index 723c81d14..8d8d179e6 100644
---- a/src/camel/camel-hostname-utils.c
-+++ b/src/camel/camel-hostname-utils.c
-@@ -24,6 +24,7 @@
- 
- #include <unicode/uchar.h>
- #include <unicode/uscript.h>
-+#include <unicode/ustring.h>
- 
- #include "camel-string-utils.h"
- #include "camel-hostname-utils.h"
--- 
-2.32.0
-
diff --git a/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch b/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch
deleted file mode 100644
index 011e8bd..0000000
--- a/gnome-extra/evolution-data-server/files/3.42.1-fix-calendar-crash.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 7cbcdd3974abf7135617b1e9a230b4a9f5d829c6 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 4 Nov 2021 17:00:20 +0100
-Subject: [PATCH 2/2] I#365 - Calendar: Crash on local calandar file change
-
-Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/365
----
- src/calendar/backends/file/e-cal-backend-file.c | 1 +
- src/calendar/backends/http/e-cal-backend-http.c | 7 ++++++-
- src/calendar/libecal/e-cal-component.c          | 2 ++
- 3 files changed, 9 insertions(+), 1 deletion(-)
-
-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)) {
--- 
-2.32.0
-