evolution-data-server: Backport upstream patch to fix configure on latest CMake

Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>

2 files changed, 68 insertions, 0 deletions

diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
index 7f267b497..e2d7f502b 100644
--- a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server.bb
@@ -16,6 +16,7 @@ SRC_URI += " \
     file://0003-contact-Replace-the-Novell-sample-contact-with-somet.patch \
     file://0004-call-native-helpers.patch \
     file://iconv-detect.h \
+    file://0005-PrintableOptions.cmake-Correct-variable-name-compari.patch \
 "
 
 LKSTRFTIME = "HAVE_LKSTRFTIME=ON"
diff --git a/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-PrintableOptions.cmake-Correct-variable-name-compari.patch b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-PrintableOptions.cmake-Correct-variable-name-compari.patch
new file mode 100644
index 000000000..d84b41d00
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evolution-data-server/evolution-data-server/0005-PrintableOptions.cmake-Correct-variable-name-compari.patch
@@ -0,0 +1,67 @@
+From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Wed, 14 Apr 2021 16:58:08 +0200
+Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison
+
+CMake 3.20.1 errors out with:
+
+CMake Error at cmake/modules/PrintableOptions.cmake:38 (message):
+   variable name cannot be empty
+ Call Stack (most recent call first):
+   CMakeLists.txt:152 (add_printable_variable)
+
+Change how the parameter value is compared, to fix it.
+
+Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/c95a70bfeae25ba11fbe50fe759a6cdb29388e44]
+---
+ cmake/modules/PrintableOptions.cmake | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake
+index a79419a..c74531a 100644
+--- a/cmake/modules/PrintableOptions.cmake
++++ b/cmake/modules/PrintableOptions.cmake
+@@ -19,32 +19,32 @@
+ #    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()
+-- 
+2.30.2
+