| 1 |
commit: 3cdc3dea6eda714deba98fcf0ec07ff736a0eab7 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Apr 16 13:15:40 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Apr 16 13:17:21 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3cdc3dea |
| 7 |
|
| 8 |
gnome-extra/evolution-data-server: Add patch for cmake-3.20 compat |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/783138 |
| 11 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 12 |
|
| 13 |
.../evolution-data-server-3.38.4.ebuild | 1 + |
| 14 |
...tions.cmake-Correct-variable-name-compari.patch | 75 ++++++++++++++++++++++ |
| 15 |
2 files changed, 76 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
index 768516d9074..1638eb60d28 100644 |
| 19 |
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild |
| 20 |
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.38.4.ebuild |
| 21 |
@@ -84,6 +84,7 @@ src_prepare() { |
| 22 |
gnome2_src_prepare |
| 23 |
|
| 24 |
eapply "${FILESDIR}"/3.36.5-gtk-doc-1.32-compat.patch |
| 25 |
+ eapply "${FILESDIR}"/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch |
| 26 |
|
| 27 |
# Make CMakeLists versioned vala enabled |
| 28 |
sed -e "s;\(find_program(VALAC\) valac);\1 ${VALAC});" \ |
| 29 |
|
| 30 |
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 |
| 31 |
new file mode 100644 |
| 32 |
index 00000000000..95546b6daaa |
| 33 |
--- /dev/null |
| 34 |
+++ b/gnome-extra/evolution-data-server/files/3.38-PrintableOptions.cmake-Correct-variable-name-compari.patch |
| 35 |
@@ -0,0 +1,75 @@ |
| 36 |
+From c95a70bfeae25ba11fbe50fe759a6cdb29388e44 Mon Sep 17 00:00:00 2001 |
| 37 |
+From: Milan Crha <mcrha@××××××.com> |
| 38 |
+Date: Wed, 14 Apr 2021 16:58:08 +0200 |
| 39 |
+Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison |
| 40 |
+ |
| 41 |
+CMake 3.20.1 errors out with: |
| 42 |
+ |
| 43 |
+CMake Error at cmake/modules/PrintableOptions.cmake:38 (message): |
| 44 |
+ variable name cannot be empty |
| 45 |
+ Call Stack (most recent call first): |
| 46 |
+ CMakeLists.txt:152 (add_printable_variable) |
| 47 |
+ |
| 48 |
+Change how the parameter value is compared, to fix it. |
| 49 |
+--- |
| 50 |
+ cmake/modules/PrintableOptions.cmake | 20 ++++++++++---------- |
| 51 |
+ 1 file changed, 10 insertions(+), 10 deletions(-) |
| 52 |
+ |
| 53 |
+diff --git a/cmake/modules/PrintableOptions.cmake b/cmake/modules/PrintableOptions.cmake |
| 54 |
+index ba1c9d0b7..339f1da4b 100644 |
| 55 |
+--- a/cmake/modules/PrintableOptions.cmake |
| 56 |
++++ b/cmake/modules/PrintableOptions.cmake |
| 57 |
+@@ -19,40 +19,40 @@ |
| 58 |
+ # prints all the build options previously added with the above functions |
| 59 |
+ |
| 60 |
+ macro(add_printable_variable_bare _name) |
| 61 |
+- if(_name STREQUAL "") |
| 62 |
++ if("${_name}" STREQUAL "") |
| 63 |
+ message(FATAL_ERROR "variable name cannot be empty") |
| 64 |
+- endif(_name STREQUAL "") |
| 65 |
++ endif("${_name}" STREQUAL "") |
| 66 |
+ list(APPEND _printable_options ${_name}) |
| 67 |
+ endmacro() |
| 68 |
+ |
| 69 |
+ macro(add_printable_option _name _description _default_value) |
| 70 |
+- if(_name STREQUAL "") |
| 71 |
++ if("${_name}" STREQUAL "") |
| 72 |
+ message(FATAL_ERROR "option name cannot be empty") |
| 73 |
+- endif(_name STREQUAL "") |
| 74 |
++ endif("${_name}" STREQUAL "") |
| 75 |
+ option(${_name} ${_description} ${_default_value}) |
| 76 |
+ add_printable_variable_bare(${_name}) |
| 77 |
+ endmacro() |
| 78 |
+ |
| 79 |
+ macro(add_printable_variable _name _description _default_value) |
| 80 |
+- if(_name STREQUAL "") |
| 81 |
++ if("${_name}" STREQUAL "") |
| 82 |
+ message(FATAL_ERROR "variable name cannot be empty") |
| 83 |
+- endif(_name STREQUAL "") |
| 84 |
++ endif("${_name}" STREQUAL "") |
| 85 |
+ set(${_name} ${_default_value} CACHE STRING ${_description}) |
| 86 |
+ add_printable_variable_bare(${_name}) |
| 87 |
+ endmacro() |
| 88 |
+ |
| 89 |
+ macro(add_printable_variable_path _name _description _default_value) |
| 90 |
+- if(_name STREQUAL "") |
| 91 |
++ if("${_name}" STREQUAL "") |
| 92 |
+ message(FATAL_ERROR "path variable name cannot be empty") |
| 93 |
+- endif(_name STREQUAL "") |
| 94 |
++ endif("${_name}" STREQUAL "") |
| 95 |
+ set(${_name} ${_default_value} CACHE PATH ${_description}) |
| 96 |
+ add_printable_variable_bare(${_name}) |
| 97 |
+ endmacro() |
| 98 |
+ |
| 99 |
+ macro(add_printable_variable_filepath _name _description _default_value) |
| 100 |
+- if(_name STREQUAL "") |
| 101 |
++ if("${_name}" STREQUAL "") |
| 102 |
+ message(FATAL_ERROR "filepath variable name cannot be empty") |
| 103 |
+- endif(_name STREQUAL "") |
| 104 |
++ endif("${_name}" STREQUAL "") |
| 105 |
+ set(${_name} ${_default_value} CACHE FILEPATH ${_description}) |
| 106 |
+ add_printable_variable_bare(${_name}) |
| 107 |
+ endmacro() |
| 108 |
+-- |
| 109 |
+2.26.3 |
| 110 |
+ |
Archives