summaryrefslogtreecommitdiff
path: root/gnu/packages/patches/evolution-printableoptions.patch
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-12 22:37:30 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-12 22:44:56 -0500
commitacd827be09a5d15734be9a09a88e1892d54f8dc4 (patch)
tree5bb221094c6688961c4e6387b5b29fac30f155f1 /gnu/packages/patches/evolution-printableoptions.patch
parentce7d93ceda06f0332617a29fe0181f13d2c0b369 (diff)
gnu: evolution: Update to 3.42.1.
* gnu/packages/gnome.scm (evolution): Update to 3.42.1. Remove trailing #t. [source]: Remove patches. [phases]{adjust-webkitgtk-version}: New phase. * gnu/packages/patches/evolution-CVE-2020-11879.patch: Delete file. * gnu/packages/patches/evolution-printableoptions.patch: Delete file. * gnu/local.mk (dist_patch_DATA): De-register them.
Diffstat (limited to 'gnu/packages/patches/evolution-printableoptions.patch')
-rw-r--r--gnu/packages/patches/evolution-printableoptions.patch57
1 files changed, 0 insertions, 57 deletions
diff --git a/gnu/packages/patches/evolution-printableoptions.patch b/gnu/packages/patches/evolution-printableoptions.patch
deleted file mode 100644
index 55bee381f4..0000000000
--- a/gnu/packages/patches/evolution-printableoptions.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Patch adapted from evolution-data-server's
-c3915bb99638c1ccf57217097b14b5db69bcac96 upstream patch by Milan Crha:
-
- 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.
-
---- a/cmake/modules/PrintableOptions.cmake
-+++ b/cmake/modules/PrintableOptions.cmake
-@@ -19,32 +19,32 @@
- # 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()