1 |
commit: 8b7bcc8fd0b8d8c96313911bc04f7fac98517c6a |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Apr 18 05:23:49 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 18 05:24:08 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b7bcc8f |
7 |
|
8 |
gnome-extra/evolution-ews: fix build with CMake 3.20.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/783603 |
11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
12 |
|
13 |
.../evolution-ews/evolution-ews-3.38.4.ebuild | 3 + |
14 |
.../evolution-ews/evolution-ews-3.40.0.ebuild | 3 + |
15 |
.../files/evolution-ews-3.38.4-cmake-3.20.1.patch | 71 ++++++++++++++++++++++ |
16 |
3 files changed, 77 insertions(+) |
17 |
|
18 |
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild |
19 |
index 5a472956bac..adff76ede31 100644 |
20 |
--- a/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild |
21 |
+++ b/gnome-extra/evolution-ews/evolution-ews-3.38.4.ebuild |
22 |
@@ -44,6 +44,9 @@ RESTRICT="test !test? ( test )" |
23 |
# call; if needed, set them after cmake_src_prepare call, if that works |
24 |
src_prepare() { |
25 |
cmake_src_prepare |
26 |
+ |
27 |
+ eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch |
28 |
+ |
29 |
gnome2_src_prepare |
30 |
} |
31 |
|
32 |
|
33 |
diff --git a/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild b/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild |
34 |
index 2088827c202..394ab53f034 100644 |
35 |
--- a/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild |
36 |
+++ b/gnome-extra/evolution-ews/evolution-ews-3.40.0.ebuild |
37 |
@@ -44,6 +44,9 @@ RESTRICT="test !test? ( test )" |
38 |
# call; if needed, set them after cmake_src_prepare call, if that works |
39 |
src_prepare() { |
40 |
cmake_src_prepare |
41 |
+ |
42 |
+ eapply "${FILESDIR}"/${PN}-3.38.4-cmake-3.20.1.patch |
43 |
+ |
44 |
gnome2_src_prepare |
45 |
} |
46 |
|
47 |
|
48 |
diff --git a/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch b/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch |
49 |
new file mode 100644 |
50 |
index 00000000000..050bacd7628 |
51 |
--- /dev/null |
52 |
+++ b/gnome-extra/evolution-ews/files/evolution-ews-3.38.4-cmake-3.20.1.patch |
53 |
@@ -0,0 +1,71 @@ |
54 |
+https://gitlab.gnome.org/GNOME/evolution-ews/-/commit/6d8f7d303ec319539add2f0ba5331c2dab9d23c7.patch |
55 |
+https://bugs.gentoo.org/783603 |
56 |
+ |
57 |
+From 6d8f7d303ec319539add2f0ba5331c2dab9d23c7 Mon Sep 17 00:00:00 2001 |
58 |
+From: Milan Crha <mcrha@××××××.com> |
59 |
+Date: Wed, 14 Apr 2021 16:58:08 +0200 |
60 |
+Subject: [PATCH] PrintableOptions.cmake: Correct variable name comparison |
61 |
+ |
62 |
+CMake 3.20.1 errors out with: |
63 |
+ |
64 |
+CMake Error at cmake/modules/PrintableOptions.cmake:38 (message): |
65 |
+ variable name cannot be empty |
66 |
+ Call Stack (most recent call first): |
67 |
+ CMakeLists.txt:152 (add_printable_variable) |
68 |
+ |
69 |
+Change how the parameter value is compared, to fix it. |
70 |
+--- a/cmake/modules/PrintableOptions.cmake |
71 |
++++ b/cmake/modules/PrintableOptions.cmake |
72 |
+@@ -19,40 +19,40 @@ |
73 |
+ # prints all the build options previously added with the above functions |
74 |
+ |
75 |
+ macro(add_printable_variable_bare _name) |
76 |
+- if(_name STREQUAL "") |
77 |
++ if("${_name}" STREQUAL "") |
78 |
+ message(FATAL_ERROR "variable name cannot be empty") |
79 |
+- endif(_name STREQUAL "") |
80 |
++ endif("${_name}" STREQUAL "") |
81 |
+ list(APPEND _printable_options ${_name}) |
82 |
+ endmacro() |
83 |
+ |
84 |
+ macro(add_printable_option _name _description _default_value) |
85 |
+- if(_name STREQUAL "") |
86 |
++ if("${_name}" STREQUAL "") |
87 |
+ message(FATAL_ERROR "option name cannot be empty") |
88 |
+- endif(_name STREQUAL "") |
89 |
++ endif("${_name}" STREQUAL "") |
90 |
+ option(${_name} ${_description} ${_default_value}) |
91 |
+ add_printable_variable_bare(${_name}) |
92 |
+ endmacro() |
93 |
+ |
94 |
+ macro(add_printable_variable _name _description _default_value) |
95 |
+- if(_name STREQUAL "") |
96 |
++ if("${_name}" STREQUAL "") |
97 |
+ message(FATAL_ERROR "variable name cannot be empty") |
98 |
+- endif(_name STREQUAL "") |
99 |
++ endif("${_name}" STREQUAL "") |
100 |
+ set(${_name} ${_default_value} CACHE STRING ${_description}) |
101 |
+ add_printable_variable_bare(${_name}) |
102 |
+ endmacro() |
103 |
+ |
104 |
+ macro(add_printable_variable_path _name _description _default_value) |
105 |
+- if(_name STREQUAL "") |
106 |
++ if("${_name}" STREQUAL "") |
107 |
+ message(FATAL_ERROR "path variable name cannot be empty") |
108 |
+- endif(_name STREQUAL "") |
109 |
++ endif("${_name}" STREQUAL "") |
110 |
+ set(${_name} ${_default_value} CACHE PATH ${_description}) |
111 |
+ add_printable_variable_bare(${_name}) |
112 |
+ endmacro() |
113 |
+ |
114 |
+ macro(add_printable_variable_filepath _name _description _default_value) |
115 |
+- if(_name STREQUAL "") |
116 |
++ if("${_name}" STREQUAL "") |
117 |
+ message(FATAL_ERROR "filepath variable name cannot be empty") |
118 |
+- endif(_name STREQUAL "") |
119 |
++ endif("${_name}" STREQUAL "") |
120 |
+ set(${_name} ${_default_value} CACHE FILEPATH ${_description}) |
121 |
+ add_printable_variable_bare(${_name}) |
122 |
+ endmacro() |
123 |
+-- |
124 |
+GitLab |