pool/evolution
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 889207 from GNOME:Next

Browse Source 
- Add 7cfe4190e.patch: Fix build with cmake 3.20.1.

OBS-URL: https://build.opensuse.org/request/show/889207
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=435
This commit is contained in:
Dominique Leuenberger 2021-04-29 08:02:25 +00:00 committed by Git OBS Bridge
parent 0a2a6e1132
commit d812173c5d
3 changed files with 82 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
7cfe4190e.patch Normal file
View File

@ -0,0 +1,75 @@
From 7cfe4190e3e72b40472d57871459f1b136393003 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.
---
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

5
evolution.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 29 07:46:08 UTC 2021 - Dominique Leuenberger <dimstar@opensuse.org>
- Add 7cfe4190e.patch: Fix build with cmake 3.20.1.
-------------------------------------------------------------------
Sat Mar 20 08:26:50 UTC 2021 - Michael Gorse <mgorse@suse.com>

3
evolution.spec
View File

@ -29,7 +29,8 @@ License: CC-BY-SA-3.0 AND LGPL-2.0-only AND LGPL-3.0-only AND OLDAP-2.8 A
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 dimstar@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