diff --git a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake b/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
index 14d48ed6143..8be55b42070 100644
--- a/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
+++ b/srcpkgs/evolution-data-server/files/disableRuntimeTests.cmake
@@ -19,6 +19,9 @@
 set( _correct_iconv_EXITCODE 
      0
      CACHE INTERNAL "Result from TRY_RUN" FORCE)
+set(_correct_iconv_EXITCODE__TRYRUN_OUTPUT
+     0
+     CACHE INTERNAL "Result from TRY_RUN" FORCE)
 
 
 # HAVE_LKSTRFTIME_EXITCODE
@@ -36,4 +39,7 @@ set( _correct_iconv_EXITCODE
 set( HAVE_LKSTRFTIME_EXITCODE 
      0
      CACHE INTERNAL "Result from TRY_RUN" FORCE)
+set( HAVE_LKSTRFTIME_EXITCODE__TRYRUN_OUTPUT
+     0
+     CACHE INTERNAL "Result from TRY_RUN" FORCE)
 
diff --git a/srcpkgs/evolution-data-server/patches/cmake.patch b/srcpkgs/evolution-data-server/patches/cmake.patch
deleted file mode 100644
index b97690d7e22..00000000000
--- a/srcpkgs/evolution-data-server/patches/cmake.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- CMakeLists.txt	2017-03-20 02:47:25.000000000 -0600
-+++ CMakeLists.txt	2017-04-05 18:02:54.871910269 -0600
-@@ -524,10 +524,6 @@
- CHECK_C_SOURCE_RUNS("#include \"${CMAKE_SOURCE_DIR}/iconv-detect.c\"" _correct_iconv)
- unset(CMAKE_REQUIRED_LIBRARIES)
- 
--if(NOT _correct_iconv)
--	message(FATAL_ERROR "You need to install a working iconv implementation, such as ftp://ftp.gnu.org/pub/gnu/libiconv")
--endif(NOT _correct_iconv)
--
- # ******************************
- # Backtraces for debugging
- # ******************************
diff --git a/srcpkgs/evolution-data-server/template b/srcpkgs/evolution-data-server/template
index 081326a9979..36aa50bf6d2 100644
--- a/srcpkgs/evolution-data-server/template
+++ b/srcpkgs/evolution-data-server/template
@@ -1,7 +1,7 @@
 # Template file for 'evolution-data-server'
 pkgname=evolution-data-server
 version=3.28.4
-revision=1
+revision=2
 build_style=cmake
 configure_args="-DENABLE_GOOGLE_AUTH=OFF -DENABLE_UOA=OFF
  $(vopt_if gir '-DENABLE_INTROSPECTION=ON -DENABLE_VALA_BINDINGS=ON' '-DENABLE_WEATHER=OFF')"