1 |
commit: b58f368495ad06c6638abffb758728c566d71176 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue May 1 18:48:45 2018 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue May 1 18:49:31 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b58f3684 |
7 |
|
8 |
media-sound/tomahawk: Remove 0.9.0_pre20170808 |
9 |
|
10 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
11 |
|
12 |
media-sound/tomahawk/Manifest | 1 - |
13 |
.../tomahawk-0.9.0_pre20170808-qt-5.11b3.patch | 240 --------------------- |
14 |
.../tomahawk/files/tomahawk-liblastfm-cmake.patch | 126 ----------- |
15 |
.../tomahawk/tomahawk-0.9.0_pre20170808.ebuild | 78 ------- |
16 |
4 files changed, 445 deletions(-) |
17 |
|
18 |
diff --git a/media-sound/tomahawk/Manifest b/media-sound/tomahawk/Manifest |
19 |
index 5b46c7f1068..f1955d31d4f 100644 |
20 |
--- a/media-sound/tomahawk/Manifest |
21 |
+++ b/media-sound/tomahawk/Manifest |
22 |
@@ -1,2 +1 @@ |
23 |
-DIST tomahawk-0.9.0_pre20170808.tar.gz 9913232 BLAKE2B 5a7ebd9419fece090c0aec1f8f47bf35e1f0fbae5cd6a41803ac265e7310dadac61ba4f2e25b0d2fbbb0068cbb3f7098c1d330ac81e671be1028ed3b78d32560 SHA512 edaa4c1637ca460f838dfdd7ecc9d5dae0b66a8280deb8dc6140c673ecc76aa1055efbbac1e9b2937ec01d6dd657935b907cadceb2059f8e055305e872866c2b |
24 |
DIST tomahawk-0.9.0_pre20180501.tar.gz 9913223 BLAKE2B 430fedf1a06307721d36ce733dc6f380e56ca4ba018816b4d6cf70370a383945033220bded8fef1aaeb0deb49ec89422c4ade6add997d9034620d42c43ba2b8f SHA512 51ee268a7165ee4968cd3fbd883c8e86fdee049dbf85d11ff3212d1648f08557c868c0c3f0f448c3a7fa6a825af4ee94b498b5027a788b545587bf4bae1be1c7 |
25 |
|
26 |
diff --git a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch b/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch |
27 |
deleted file mode 100644 |
28 |
index 6fb139c6bf1..00000000000 |
29 |
--- a/media-sound/tomahawk/files/tomahawk-0.9.0_pre20170808-qt-5.11b3.patch |
30 |
+++ /dev/null |
31 |
@@ -1,240 +0,0 @@ |
32 |
-From 208a259b08676f2e0db35451b78e8225cb87547d Mon Sep 17 00:00:00 2001 |
33 |
-From: Andreas Sturmlechner <asturm@g.o> |
34 |
-Date: Tue, 17 Apr 2018 13:09:25 +0200 |
35 |
-Subject: [PATCH] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) |
36 |
- |
37 |
---- |
38 |
- CMakeLists.txt | 3 --- |
39 |
- TomahawkAddLibrary.cmake | 4 +++- |
40 |
- TomahawkUse.cmake.in | 3 --- |
41 |
- src/crashreporter/CMakeLists.txt | 6 ++++-- |
42 |
- src/libtomahawk/CMakeLists.txt | 18 +++++++++++------- |
43 |
- src/tests/tomahawk_add_test.cmake | 8 ++++++-- |
44 |
- src/tomahawk/CMakeLists.txt | 17 ++++++++++------- |
45 |
- src/tools/database-reader/CMakeLists.txt | 4 +++- |
46 |
- .../tomahawk-test-musicscan/CMakeLists.txt | 4 +++- |
47 |
- .../kdsingleapplicationguard/CMakeLists.txt | 4 +++- |
48 |
- .../src/certificate/CMakeLists.txt | 6 +++--- |
49 |
- .../qxt/qxtweb-standalone/CMakeLists.txt | 10 +++++----- |
50 |
- 12 files changed, 51 insertions(+), 36 deletions(-) |
51 |
- |
52 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
53 |
-index 7004e1b70..616db971f 100644 |
54 |
---- a/CMakeLists.txt |
55 |
-+++ b/CMakeLists.txt |
56 |
-@@ -243,9 +243,6 @@ if( NOT Qt5Core_DIR ) |
57 |
- macro_optional_find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS} ) |
58 |
- macro_log_feature(QT4_FOUND "Qt" "A cross-platform application and UI framework" "http://qt-project.org" TRUE "" "If you see this, although libqt4-devel is installed, check whether the \n qtwebkit-devel package and whatever contains QtUiTools is installed too") |
59 |
- |
60 |
-- macro(qt5_use_modules) |
61 |
-- endmacro() |
62 |
-- |
63 |
- macro(qt_wrap_ui) |
64 |
- qt4_wrap_ui(${ARGN}) |
65 |
- endmacro() |
66 |
-diff --git a/TomahawkAddLibrary.cmake b/TomahawkAddLibrary.cmake |
67 |
-index 384394e45..f67a48900 100644 |
68 |
---- a/TomahawkAddLibrary.cmake |
69 |
-+++ b/TomahawkAddLibrary.cmake |
70 |
-@@ -46,7 +46,9 @@ function(tomahawk_add_library) |
71 |
- endif() |
72 |
- |
73 |
- # HACK: add qt modules - every lib should define its own set of modules |
74 |
-- qt5_use_modules(${target} Core Network Widgets Sql Xml ${LIBRARY_QT5_MODULES}) |
75 |
-+ if(Qt5Core_DIR) |
76 |
-+ target_link_libraries(${target} Qt5::Core Qt5::Network Qt5::Widgets Qt5::Sql Qt5::Xml) |
77 |
-+ endif() |
78 |
- |
79 |
- # definitions - can this be moved into set_target_properties below? |
80 |
- add_definitions(${QT_DEFINITIONS}) |
81 |
-diff --git a/TomahawkUse.cmake.in b/TomahawkUse.cmake.in |
82 |
-index cb39fe219..9401e1851 100644 |
83 |
---- a/TomahawkUse.cmake.in |
84 |
-+++ b/TomahawkUse.cmake.in |
85 |
-@@ -81,9 +81,6 @@ else(TOMAHAWK_QT5) |
86 |
- find_package(Qt4 4.7.0 COMPONENTS ${NEEDED_QT4_COMPONENTS}) |
87 |
- include( ${QT_USE_FILE} ) |
88 |
- |
89 |
-- macro(qt5_use_modules) |
90 |
-- endmacro() |
91 |
-- |
92 |
- macro(qt_wrap_ui) |
93 |
- qt4_wrap_ui(${ARGN}) |
94 |
- endmacro() |
95 |
-diff --git a/src/crashreporter/CMakeLists.txt b/src/crashreporter/CMakeLists.txt |
96 |
-index b837eb941..d47c91b62 100644 |
97 |
---- a/src/crashreporter/CMakeLists.txt |
98 |
-+++ b/src/crashreporter/CMakeLists.txt |
99 |
-@@ -43,7 +43,9 @@ target_link_libraries( ${TOMAHAWK_CRASH_REPORTER_TARGET} |
100 |
- ${QT_LIBRARIES} |
101 |
- ) |
102 |
- |
103 |
-+if(Qt5Core_DIR) |
104 |
-+ target_link_libraries(${TOMAHAWK_CRASH_REPORTER_TARGET} Qt5::Widgets Qt5::Network) |
105 |
-+endif() |
106 |
-+ |
107 |
- set_target_properties(${TOMAHAWK_CRASH_REPORTER_TARGET} PROPERTIES AUTOMOC ON) |
108 |
- install(TARGETS ${TOMAHAWK_CRASH_REPORTER_TARGET} RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}) |
109 |
-- |
110 |
--qt5_use_modules(${TOMAHAWK_CRASH_REPORTER_TARGET} Widgets Network) |
111 |
-diff --git a/src/libtomahawk/CMakeLists.txt b/src/libtomahawk/CMakeLists.txt |
112 |
-index adb3edfa0..a85a835ad 100644 |
113 |
---- a/src/libtomahawk/CMakeLists.txt |
114 |
-+++ b/src/libtomahawk/CMakeLists.txt |
115 |
-@@ -500,12 +500,17 @@ set_target_properties( |
116 |
- OUTPUT_NAME ${TOMAHAWK_BASE_TARGET_NAME} |
117 |
- ) |
118 |
- |
119 |
-- |
120 |
--qt5_use_modules(${TOMAHAWK_LIBRARY} Widgets Network Sql WebKitWidgets Concurrent Xml UiTools Svg) |
121 |
--IF(APPLE) |
122 |
-- qt5_use_modules(${TOMAHAWK_LIBRARY} MacExtras) |
123 |
--ENDIF() |
124 |
-- |
125 |
-+if(Qt5Core_DIR) |
126 |
-+ target_link_libraries(${TOMAHAWK_LIBRARY} |
127 |
-+ Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets Qt5::Concurrent Qt5::Xml Qt5::UiTools Qt5::Svg |
128 |
-+ ) |
129 |
-+ if(APPLE) |
130 |
-+ target_link_libraries(${TOMAHAWK_LIBRARY} Qt5::MacExtras) |
131 |
-+ endif() |
132 |
-+ if( UNIX AND NOT APPLE ) |
133 |
-+ target_link_libraries(${TOMAHAWK_LIBRARY} Qt5::DBus) |
134 |
-+ endif() |
135 |
-+endif() |
136 |
- |
137 |
- IF(QCA2_FOUND) |
138 |
- INCLUDE_DIRECTORIES( ${QCA2_INCLUDE_DIR} ) |
139 |
-@@ -514,7 +519,6 @@ ENDIF(QCA2_FOUND) |
140 |
- |
141 |
- IF( UNIX AND NOT APPLE ) |
142 |
- LIST(APPEND LINK_LIBRARIES ${QT_QTDBUS_LIBRARIES} ) |
143 |
-- qt5_use_modules(${TOMAHAWK_LIBRARY} DBus) |
144 |
- ENDIF( UNIX AND NOT APPLE ) |
145 |
- |
146 |
- TARGET_LINK_LIBRARIES( ${TOMAHAWK_LIBRARY} |
147 |
-diff --git a/src/tests/tomahawk_add_test.cmake b/src/tests/tomahawk_add_test.cmake |
148 |
-index 464b8c918..e3e20ed4b 100644 |
149 |
---- a/src/tests/tomahawk_add_test.cmake |
150 |
-+++ b/src/tests/tomahawk_add_test.cmake |
151 |
-@@ -16,8 +16,12 @@ macro(tomahawk_add_test test_class) |
152 |
- ${QT_QTCORE_LIBRARY} |
153 |
- ) |
154 |
- |
155 |
-- add_test(NAME ${TOMAHAWK_TEST_TARGET} COMMAND ${TOMAHAWK_TEST_TARGET}) |
156 |
-+ if(Qt5Core_DIR) |
157 |
-+ target_link_libraries(${TOMAHAWK_TEST_TARGET} |
158 |
-+ Qt5::Core Qt5::Network Qt5::Widgets Qt5::Sql Qt5::Xml Qt5::Test |
159 |
-+ ) |
160 |
-+ endif() |
161 |
- |
162 |
-- qt5_use_modules(${TOMAHAWK_TEST_TARGET} Core Network Widgets Sql Xml Test) |
163 |
-+ add_test(NAME ${TOMAHAWK_TEST_TARGET} COMMAND ${TOMAHAWK_TEST_TARGET}) |
164 |
- |
165 |
- endmacro() |
166 |
-diff --git a/src/tomahawk/CMakeLists.txt b/src/tomahawk/CMakeLists.txt |
167 |
-index cb60b8012..7facdc3da 100644 |
168 |
---- a/src/tomahawk/CMakeLists.txt |
169 |
-+++ b/src/tomahawk/CMakeLists.txt |
170 |
-@@ -171,13 +171,16 @@ SET_TARGET_PROPERTIES( ${TOMAHAWK_APPLICATION_TARGET} |
171 |
- RUNTIME_OUTPUT_NAME ${TOMAHAWK_RUNTIME_OUTPUT_NAME} |
172 |
- ) |
173 |
- |
174 |
-- |
175 |
--qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} Core Widgets Network Sql WebKitWidgets) |
176 |
--if(APPLE) |
177 |
-- qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} MacExtras) |
178 |
--endif() |
179 |
--if(WIN32) |
180 |
-- qt5_use_modules(${TOMAHAWK_APPLICATION_TARGET} WinExtras) |
181 |
-+if(Qt5Core_DIR) |
182 |
-+ target_link_libraries(${TOMAHAWK_APPLICATION_TARGET} |
183 |
-+ Qt5::Core Qt5::Widgets Qt5::Network Qt5::Sql Qt5::WebKitWidgets |
184 |
-+ ) |
185 |
-+ if(APPLE) |
186 |
-+ target_link_libraries(${TOMAHAWK_APPLICATION_TARGET} Qt5::MacExtras) |
187 |
-+ endif() |
188 |
-+ if(WIN32) |
189 |
-+ target_link_libraries(${TOMAHAWK_APPLICATION_TARGET} Qt5::WinExtras) |
190 |
-+ endif() |
191 |
- endif() |
192 |
- |
193 |
- MESSAGE( STATUS "OS_SPECIFIC_LINK_LIBRARIES: ${OS_SPECIFIC_LINK_LIBRARIES}" ) |
194 |
-diff --git a/src/tools/database-reader/CMakeLists.txt b/src/tools/database-reader/CMakeLists.txt |
195 |
-index 72bb1e0db..d7a45f0a6 100644 |
196 |
---- a/src/tools/database-reader/CMakeLists.txt |
197 |
-+++ b/src/tools/database-reader/CMakeLists.txt |
198 |
-@@ -15,7 +15,9 @@ set_target_properties( ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} |
199 |
- target_link_libraries( ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} |
200 |
- ${TOMAHAWK_LIBRARIES} |
201 |
- ) |
202 |
-+if(Qt5Core_DIR) |
203 |
-+ target_link_libraries(${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} Qt5::Core) |
204 |
-+endif() |
205 |
- |
206 |
--qt5_use_modules(${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} Core) |
207 |
- install( TARGETS ${TOMAHAWK_TOOL_DB_LIST_ARTISTS_TARGET} BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
208 |
- |
209 |
-diff --git a/src/tools/tomahawk-test-musicscan/CMakeLists.txt b/src/tools/tomahawk-test-musicscan/CMakeLists.txt |
210 |
-index 097e3fc08..15c0c479f 100644 |
211 |
---- a/src/tools/tomahawk-test-musicscan/CMakeLists.txt |
212 |
-+++ b/src/tools/tomahawk-test-musicscan/CMakeLists.txt |
213 |
-@@ -14,6 +14,8 @@ set_target_properties( ${TOMAHAWK_TOOL_MUSICSCAN_TARGET} |
214 |
- target_link_libraries( ${TOMAHAWK_TOOL_MUSICSCAN_TARGET} |
215 |
- ${TOMAHAWK_LIBRARIES} |
216 |
- ) |
217 |
-+if(Qt5Core_DIR) |
218 |
-+ target_link_libraries(${TOMAHAWK_TOOL_MUSICSCAN_TARGET} Qt5::Core Qt5::Gui Qt5::Network Qt5::Widgets) |
219 |
-+endif() |
220 |
- |
221 |
--qt5_use_modules(${TOMAHAWK_TOOL_MUSICSCAN_TARGET} Core Gui Network Widgets) |
222 |
- install( TARGETS ${TOMAHAWK_TOOL_MUSICSCAN_TARGET} BUNDLE DESTINATION . RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ) |
223 |
-diff --git a/thirdparty/kdsingleapplicationguard/CMakeLists.txt b/thirdparty/kdsingleapplicationguard/CMakeLists.txt |
224 |
-index af4cf8704..9d6b49014 100644 |
225 |
---- a/thirdparty/kdsingleapplicationguard/CMakeLists.txt |
226 |
-+++ b/thirdparty/kdsingleapplicationguard/CMakeLists.txt |
227 |
-@@ -24,4 +24,6 @@ set_target_properties( |
228 |
- PROPERTIES |
229 |
- AUTOMOC TRUE |
230 |
- ) |
231 |
--qt5_use_modules(kdsingleapplicationguard Core) |
232 |
-+if(Qt5Core_DIR) |
233 |
-+ target_link_libraries(kdsingleapplicationguard Qt5::Core) |
234 |
-+endif() |
235 |
-diff --git a/thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt b/thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt |
236 |
-index a51157cf7..bfb0b0afe 100644 |
237 |
---- a/thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt |
238 |
-+++ b/thirdparty/qt-certificate-addon/src/certificate/CMakeLists.txt |
239 |
-@@ -25,6 +25,6 @@ set_target_properties( |
240 |
- PROPERTIES |
241 |
- AUTOMOC TRUE |
242 |
- ) |
243 |
--qt5_use_modules(qtcertificateaddon Core Network) |
244 |
-- |
245 |
-- |
246 |
-+if(Qt5Core_DIR) |
247 |
-+ target_link_libraries(qtcertificateaddon Qt5::Core Qt5::Network) |
248 |
-+endif() |
249 |
-diff --git a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt |
250 |
-index 654a6aab5..1babe0cfc 100644 |
251 |
---- a/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt |
252 |
-+++ b/thirdparty/qxt/qxtweb-standalone/CMakeLists.txt |
253 |
-@@ -74,10 +74,10 @@ ADD_LIBRARY( qxtweb-standalone STATIC |
254 |
- ) |
255 |
- |
256 |
- |
257 |
--target_link_libraries( qxtweb-standalone |
258 |
-- ${QT_LIBRARIES} |
259 |
--) |
260 |
-- |
261 |
--qt5_use_modules( qxtweb-standalone Network ) |
262 |
-+if(Qt5Core_DIR) |
263 |
-+ target_link_libraries( qxtweb-standalone Qt5::Network) |
264 |
-+else() |
265 |
-+ target_link_libraries( qxtweb-standalone ${QT_LIBRARIES} ) |
266 |
-+endif() |
267 |
- |
268 |
- set_target_properties( qxtweb-standalone PROPERTIES AUTOMOC TRUE ) |
269 |
--- |
270 |
-2.17.0 |
271 |
- |
272 |
|
273 |
diff --git a/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch b/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch |
274 |
deleted file mode 100644 |
275 |
index 763397c613b..00000000000 |
276 |
--- a/media-sound/tomahawk/files/tomahawk-liblastfm-cmake.patch |
277 |
+++ /dev/null |
278 |
@@ -1,126 +0,0 @@ |
279 |
-diff --git a/CMakeModules/FindLibLastFm.cmake b/CMakeModules/FindLibLastFm.cmake |
280 |
-index a348835..545e39f 100644 |
281 |
---- a/CMakeModules/FindLibLastFm.cmake |
282 |
-+++ b/CMakeModules/FindLibLastFm.cmake |
283 |
-@@ -14,7 +14,7 @@ endif() |
284 |
- # Include dir |
285 |
- find_path(LIBLASTFM_INCLUDE_DIR |
286 |
- # Track.h doesn't exist in liblastfm-0.3.1, was called Track back then |
287 |
-- NAMES lastfm${LASTFM_LIB_SUFFIX}/Track.h |
288 |
-+ NAMES lastfm/Track.h |
289 |
- PATHS ${KDE4_INCLUDE_DIR} |
290 |
- ) |
291 |
- |
292 |
-diff --git a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp |
293 |
-index 85b747b..098e460 100644 |
294 |
---- a/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp |
295 |
-+++ b/src/libtomahawk/accounts/lastfm/LastFmConfig.cpp |
296 |
-@@ -29,17 +29,10 @@ |
297 |
- #include "utils/Closure.h" |
298 |
- #include "utils/NetworkAccessManager.h" |
299 |
- |
300 |
--#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) |
301 |
--#include <lastfm5/ws.h> |
302 |
--#include <lastfm5/User.h> |
303 |
--#include <lastfm5/XmlQuery.h> |
304 |
--#include <lastfm5/Track.h> |
305 |
--#else |
306 |
- #include <lastfm/ws.h> |
307 |
- #include <lastfm/User.h> |
308 |
- #include <lastfm/XmlQuery.h> |
309 |
- #include <lastfm/Track.h> |
310 |
--#endif |
311 |
- |
312 |
- using namespace Tomahawk::Accounts; |
313 |
- |
314 |
-diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp |
315 |
-index 277a62e..cea29a1 100644 |
316 |
---- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp |
317 |
-+++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.cpp |
318 |
-@@ -34,13 +34,8 @@ |
319 |
- #include "TomahawkSettings.h" |
320 |
- #include "utils/NetworkAccessManager.h" |
321 |
- |
322 |
--#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) |
323 |
--#include <lastfm5/ws.h> |
324 |
--#include <lastfm5/XmlQuery.h> |
325 |
--#else |
326 |
- #include <lastfm/ws.h> |
327 |
- #include <lastfm/XmlQuery.h> |
328 |
--#endif |
329 |
- |
330 |
- using namespace Tomahawk::Accounts; |
331 |
- using namespace Tomahawk::InfoSystem; |
332 |
-diff --git a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h |
333 |
-index 0eb3b07..6e202b2 100644 |
334 |
---- a/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h |
335 |
-+++ b/src/libtomahawk/accounts/lastfm/LastFmInfoPlugin.h |
336 |
-@@ -24,15 +24,9 @@ |
337 |
- #include "infosystem/InfoSystemWorker.h" |
338 |
- #include "DllMacro.h" |
339 |
- |
340 |
--#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) |
341 |
--#include <lastfm5/Track.h> |
342 |
--#include <lastfm5/Audioscrobbler.h> |
343 |
--#include <lastfm5/ScrobblePoint.h> |
344 |
--#else |
345 |
- #include <lastfm/Track.h> |
346 |
- #include <lastfm/Audioscrobbler.h> |
347 |
- #include <lastfm/ScrobblePoint.h> |
348 |
--#endif |
349 |
- |
350 |
- #include <QObject> |
351 |
- |
352 |
-diff --git a/src/libtomahawk/utils/TomahawkUtils.cpp b/src/libtomahawk/utils/TomahawkUtils.cpp |
353 |
-index 0baa27c..cf808d9 100644 |
354 |
---- a/src/libtomahawk/utils/TomahawkUtils.cpp |
355 |
-+++ b/src/libtomahawk/utils/TomahawkUtils.cpp |
356 |
-@@ -32,11 +32,7 @@ |
357 |
- #include "Track.h" |
358 |
- |
359 |
- #ifdef LIBLASTFM_FOUND |
360 |
-- #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) |
361 |
-- #include <lastfm5/ws.h> |
362 |
-- #else |
363 |
- #include <lastfm/ws.h> |
364 |
-- #endif |
365 |
- #endif |
366 |
- |
367 |
- #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) |
368 |
-diff --git a/src/tomahawk/Scrobbler.h b/src/tomahawk/Scrobbler.h |
369 |
-index 01c2695..fab0ca6 100644 |
370 |
---- a/src/tomahawk/Scrobbler.h |
371 |
-+++ b/src/tomahawk/Scrobbler.h |
372 |
-@@ -20,15 +20,10 @@ |
373 |
- #ifndef TOMAHAWK_SCROBBLER_H |
374 |
- #define TOMAHAWK_SCROBBLER_H |
375 |
- |
376 |
-+#include "lastfm/ScrobblePoint.h" |
377 |
- #include "Result.h" |
378 |
- #include "infosystem/InfoSystem.h" |
379 |
- |
380 |
-- |
381 |
--#if QT_VERSION >= QT_VERSION_CHECK(5,0,0) |
382 |
--#include <lastfm5/ScrobblePoint.h> |
383 |
--#else |
384 |
--#include <lastfm/ScrobblePoint.h> |
385 |
--#endif |
386 |
- #include <QObject> |
387 |
- |
388 |
- /** |
389 |
-diff --git a/src/tomahawk/TomahawkApp.h b/src/tomahawk/TomahawkApp.h |
390 |
-index 953140b..c161d07 100644 |
391 |
---- a/src/tomahawk/TomahawkApp.h |
392 |
-+++ b/src/tomahawk/TomahawkApp.h |
393 |
-@@ -64,11 +64,7 @@ namespace Tomahawk |
394 |
- } |
395 |
- |
396 |
- #ifdef LIBLASTFM_FOUND |
397 |
-- #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) |
398 |
-- #include <lastfm5/NetworkAccessManager.h> |
399 |
-- #else |
400 |
- #include <lastfm/NetworkAccessManager.h> |
401 |
-- #endif |
402 |
- #include "Scrobbler.h" |
403 |
- #endif |
404 |
- |
405 |
|
406 |
diff --git a/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild b/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild |
407 |
deleted file mode 100644 |
408 |
index 8cb2950b9aa..00000000000 |
409 |
--- a/media-sound/tomahawk/tomahawk-0.9.0_pre20170808.ebuild |
410 |
+++ /dev/null |
411 |
@@ -1,78 +0,0 @@ |
412 |
-# Copyright 1999-2018 Gentoo Foundation |
413 |
-# Distributed under the terms of the GNU General Public License v2 |
414 |
- |
415 |
-EAPI=6 |
416 |
- |
417 |
-COMMIT=00f602e10203b76fc28b4615868c567e6bd4ced4 |
418 |
-inherit kde5 vcs-snapshot |
419 |
- |
420 |
-DESCRIPTION="Multi-source social music player" |
421 |
-HOMEPAGE="https://www.tomahawk-player.org/" |
422 |
-SRC_URI="https://github.com/${PN}-player/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" |
423 |
- |
424 |
-LICENSE="GPL-3 BSD" |
425 |
-SLOT="0" |
426 |
-KEYWORDS="~amd64 ~x86" |
427 |
-IUSE="+hatchet telepathy xmpp" |
428 |
- |
429 |
-CDEPEND=" |
430 |
- $(add_frameworks_dep attica) |
431 |
- $(add_qt_dep qtdbus) |
432 |
- $(add_qt_dep qtgui) |
433 |
- $(add_qt_dep qtnetwork) |
434 |
- $(add_qt_dep qtsql) |
435 |
- $(add_qt_dep qtsvg) |
436 |
- $(add_qt_dep qtwebkit) |
437 |
- $(add_qt_dep qtwidgets) |
438 |
- $(add_qt_dep qtx11extras) |
439 |
- $(add_qt_dep qtxml) |
440 |
- app-crypt/qca:2[qt5(+)] |
441 |
- dev-cpp/lucene++ |
442 |
- dev-cpp/sparsehash |
443 |
- dev-libs/boost:= |
444 |
- dev-libs/qtkeychain:=[qt5(+)] |
445 |
- >=dev-libs/quazip-0.7.2[qt5(+)] |
446 |
- >=media-libs/liblastfm-1.0.9-r1[qt5(+)] |
447 |
- >=media-libs/taglib-1.8.0 |
448 |
- media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] |
449 |
- >=net-libs/gnutls-3.2:= |
450 |
- x11-libs/libX11 |
451 |
- hatchet? ( dev-cpp/websocketpp ) |
452 |
- telepathy? ( >=net-libs/telepathy-qt-0.9.7-r1[qt5(+)] ) |
453 |
- xmpp? ( >=net-libs/jreen-1.3.0[qt5(+)] ) |
454 |
-" |
455 |
-DEPEND="${CDEPEND} |
456 |
- $(add_qt_dep designer) |
457 |
- $(add_qt_dep linguist-tools) |
458 |
- $(add_qt_dep qtconcurrent) |
459 |
-" |
460 |
-RDEPEND="${CDEPEND} |
461 |
- app-crypt/qca:2[ssl] |
462 |
-" |
463 |
- |
464 |
-PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" ) |
465 |
- |
466 |
-src_prepare() { |
467 |
- kde5_src_prepare |
468 |
- has_version "media-libs/liblastfm[qt5]" && |
469 |
- eapply "${FILESDIR}/${PN}-liblastfm-cmake.patch" |
470 |
-} |
471 |
- |
472 |
-src_configure() { |
473 |
- local mycmakeargs=( |
474 |
- -DWITH_CRASHREPORTER=OFF |
475 |
- -DBUILD_TESTS=OFF |
476 |
- -DBUILD_TOOLS=OFF |
477 |
- -DBUILD_WITH_QT4=OFF |
478 |
- -DWITH_KDE4=OFF |
479 |
- -DBUILD_HATCHET=$(usex hatchet) |
480 |
- -DWITH_TelepathyQt=$(usex telepathy) |
481 |
- -DWITH_Jreen=$(usex xmpp) |
482 |
- ) |
483 |
- |
484 |
- if [[ ${KDE_BUILD_TYPE} != live ]]; then |
485 |
- mycmakeargs+=( -DBUILD_RELEASE=ON ) |
486 |
- fi |
487 |
- |
488 |
- kde5_src_configure |
489 |
-} |