commit: 3cdc3dea6eda714deba98fcf0ec07ff736a0eab7 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Fri Apr 16 13:15:40 2021 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Fri Apr 16 13:17:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cdc3dea
gnome-extra/evolution-data-server: Add patch for cmake-3.20 compat Closes: https://bugs.gentoo.org/783138 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> .../evolution-data-server-3.38.4.ebuild | 1 + ...tions.cmake-Correct-variable-name-compari.patch | 75 ++++++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild index 768516d9074..1638eb60d28 100644 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild +++ b/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild @@ -84,6 +84,7 @@ src_prepare() { gnome2_src_prepare eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch + eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch # Make CMakeLists versioned vala enabled sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \ diff --git a/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch b/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch new file mode 100644 index 00000000000..95546b6daaa --- /dev/null +++ b/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch @@ -0,0 +1,75 @@ +From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001 +From: Milan Crha <[email protected]> +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. +--- + 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.26.3 +
