Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at 2021-05-01 00:46:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution (Old) and /work/SRC/openSUSE:Factory/.evolution.new.1947 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution" Sat May 1 00:46:11 2021 rev:243 rq:889214 version:3.40.0 Changes: -------- --- /work/SRC/openSUSE:Factory/evolution/evolution.changes 2021-04-12 12:37:42.561393317 +0200 +++ /work/SRC/openSUSE:Factory/.evolution.new.1947/evolution.changes 2021-05-01 00:46:14.555573918 +0200 @@ -1,0 +2,5 @@ +Thu Apr 29 07:46:08 UTC 2021 - Dominique Leuenberger <dims...@opensuse.org> + +- Add 7cfe4190e.patch: Fix build with cmake 3.20.1. + +------------------------------------------------------------------- New: ---- 7cfe4190e.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.heJH48/_old 2021-05-01 00:46:15.039571761 +0200 +++ /var/tmp/diff_new_pack.heJH48/_new 2021-05-01 00:46:15.039571761 +0200 @@ -29,7 +29,8 @@ Group: Productivity/Networking/Email/Clients URL: https://wiki.gnome.org/Apps/Evolution/ Source0: https://download.gnome.org/sources/evolution/3.40/%{name}-%{version}.tar.xz - +# PATCH-FIX-UPSTREAM 7cfe4190e.patch dims...@opensuse.org -- PrintableOptions.cmake: Correct variable name comparison, fix build with cmake 3.20.1 +Patch0: https://gitlab.gnome.org/GNOME/evolution/-/commit/7cfe4190e.patch BuildRequires: bison BuildRequires: bogofilter BuildRequires: cmake ++++++ 7cfe4190e.patch ++++++ >From 7cfe4190e3e72b40472d57871459f1b136393003 Mon Sep 17 00:00:00 2001 From: Milan Crha <mc...@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. --- 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 ba1c9d0b7f..339f1da4b4 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() -- GitLab
