CVS commit: pkgsrc/mail/evolution/patches

["Dan Cirnat" <cirnatdan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Mon May 31 19:41:15 UTC 2021

Added Files:
        pkgsrc/mail/evolution/patches:
            patch-cmake_modules_PrintableOptions.cmake

Log Message:
evolution: Really commit cmake patch


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/evolution/patches/patch-cmake_modules_PrintableOptions.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Added files:

Index: pkgsrc/mail/evolution/patches/patch-cmake_modules_PrintableOptions.cmake
diff -u /dev/null pkgsrc/mail/evolution/patches/patch-cmake_modules_PrintableOptions.cmake:1.1
--- /dev/null   Mon May 31 19:41:15 2021
+++ pkgsrc/mail/evolution/patches/patch-cmake_modules_PrintableOptions.cmake    Mon May 31 19:41:15 2021
@@ -0,0 +1,74 @@
+$NetBSD: patch-cmake_modules_PrintableOptions.cmake,v 1.1 2021/05/31 19:41:15 cirnatdan Exp $
+
+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.
+
+From https://gitlab.gnome.org/GNOME/evolution-data-server/-/commit/c95a70bfeae25ba11fbe50fe759a6cdb29388e44
+
+--- cmake/modules/PrintableOptions.cmake.orig  2019-10-11 05:42:45.000000000 +0000
++++ cmake/modules/PrintableOptions.cmake
+@@ -19,36 +19,44 @@
+ #    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 "")
++              message(FATAL_ERROR "filepath variable name cannot be empty")
++      endif("${_name}" STREQUAL "")
++      set(${_name} ${_default_value} CACHE FILEPATH ${_description})
++      add_printable_variable_bare(${_name})
++endmacro()
++
+ function(print_build_options)
+       message(STATUS "Configure options:")
+ 
+@@ -72,3 +80,4 @@ function(print_build_options)
+               message(STATUS ${str})
+       endforeach()
+ endfunction()
++