diff --git a/mail/evolution/files/patch-CMakeLists.txt b/mail/evolution/files/patch-CMakeLists.txt
index 990927751b353..d38a5b4f155b6 100644
--- a/mail/evolution/files/patch-CMakeLists.txt
+++ b/mail/evolution/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2017-06-08 20:52:16.741243000 +0200
-+++ CMakeLists.txt	2017-06-08 20:52:25.747544000 +0200
-@@ -329,6 +329,7 @@
+--- CMakeLists.txt.orig	2021-04-23 14:06:10 UTC
++++ CMakeLists.txt
+@@ -356,6 +356,7 @@ endif(WITH_HELP)
  # ******************************
  
  set(CMAKE_REQUIRED_LIBRARIES "-liconv")
diff --git a/mail/evolution/files/patch-cmake_modules_PrintableOptions.cmake b/mail/evolution/files/patch-cmake_modules_PrintableOptions.cmake
new file mode 100644
index 0000000000000..f9287b27e8ce1
--- /dev/null
+++ b/mail/evolution/files/patch-cmake_modules_PrintableOptions.cmake
@@ -0,0 +1,53 @@
+--- cmake/modules/PrintableOptions.cmake.orig	2021-03-19 06:41:05 UTC
++++ cmake/modules/PrintableOptions.cmake
+@@ -19,40 +19,40 @@
+ #    prints all the build options previously added with the above functions
+ 
+ macro(add_printable_variable_bare _name)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	list(APPEND _printable_options ${_name})
+ endmacro()
+ 
+ macro(add_printable_option _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "option name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	option(${_name} ${_description} ${_default_value})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE STRING ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_path _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "path variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE PATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
+ 
+ macro(add_printable_variable_filepath _name _description _default_value)
+-	if(_name STREQUAL "")
++	if("${_name}" STREQUAL "")
+ 		message(FATAL_ERROR "filepath variable name cannot be empty")
+-	endif(_name STREQUAL "")
++	endif("${_name}" STREQUAL "")
+ 	set(${_name} ${_default_value} CACHE FILEPATH ${_description})
+ 	add_printable_variable_bare(${_name})
+ endmacro()
diff --git a/mail/evolution/files/patch-cmake_modules_SetupBuildFlags.cmake b/mail/evolution/files/patch-cmake_modules_SetupBuildFlags.cmake
new file mode 100644
index 0000000000000..f3fc4a82a8b03
--- /dev/null
+++ b/mail/evolution/files/patch-cmake_modules_SetupBuildFlags.cmake
@@ -0,0 +1,20 @@
+--- cmake/modules/SetupBuildFlags.cmake.orig	2021-03-19 06:41:05 UTC
++++ cmake/modules/SetupBuildFlags.cmake
+@@ -20,7 +20,7 @@ macro(setup_build_flags _maintainer_mode)
+ 		-Wundef
+ 		-Wwrite-strings
+ 		-Wno-cast-function-type
+-		-no-undefined
++		-Wl,--no-undefined
+ 		-fno-strict-aliasing
+ 	)
+ 
+@@ -34,7 +34,7 @@ macro(setup_build_flags _maintainer_mode)
+ 	else(${_maintainer_mode})
+ 		list(APPEND proposed_flags
+ 			-Wno-deprecated-declarations
+-			-Wno-missing-include-dir)
++			-Wno-missing-include-dirs)
+ 	endif(${_maintainer_mode})
+ 
+ 	list(APPEND proposed_c_flags