1 |
commit: 1dfd637bb65a02b0dd1ac9b805208bf116b26e48 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon May 7 20:02:06 2018 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 10 10:00:06 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1dfd637b |
7 |
|
8 |
net-libs/telepathy-logger-qt: remove unused patch(es) |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/8306 |
11 |
|
12 |
.../telepathy-logger-qt-15.04.0-cmake-3.9.patch | 249 --------------------- |
13 |
1 file changed, 249 deletions(-) |
14 |
|
15 |
diff --git a/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch b/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch |
16 |
deleted file mode 100644 |
17 |
index 84d66851a22..00000000000 |
18 |
--- a/net-libs/telepathy-logger-qt/files/telepathy-logger-qt-15.04.0-cmake-3.9.patch |
19 |
+++ /dev/null |
20 |
@@ -1,249 +0,0 @@ |
21 |
-diff --git a/cmake/modules/TpQtMacros.cmake b/cmake/modules/TpQtMacros.cmake |
22 |
---- a/cmake/modules/TpQtMacros.cmake |
23 |
-+++ b/cmake/modules/TpQtMacros.cmake |
24 |
-@@ -128,15 +128,15 @@ |
25 |
- FOREACH(_currentArg ${ARGN}) |
26 |
- IF ("${_currentArg}" STREQUAL "DEPENDS") |
27 |
- SET(_TPQT_DOING_DEPENDS TRUE) |
28 |
-- ELSE ("${_currentArg}" STREQUAL "DEPENDS") |
29 |
-+ ELSE () |
30 |
- IF(_TPQT_DOING_DEPENDS) |
31 |
- LIST(APPEND ${_tpqt_depends} "${_currentArg}") |
32 |
-- ELSE(_TPQT_DOING_DEPENDS) |
33 |
-+ ELSE() |
34 |
- LIST(APPEND ${_tpqt_other} "${_currentArg}") |
35 |
-- ENDIF(_TPQT_DOING_DEPENDS) |
36 |
-- ENDIF ("${_currentArg}" STREQUAL "DEPENDS") |
37 |
-- ENDFOREACH(_currentArg) |
38 |
--ENDMACRO (TPQT_EXTRACT_DEPENDS) |
39 |
-+ ENDIF() |
40 |
-+ ENDIF () |
41 |
-+ ENDFOREACH() |
42 |
-+ENDMACRO () |
43 |
- |
44 |
- # helper function to set up a moc rule |
45 |
- FUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS infile outfile moc_flags moc_options) |
46 |
-@@ -151,54 +151,54 @@ |
47 |
- GET_FILENAME_COMPONENT(_moc_outfile_dir "${outfile}" PATH) |
48 |
- IF(_moc_outfile_dir) |
49 |
- SET(_moc_working_dir WORKING_DIRECTORY ${_moc_outfile_dir}) |
50 |
-- ENDIF(_moc_outfile_dir) |
51 |
-+ ENDIF() |
52 |
- SET (_moc_parameters_file ${outfile}_parameters) |
53 |
- SET (_moc_parameters ${moc_flags} ${moc_options} -o "${outfile}" "${infile}") |
54 |
- FILE (REMOVE ${_moc_parameters_file}) |
55 |
- FOREACH(arg ${_moc_parameters}) |
56 |
- FILE (APPEND ${_moc_parameters_file} "${arg}\n") |
57 |
-- ENDFOREACH(arg) |
58 |
-+ ENDFOREACH() |
59 |
- ADD_CUSTOM_COMMAND(OUTPUT ${outfile} |
60 |
- COMMAND ${QT_MOC_EXECUTABLE} @${_moc_outfile_name}_parameters |
61 |
- DEPENDS ${infile} |
62 |
- ${_moc_working_dir} |
63 |
- VERBATIM) |
64 |
-- ELSE (WIN32) |
65 |
-+ ELSE () |
66 |
- ADD_CUSTOM_COMMAND(OUTPUT ${outfile} |
67 |
- COMMAND ${QT_MOC_EXECUTABLE} |
68 |
- ARGS ${moc_flags} ${moc_options} -o ${outfile} ${infile} |
69 |
- DEPENDS ${infile}) |
70 |
-- ENDIF (WIN32) |
71 |
-+ ENDIF () |
72 |
- |
73 |
- add_custom_target(moc-${_moc_outfile_name} DEPENDS ${outfile}) |
74 |
- add_dependencies(moc-${_moc_outfile_name} ${ARGN}) |
75 |
--ENDFUNCTION (TPQT_CREATE_MOC_COMMAND_TARGET_DEPS) |
76 |
-+ENDFUNCTION () |
77 |
- |
78 |
- # add the -i option to QT_GENERATE_MOC |
79 |
- function(TPQT_GENERATE_MOC_I infile outfile) |
80 |
- qt5_get_moc_flags(moc_flags) |
81 |
- get_filename_component(abs_infile ${infile} ABSOLUTE) |
82 |
-- qt5_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i") |
83 |
-+ qt_create_moc_command(${abs_infile} ${outfile} "${moc_flags}" "-i") |
84 |
- set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file |
85 |
--endfunction(TPQT_GENERATE_MOC_I) |
86 |
-+endfunction() |
87 |
- |
88 |
- # same as tpqt_generate_moc_i, but lets the caller specify a list of targets which the mocs should depend on |
89 |
- function(TPQT_GENERATE_MOC_I_TARGET_DEPS infile outfile) |
90 |
- qt5_get_moc_flags(moc_flags) |
91 |
- get_filename_component(abs_infile ${infile} ABSOLUTE) |
92 |
- tpqt_create_moc_command_target_deps(${abs_infile} ${outfile} "${moc_flags}" "-i" ${ARGN}) |
93 |
- set_source_files_properties(${outfile} PROPERTIES SKIP_AUTOMOC TRUE) # dont run automoc on this file |
94 |
--endfunction(TPQT_GENERATE_MOC_I_TARGET_DEPS) |
95 |
-+endfunction() |
96 |
- |
97 |
- # generates mocs for the passed list. The list should be added to the target's sources |
98 |
- function(tpqt_generate_mocs) |
99 |
- file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/_gen" ) |
100 |
- foreach(moc_src ${ARGN}) |
101 |
- string(REPLACE ".h" ".moc.hpp" generated_file ${moc_src}) |
102 |
- tpqt_generate_moc_i(${CMAKE_CURRENT_SOURCE_DIR}/${moc_src} ${CMAKE_CURRENT_BINARY_DIR}/_gen/${generated_file}) |
103 |
- set_property(SOURCE ${moc_src} APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/${generated_file}) |
104 |
-- endforeach(moc_src ${ARGN}) |
105 |
--endfunction(tpqt_generate_mocs) |
106 |
-+ endforeach() |
107 |
-+endfunction() |
108 |
- |
109 |
- function(tpqt_client_generator spec group pretty_include namespace) |
110 |
- tpqt_extract_depends(client_generator_args client_generator_depends ${ARGN}) |
111 |
-@@ -223,18 +223,20 @@ |
112 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
113 |
- |
114 |
- DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py |
115 |
-- ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py) |
116 |
-+ ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py |
117 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml |
118 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-${spec}.xml) |
119 |
- add_custom_target(generate_cli-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}-body.hpp) |
120 |
- add_dependencies(all-generated-sources generate_cli-${spec}-body) |
121 |
- |
122 |
- if (client_generator_depends) |
123 |
- add_dependencies(generate_cli-${spec}-body ${client_generator_depends}) |
124 |
-- endif (client_generator_depends) |
125 |
-+ endif () |
126 |
- |
127 |
- tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.h |
128 |
- ${CMAKE_CURRENT_BINARY_DIR}/_gen/cli-${spec}.moc.hpp |
129 |
- "generate_cli-${spec}-body") |
130 |
--endfunction(tpqt_client_generator spec group pretty_include namespace) |
131 |
-+endfunction() |
132 |
- |
133 |
- function(tpqt_future_client_generator spec namespace) |
134 |
- tpqt_extract_depends(future_client_generator_args future_client_generator_depends ${ARGN}) |
135 |
-@@ -259,18 +261,20 @@ |
136 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
137 |
- |
138 |
- DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py |
139 |
-- ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py) |
140 |
-+ ${CMAKE_SOURCE_DIR}/tools/qt-client-gen.py |
141 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-spec.xml |
142 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.xml) |
143 |
- add_custom_target(generate_future-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}-body.hpp) |
144 |
- add_dependencies(all-generated-sources generate_future-${spec}-body) |
145 |
- |
146 |
- if (future_client_generator_depends) |
147 |
- add_dependencies(generate_future-${spec}-body ${future_client_generator_depends}) |
148 |
-- endif (future_client_generator_depends) |
149 |
-+ endif () |
150 |
- |
151 |
- tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.h |
152 |
- ${CMAKE_CURRENT_BINARY_DIR}/_gen/future-${spec}.moc.hpp |
153 |
- "generate_future-${spec}-body") |
154 |
--endfunction(tpqt_future_client_generator spec namespace) |
155 |
-+endfunction() |
156 |
- |
157 |
- function(tpqt_service_generator spec group pretty_include namespace) |
158 |
- tpqt_extract_depends(service_generator_args service_generator_depends ${ARGN}) |
159 |
-@@ -294,18 +298,20 @@ |
160 |
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |
161 |
- |
162 |
- DEPENDS ${CMAKE_SOURCE_DIR}/tools/libqtcodegen.py |
163 |
-- ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py) |
164 |
-+ ${CMAKE_SOURCE_DIR}/tools/qt-svc-gen.py |
165 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/_gen/stable-spec.xml |
166 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/_gen/spec-svc-${spec}.xml) |
167 |
- add_custom_target(generate_service-${spec}-body DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.cpp) |
168 |
- add_dependencies(all-generated-service-sources generate_service-${spec}-body) |
169 |
- |
170 |
- if (service_generator_depends) |
171 |
- add_dependencies(generate_service-${spec}-body ${service_generator_depends}) |
172 |
-- endif (service_generator_depends) |
173 |
-+ endif () |
174 |
- |
175 |
- tpqt_generate_moc_i_target_deps(${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.h |
176 |
- ${CMAKE_CURRENT_BINARY_DIR}/_gen/svc-${spec}.moc.hpp |
177 |
- "generate_service-${spec}-body") |
178 |
--endfunction(tpqt_service_generator spec group pretty_include namespace) |
179 |
-+endfunction() |
180 |
- |
181 |
- # This function is used for generating CM in various examples |
182 |
- function(tpqt_generate_manager_file MANAGER_FILE OUTPUT_FILENAME DEPEND_FILENAME) |
183 |
-@@ -324,7 +330,7 @@ |
184 |
- |
185 |
- set_source_files_properties(${DEPEND_FILENAME} |
186 |
- PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/_gen/param-spec-struct.h) |
187 |
--endfunction(tpqt_generate_manager_file MANAGER_FILE) |
188 |
-+endfunction() |
189 |
- |
190 |
- function(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE) |
191 |
- tpqt_extract_depends(xincludator_gen_args xincludator_gen_depends ${ARGN}) |
192 |
-@@ -346,8 +352,8 @@ |
193 |
- |
194 |
- if (xincludator_gen_depends) |
195 |
- add_dependencies(${_TARGET_NAME} ${xincludator_gen_depends}) |
196 |
-- endif (xincludator_gen_depends) |
197 |
--endfunction(tpqt_xincludator _TARGET_NAME _INPUT_FILE _OUTPUT_FILE) |
198 |
-+ endif () |
199 |
-+endfunction() |
200 |
- |
201 |
- function(tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE) |
202 |
- tpqt_extract_depends(constants_gen_args constants_gen_depends ${ARGN}) |
203 |
-@@ -371,8 +377,8 @@ |
204 |
- |
205 |
- if (constants_gen_depends) |
206 |
- add_dependencies(${_TARGET_NAME} ${constants_gen_depends}) |
207 |
-- endif (constants_gen_depends) |
208 |
--endfunction (tpqt_constants_gen _TARGET_NAME _SPEC_XML _OUTFILE) |
209 |
-+ endif () |
210 |
-+endfunction () |
211 |
- |
212 |
- function(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE) |
213 |
- tpqt_extract_depends(types_gen_args types_gen_depends ${ARGN}) |
214 |
-@@ -398,8 +404,8 @@ |
215 |
- |
216 |
- if (types_gen_depends) |
217 |
- add_dependencies(${_TARGET_NAME} ${types_gen_depends}) |
218 |
-- endif (types_gen_depends) |
219 |
--endfunction(tpqt_types_gen _TARGET_NAME _SPEC_XML _OUTFILE_DECL _OUTFILE_IMPL _NAMESPACE _REALINCLUDE _PRETTYINCLUDE) |
220 |
-+ endif () |
221 |
-+endfunction() |
222 |
- |
223 |
- macro(tpqt_add_generic_unit_test _fancyName _name) |
224 |
- tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp) |
225 |
-@@ -410,7 +416,7 @@ |
226 |
- |
227 |
- # Valgrind and Callgrind targets |
228 |
- _tpqt_add_check_targets(${_fancyName} ${_name} ${CMAKE_CURRENT_BINARY_DIR}/runGenericTest.sh ${CMAKE_CURRENT_BINARY_DIR}/test-${_name}) |
229 |
--endmacro(tpqt_add_generic_unit_test _fancyName _name) |
230 |
-+endmacro() |
231 |
- |
232 |
- macro(tpqt_add_dbus_unit_test _fancyName _name) |
233 |
- tpqt_generate_moc_i(${_name}.cpp ${CMAKE_CURRENT_BINARY_DIR}/_gen/${_name}.cpp.moc.hpp) |
234 |
-@@ -422,7 +428,7 @@ |
235 |
- |
236 |
- # Valgrind and Callgrind targets |
237 |
- _tpqt_add_check_targets(${_fancyName} ${_name} ${with_session_bus} ${CMAKE_CURRENT_BINARY_DIR}/test-${_name}) |
238 |
--endmacro(tpqt_add_dbus_unit_test _fancyName _name) |
239 |
-+endmacro() |
240 |
- |
241 |
- macro(_tpqt_add_check_targets _fancyName _name _runnerScript) |
242 |
- set_tests_properties(${_fancyName} |
243 |
-@@ -474,20 +480,20 @@ |
244 |
- COMMENT |
245 |
- "Running callgrind on test \"${_fancyName}\"") |
246 |
- add_dependencies(check-callgrind check-callgrind-${_fancyName}) |
247 |
--endmacro(_tpqt_add_check_targets _fancyName _name) |
248 |
-+endmacro() |
249 |
- |
250 |
- function(tpqt_setup_dbus_test_environment) |
251 |
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/runDbusTest.sh " |
252 |
- ${test_environment} |
253 |
- sh ${CMAKE_SOURCE_DIR}/tools/with-session-bus.sh \\ |
254 |
- --config-file=${CMAKE_BINARY_DIR}/tests/dbus-1/session.conf -- $@ |
255 |
- ") |
256 |
--endfunction(tpqt_setup_dbus_test_environment) |
257 |
-+endfunction() |
258 |
- |
259 |
- macro(make_install_path_absolute out in) |
260 |
- if (IS_ABSOLUTE "${in}") |
261 |
- set(${out} "${in}") |
262 |
-- else (IS_ABSOLUTE "${in}") |
263 |
-+ else () |
264 |
- set(${out} "\${TELEPATHY_QT${QT_VERSION_MAJOR}_INSTALL_DIR}/${in}") |
265 |
-- endif (IS_ABSOLUTE "${in}") |
266 |
--endmacro(make_install_path_absolute out in) |
267 |
-+ endif () |
268 |
-+endmacro() |
269 |
- |