CVS commit: pkgsrc/mail/evolution-data-server

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

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Wed Apr 28 12:21:50 UTC 2021

Modified Files:
        pkgsrc/mail/evolution-data-server: Makefile distinfo
Added Files:
        pkgsrc/mail/evolution-data-server/patches:
            patch-cmake_modules_PrintableOptions.cmake

Log Message:
evolution-data-server: Really fix build, backport upstream patch for newer CMake


To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 pkgsrc/mail/evolution-data-server/Makefile
cvs rdiff -u -r1.89 -r1.90 pkgsrc/mail/evolution-data-server/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/mail/evolution-data-server/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.

Modified files:

Index: pkgsrc/mail/evolution-data-server/Makefile
diff -u pkgsrc/mail/evolution-data-server/Makefile:1.201 pkgsrc/mail/evolution-data-server/Makefile:1.202
--- pkgsrc/mail/evolution-data-server/Makefile:1.201    Wed Apr 21 12:59:48 2021
+++ pkgsrc/mail/evolution-data-server/Makefile  Wed Apr 28 12:21:50 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.201 2021/04/21 12:59:48 cirnatdan Exp $
+# $NetBSD: Makefile,v 1.202 2021/04/28 12:21:50 cirnatdan Exp $
 
 DISTNAME=      evolution-data-server-3.35.1
 PKGREVISION=   15
@@ -25,7 +25,6 @@ CMAKE_ARGS+=  -DWITH_LIBDB=OFF
 CMAKE_ARGS+=   -DENABLE_GOA=OFF
 CMAKE_ARGS+=   -DENABLE_WEATHER=OFF
 CMAKE_ARGS+=   -DENABLE_OAUTH2=OFF
-CMAKE_ARGS+=   -DLIB_SUFFIX=""
 
 CFLAGS.NetBSD+=        -D_NETBSD_SOURCE
 

Index: pkgsrc/mail/evolution-data-server/distinfo
diff -u pkgsrc/mail/evolution-data-server/distinfo:1.89 pkgsrc/mail/evolution-data-server/distinfo:1.90
--- pkgsrc/mail/evolution-data-server/distinfo:1.89     Wed Oct 30 17:26:50 2019
+++ pkgsrc/mail/evolution-data-server/distinfo  Wed Apr 28 12:21:50 2021
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.89 2019/10/30 17:26:50 nia Exp $
+$NetBSD: distinfo,v 1.90 2021/04/28 12:21:50 cirnatdan Exp $
 
 SHA1 (evolution-data-server-3.35.1.tar.xz) = bde163834bfc85553ece99e8ac1182fadcfa750d
 RMD160 (evolution-data-server-3.35.1.tar.xz) = c615e75959ea3a43cbb213c64de5de7076179202
 SHA512 (evolution-data-server-3.35.1.tar.xz) = 67ea9739b27df42c8ae91fe3c98073850da0cb5c7e85a3bf2e9c6272eaac27d62b62d576bbd5cbf76b9b077d08b71065e00de11912d2b3aba162786e6e1db6cd
 Size (evolution-data-server-3.35.1.tar.xz) = 4614216 bytes
+SHA1 (patch-cmake_modules_PrintableOptions.cmake) = 4f6eca93f9e859730b7abe0b7daceb0b4219b345
 SHA1 (patch-src_tools_addressbook-export_CMakeLists.txt) = 1e0d65ac17062bfa72ebdc0d1a3fa50f4fd1cdb2

Added files:

Index: pkgsrc/mail/evolution-data-server/patches/patch-cmake_modules_PrintableOptions.cmake
diff -u /dev/null pkgsrc/mail/evolution-data-server/patches/patch-cmake_modules_PrintableOptions.cmake:1.1
--- /dev/null   Wed Apr 28 12:21:50 2021
+++ pkgsrc/mail/evolution-data-server/patches/patch-cmake_modules_PrintableOptions.cmake        Wed Apr 28 12:21:50 2021
@@ -0,0 +1,74 @@
+$NetBSD: patch-cmake_modules_PrintableOptions.cmake,v 1.1 2021/04/28 12:21:50 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()
++