[gnome-build-meta/alatiera/3-38-7: 1/5] core-deps/evolution-data-server: backport cmake patch

[Marge Bot <marge-bot src gnome org>]

commit 6b86a54b513b7e45e4179bc85f0c6db7c596b03e
Author: Jordan Petridis <jordan centricular com>
Date:   Wed Jun 9 22:15:11 2021 +0300

    core-deps/evolution-data-server: backport cmake patch
    
    This is needed to compile with cmake 3.20.1+
    
    https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/c95a70bfeae25ba11fbe50fe759a6cdb29388e44
    
    Part-of: <https://gitlab.gnome.org/GNOME/gnome-build-meta/-/merge_requests/1171>

 elements/core-deps/evolution-data-server.bst       |  2 +
 ...tions.cmake-Correct-variable-name-compari.patch | 78 ++++++++++++++++++++++
 2 files changed, 80 insertions(+)
---
diff --git a/elements/core-deps/evolution-data-server.bst b/elements/core-deps/evolution-data-server.bst
index 76890feb..f84c50f2 100644
--- a/elements/core-deps/evolution-data-server.bst
+++ b/elements/core-deps/evolution-data-server.bst
@@ -4,6 +4,8 @@ sources:
 - kind: tar
   url: gnome_downloads:evolution-data-server/3.38/evolution-data-server-3.38.4.tar.xz
   ref: ac53f16b2d51f3e7ff8025f9ca19f4a2d4ce3841d72ae9fe2bb897dc8099d705
+- kind: patch
+  path: files/evolution-data-server/0001-PrintableOptions.cmake-Correct-variable-name-compari.patch
 build-depends:
 - core-deps/intltool.bst
 - freedesktop-sdk.bst:components/gperf.bst
diff --git a/files/evolution-data-server/0001-PrintableOptions.cmake-Correct-variable-name-compari.patch 
b/files/evolution-data-server/0001-PrintableOptions.cmake-Correct-variable-name-compari.patch
new file mode 100644
index 00000000..40634e84
--- /dev/null
+++ b/files/evolution-data-server/0001-PrintableOptions.cmake-Correct-variable-name-compari.patch
@@ -0,0 +1,78 @@
+From 03e197d88650a73cc3ca02cee3bd0e6d272023ed 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.
+
+
+(cherry picked from commit c95a70bfeae25ba11fbe50fe759a6cdb29388e44)
+---
+ cmake/modules/PrintableOptions.cmake | 20 ++++++++++----------
+ 1 file changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake
+index ba1c9d0b7..339f1da4b 100644
+--- a/cmake/modules/PrintableOptions.cmake
++++ b/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()
+-- 
+2.31.1
+