1 |
commit: 5afcae3470bfe08736622a85c61d3e4b7618a2cf |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Sep 30 12:02:41 2017 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Sep 30 12:03:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5afcae34 |
7 |
|
8 |
kde-misc/tellico: Fix build with cmake-3.9 |
9 |
|
10 |
Gentoo-bug: 632172 |
11 |
Package-Manager: Portage-2.3.10, Repoman-2.3.3 |
12 |
|
13 |
.../tellico/files/tellico-3.0.2-cmake-3.9.patch | 788 +++++++++++++++++++++ |
14 |
kde-misc/tellico/tellico-3.0.2-r1.ebuild | 91 +++ |
15 |
2 files changed, 879 insertions(+) |
16 |
|
17 |
diff --git a/kde-misc/tellico/files/tellico-3.0.2-cmake-3.9.patch b/kde-misc/tellico/files/tellico-3.0.2-cmake-3.9.patch |
18 |
new file mode 100644 |
19 |
index 00000000000..b31d072850f |
20 |
--- /dev/null |
21 |
+++ b/kde-misc/tellico/files/tellico-3.0.2-cmake-3.9.patch |
22 |
@@ -0,0 +1,788 @@ |
23 |
+Combination of: |
24 |
+ |
25 |
+7f4840bb8eb6ee53c875cc6d6748701efcd5a915 |
26 |
+f1c9c315caed8c7d5d05424c07dd7562e430eba8 |
27 |
+cdd7e6d55584972c8e221a1d6e4f2731423deb60 |
28 |
+cb9847a09a834bf3334caae9c912870c66bd593b |
29 |
+5b0822930907b1e0aa88e666f60c3428a77f011e |
30 |
+024ef21d36201a2baa51b56409002bb91a07d4f9 |
31 |
+b5b78ab9dc6b1f5c0c34b546bf580d9de3c9e042 |
32 |
+ |
33 |
+to fix build with cmake-3.9. |
34 |
+Gentoo-bug: 632172 |
35 |
+ |
36 |
+diff --git a/CMakeLists.txt b/CMakeLists.txt |
37 |
+index 67c9d3c6..943da821 100644 |
38 |
+--- a/CMakeLists.txt |
39 |
++++ b/CMakeLists.txt |
40 |
+@@ -247,7 +247,7 @@ remove_definitions(-DQT_NO_STL) |
41 |
+ include_directories(${LIBXML2_INCLUDE_DIR} |
42 |
+ ${LIBXSLT_INCLUDE_DIR} |
43 |
+ ${CMAKE_CURRENT_BINARY_DIR} |
44 |
+- ${Tellico_SOURCE_DIR}/src/core |
45 |
++ ${Tellico_SOURCE_DIR}/src/config |
46 |
+ ${Tellico_SOURCE_DIR}/src/3rdparty) |
47 |
+ |
48 |
+ set(TELLICO_DATA_INSTALL_DIR ${KDE_INSTALL_DATADIR}/tellico) |
49 |
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt |
50 |
+index 7af65e02..e3393fd8 100644 |
51 |
+--- a/src/CMakeLists.txt |
52 |
++++ b/src/CMakeLists.txt |
53 |
+@@ -1,4 +1,5 @@ |
54 |
+ ADD_SUBDIRECTORY( core ) |
55 |
++ADD_SUBDIRECTORY(config ) |
56 |
+ ADD_SUBDIRECTORY( gui ) |
57 |
+ ADD_SUBDIRECTORY( collections ) |
58 |
+ ADD_SUBDIRECTORY( images ) |
59 |
+diff --git a/src/cite/CMakeLists.txt b/src/cite/CMakeLists.txt |
60 |
+index c90ed142..3192a2d8 100644 |
61 |
+--- a/src/cite/CMakeLists.txt |
62 |
++++ b/src/cite/CMakeLists.txt |
63 |
+@@ -9,6 +9,7 @@ add_library(cite STATIC ${cite_STAT_SRCS}) |
64 |
+ target_link_libraries(cite |
65 |
+ core |
66 |
+ utils |
67 |
++ config |
68 |
+ Qt5::Core |
69 |
+ Qt5::Widgets |
70 |
+ ) |
71 |
+diff --git a/src/cite/lyxpipe.cpp b/src/cite/lyxpipe.cpp |
72 |
+index 860cb506..da5d5fe4 100644 |
73 |
+--- a/src/cite/lyxpipe.cpp |
74 |
++++ b/src/cite/lyxpipe.cpp |
75 |
+@@ -25,7 +25,7 @@ |
76 |
+ #include "lyxpipe.h" |
77 |
+ #include "../collection.h" |
78 |
+ #include "../utils/bibtexhandler.h" |
79 |
+-#include "../core/tellico_config.h" |
80 |
++#include "../config/tellico_config.h" |
81 |
+ #include "../tellico_debug.h" |
82 |
+ |
83 |
+ #include <KLocalizedString> |
84 |
+diff --git a/src/config/CMakeLists.txt b/src/config/CMakeLists.txt |
85 |
+new file mode 100644 |
86 |
+index 00000000..2b48e871 |
87 |
+--- /dev/null |
88 |
++++ b/src/config/CMakeLists.txt |
89 |
+@@ -0,0 +1,30 @@ |
90 |
++########### next target ############### |
91 |
++ |
92 |
++SET(config_STAT_SRCS |
93 |
++ tellico_config_addons.cpp |
94 |
++ ) |
95 |
++ |
96 |
++SET(config_KCFG_SRCS |
97 |
++ tellico_config.kcfgc |
98 |
++ ) |
99 |
++ |
100 |
++kconfig_add_kcfg_files(config_STAT_SRCS ${config_KCFG_SRCS}) |
101 |
++ |
102 |
++ADD_CUSTOM_TARGET(tellico_config DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tellico_config.h) |
103 |
++ |
104 |
++add_library(config STATIC ${config_STAT_SRCS}) |
105 |
++ |
106 |
++TARGET_LINK_LIBRARIES(config |
107 |
++ Qt5::Core |
108 |
++ KF5::I18n |
109 |
++ KF5::ConfigCore |
110 |
++ KF5::ConfigGui |
111 |
++ KF5::ConfigWidgets |
112 |
++ ) |
113 |
++ |
114 |
++########### install files ############### |
115 |
++ |
116 |
++INSTALL(FILES tellico_config.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) |
117 |
++INSTALL(FILES tellico-rename.upd tellico.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) |
118 |
++ |
119 |
++INSTALL(PROGRAMS tellico-1-3-update.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) |
120 |
+diff --git a/src/core/tellico-1-3-update.pl b/src/config/tellico-1-3-update.pl |
121 |
+similarity index 100% |
122 |
+rename from src/core/tellico-1-3-update.pl |
123 |
+rename to src/config/tellico-1-3-update.pl |
124 |
+diff --git a/src/core/tellico-rename.upd b/src/config/tellico-rename.upd |
125 |
+similarity index 100% |
126 |
+rename from src/core/tellico-rename.upd |
127 |
+rename to src/config/tellico-rename.upd |
128 |
+diff --git a/src/core/tellico.upd b/src/config/tellico.upd |
129 |
+similarity index 100% |
130 |
+rename from src/core/tellico.upd |
131 |
+rename to src/config/tellico.upd |
132 |
+diff --git a/src/core/tellico_config.kcfg b/src/config/tellico_config.kcfg |
133 |
+similarity index 100% |
134 |
+rename from src/core/tellico_config.kcfg |
135 |
+rename to src/config/tellico_config.kcfg |
136 |
+diff --git a/src/core/tellico_config.kcfgc b/src/config/tellico_config.kcfgc |
137 |
+similarity index 100% |
138 |
+rename from src/core/tellico_config.kcfgc |
139 |
+rename to src/config/tellico_config.kcfgc |
140 |
+diff --git a/src/core/tellico_config_addons.cpp b/src/config/tellico_config_addons.cpp |
141 |
+similarity index 100% |
142 |
+rename from src/core/tellico_config_addons.cpp |
143 |
+rename to src/config/tellico_config_addons.cpp |
144 |
+diff --git a/src/core/tellico_config_addons.h b/src/config/tellico_config_addons.h |
145 |
+similarity index 100% |
146 |
+rename from src/core/tellico_config_addons.h |
147 |
+rename to src/config/tellico_config_addons.h |
148 |
+diff --git a/src/configdialog.cpp b/src/configdialog.cpp |
149 |
+index 66d8148a..8fd23478 100644 |
150 |
+--- a/src/configdialog.cpp |
151 |
++++ b/src/configdialog.cpp |
152 |
+@@ -36,7 +36,7 @@ |
153 |
+ #include "tellico_kernel.h" |
154 |
+ #include "utils/tellico_utils.h" |
155 |
+ #include "utils/string_utils.h" |
156 |
+-#include "core/tellico_config.h" |
157 |
++#include "config/tellico_config.h" |
158 |
+ #include "images/imagefactory.h" |
159 |
+ #include "gui/combobox.h" |
160 |
+ #include "gui/collectiontypecombo.h" |
161 |
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt |
162 |
+index d8d6477e..9e6c6c14 100644 |
163 |
+--- a/src/core/CMakeLists.txt |
164 |
++++ b/src/core/CMakeLists.txt |
165 |
+@@ -3,34 +3,16 @@ |
166 |
+ SET(core_STAT_SRCS |
167 |
+ filehandler.cpp |
168 |
+ netaccess.cpp |
169 |
+- tellico_config_addons.cpp |
170 |
+ tellico_strings.cpp |
171 |
+ ) |
172 |
+ |
173 |
+-SET(core_KCFG_SRCS |
174 |
+- tellico_config.kcfgc |
175 |
+- ) |
176 |
+- |
177 |
+-kconfig_add_kcfg_files(core_STAT_SRCS ${core_KCFG_SRCS}) |
178 |
+- |
179 |
+-ADD_CUSTOM_TARGET(tellico_config DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tellico_config.h) |
180 |
+- |
181 |
+ add_library(core STATIC ${core_STAT_SRCS}) |
182 |
+ |
183 |
+ TARGET_LINK_LIBRARIES(core |
184 |
+- images |
185 |
+ utils |
186 |
+ Qt5::Core |
187 |
+- KF5::ConfigCore |
188 |
+- KF5::ConfigGui |
189 |
+- KF5::ConfigWidgets |
190 |
++ Qt5::Xml |
191 |
++ KF5::I18n |
192 |
+ KF5::JobWidgets |
193 |
+ KF5::KIOWidgets |
194 |
+ ) |
195 |
+- |
196 |
+-########### install files ############### |
197 |
+- |
198 |
+-INSTALL(FILES tellico_config.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR} ) |
199 |
+-INSTALL(FILES tellico-rename.upd tellico.upd DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) |
200 |
+- |
201 |
+-INSTALL(PROGRAMS tellico-1-3-update.pl DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR} ) |
202 |
+diff --git a/src/detailedlistview.cpp b/src/detailedlistview.cpp |
203 |
+index 33f18e16..ac0ed2b3 100644 |
204 |
+--- a/src/detailedlistview.cpp |
205 |
++++ b/src/detailedlistview.cpp |
206 |
+@@ -30,7 +30,7 @@ |
207 |
+ #include "entry.h" |
208 |
+ #include "tellico_debug.h" |
209 |
+ #include "tellico_kernel.h" |
210 |
+-#include "core/tellico_config.h" |
211 |
++#include "config/tellico_config.h" |
212 |
+ #include "models/entrymodel.h" |
213 |
+ #include "models/entrysortmodel.h" |
214 |
+ #include "models/modelmanager.h" |
215 |
+diff --git a/src/document.cpp b/src/document.cpp |
216 |
+index 1462806c..bb66f7a1 100644 |
217 |
+--- a/src/document.cpp |
218 |
++++ b/src/document.cpp |
219 |
+@@ -28,17 +28,17 @@ |
220 |
+ #include "translators/tellicozipexporter.h" |
221 |
+ #include "translators/tellicoxmlexporter.h" |
222 |
+ #include "collection.h" |
223 |
+-#include "filehandler.h" |
224 |
++#include "core/filehandler.h" |
225 |
+ #include "borrower.h" |
226 |
+ #include "fieldformat.h" |
227 |
+-#include "tellico_strings.h" |
228 |
++#include "core/tellico_strings.h" |
229 |
+ #include "images/imagefactory.h" |
230 |
+ #include "images/imagedirectory.h" |
231 |
+ #include "images/image.h" |
232 |
+ #include "images/imageinfo.h" |
233 |
+ #include "utils/stringset.h" |
234 |
+ #include "progressmanager.h" |
235 |
+-#include "core/tellico_config.h" |
236 |
++#include "config/tellico_config.h" |
237 |
+ #include "entrycomparison.h" |
238 |
+ #include "utils/guiproxy.h" |
239 |
+ #include "tellico_debug.h" |
240 |
+diff --git a/src/entryiconview.cpp b/src/entryiconview.cpp |
241 |
+index 8ba044d1..d1a0eb60 100644 |
242 |
+--- a/src/entryiconview.cpp |
243 |
++++ b/src/entryiconview.cpp |
244 |
+@@ -49,7 +49,7 @@ namespace { |
245 |
+ |
246 |
+ using Tellico::EntryIconView; |
247 |
+ |
248 |
+-EntryIconView::EntryIconView(QAbstractItemModel* model_, QWidget* parent_) |
249 |
++EntryIconView::EntryIconView(QWidget* parent_) |
250 |
+ : QListView(parent_), m_maxAllowedIconWidth(MAX_ENTRY_ICON_SIZE) { |
251 |
+ setViewMode(QListView::IconMode); |
252 |
+ setMovement(QListView::Static); |
253 |
+@@ -60,12 +60,6 @@ EntryIconView::EntryIconView(QAbstractItemModel* model_, QWidget* parent_) |
254 |
+ setWordWrap(true); |
255 |
+ setSpacing(ENTRY_ICON_SIZE_PAD); |
256 |
+ |
257 |
+- Q_ASSERT(::qobject_cast<EntryModel*>(model_)); |
258 |
+- EntrySortModel* sortModel = new EntrySortModel(this); |
259 |
+- sortModel->setSortRole(EntryPtrRole); |
260 |
+- sortModel->setSourceModel(model_); |
261 |
+- setModel(sortModel); |
262 |
+- |
263 |
+ connect(this, SIGNAL(doubleClicked(const QModelIndex&)), SLOT(slotDoubleClicked(const QModelIndex&))); |
264 |
+ |
265 |
+ setWhatsThis(i18n("<qt>The <i>Icon View</i> shows each entry in the collection or group using " |
266 |
+diff --git a/src/entryiconview.h b/src/entryiconview.h |
267 |
+index 1dd41eb1..42c1a8e3 100644 |
268 |
+--- a/src/entryiconview.h |
269 |
++++ b/src/entryiconview.h |
270 |
+@@ -46,7 +46,7 @@ class EntryIconView : public QListView, public Observer { |
271 |
+ Q_OBJECT |
272 |
+ |
273 |
+ public: |
274 |
+- EntryIconView(QAbstractItemModel* model, QWidget* parent); |
275 |
++ EntryIconView(QWidget* parent); |
276 |
+ ~EntryIconView(); |
277 |
+ |
278 |
+ int maxAllowedIconWidth() const { return m_maxAllowedIconWidth; } |
279 |
+diff --git a/src/entryview.cpp b/src/entryview.cpp |
280 |
+index 32810113..8d5de40f 100644 |
281 |
+--- a/src/entryview.cpp |
282 |
++++ b/src/entryview.cpp |
283 |
+@@ -33,7 +33,7 @@ |
284 |
+ #include "tellico_kernel.h" |
285 |
+ #include "utils/tellico_utils.h" |
286 |
+ #include "core/filehandler.h" |
287 |
+-#include "core/tellico_config.h" |
288 |
++#include "config/tellico_config.h" |
289 |
+ #include "gui/drophandler.h" |
290 |
+ #include "document.h" |
291 |
+ #include "../utils/datafileregistry.h" |
292 |
+diff --git a/src/exportdialog.cpp b/src/exportdialog.cpp |
293 |
+index 59ba8596..66b67689 100644 |
294 |
+--- a/src/exportdialog.cpp |
295 |
++++ b/src/exportdialog.cpp |
296 |
+@@ -24,7 +24,7 @@ |
297 |
+ |
298 |
+ #include "exportdialog.h" |
299 |
+ #include "collection.h" |
300 |
+-#include "filehandler.h" |
301 |
++#include "core/filehandler.h" |
302 |
+ #include "controller.h" |
303 |
+ #include "document.h" |
304 |
+ #include "tellico_debug.h" |
305 |
+diff --git a/src/fetch/CMakeLists.txt b/src/fetch/CMakeLists.txt |
306 |
+index 63d496c4..331c6def 100644 |
307 |
+--- a/src/fetch/CMakeLists.txt |
308 |
++++ b/src/fetch/CMakeLists.txt |
309 |
+@@ -69,6 +69,7 @@ TARGET_LINK_LIBRARIES(fetch |
310 |
+ KF5::Archive |
311 |
+ KF5::IconThemes |
312 |
+ KF5::JobWidgets |
313 |
++ KF5::KIOWidgets |
314 |
+ ) |
315 |
+ |
316 |
+ IF(${KF5KIO_VERSION} VERSION_GREATER "5.18.0") |
317 |
+diff --git a/src/fetchdialog.cpp b/src/fetchdialog.cpp |
318 |
+index 91f2587f..006d9eae 100644 |
319 |
+--- a/src/fetchdialog.cpp |
320 |
++++ b/src/fetchdialog.cpp |
321 |
+@@ -28,12 +28,12 @@ |
322 |
+ #include "fetch/fetchmanager.h" |
323 |
+ #include "fetch/fetcher.h" |
324 |
+ #include "fetch/fetchresult.h" |
325 |
+-#include "core/tellico_config.h" |
326 |
++#include "config/tellico_config.h" |
327 |
+ #include "entryview.h" |
328 |
+ #include "utils/isbnvalidator.h" |
329 |
+ #include "utils/upcvalidator.h" |
330 |
+ #include "tellico_kernel.h" |
331 |
+-#include "filehandler.h" |
332 |
++#include "core/filehandler.h" |
333 |
+ #include "collection.h" |
334 |
+ #include "entry.h" |
335 |
+ #include "document.h" |
336 |
+diff --git a/src/fieldformat.cpp b/src/fieldformat.cpp |
337 |
+index e21ec7a8..b35f9781 100644 |
338 |
+--- a/src/fieldformat.cpp |
339 |
++++ b/src/fieldformat.cpp |
340 |
+@@ -23,7 +23,7 @@ |
341 |
+ ***************************************************************************/ |
342 |
+ |
343 |
+ #include "fieldformat.h" |
344 |
+-#include "core/tellico_config.h" |
345 |
++#include "config/tellico_config.h" |
346 |
+ |
347 |
+ using Tellico::FieldFormat; |
348 |
+ |
349 |
+diff --git a/src/images/CMakeLists.txt b/src/images/CMakeLists.txt |
350 |
+index cfc8bfe4..d058a23f 100644 |
351 |
+--- a/src/images/CMakeLists.txt |
352 |
++++ b/src/images/CMakeLists.txt |
353 |
+@@ -9,6 +9,7 @@ add_library(images STATIC ${images_STAT_SRCS}) |
354 |
+ |
355 |
+ TARGET_LINK_LIBRARIES(images |
356 |
+ core |
357 |
++ config |
358 |
+ utils |
359 |
+ KF5::KIOCore |
360 |
+ KF5::Archive |
361 |
+diff --git a/src/images/imagedirectory.cpp b/src/images/imagedirectory.cpp |
362 |
+index 4dc5be67..fc371c52 100644 |
363 |
+--- a/src/images/imagedirectory.cpp |
364 |
++++ b/src/images/imagedirectory.cpp |
365 |
+@@ -24,7 +24,7 @@ |
366 |
+ |
367 |
+ #include "imagedirectory.h" |
368 |
+ #include "image.h" |
369 |
+-#include "filehandler.h" |
370 |
++#include "../core/filehandler.h" |
371 |
+ #include "../tellico_debug.h" |
372 |
+ |
373 |
+ #include <KZip> |
374 |
+diff --git a/src/images/imagefactory.cpp b/src/images/imagefactory.cpp |
375 |
+index 499ad19e..7c7fd2b4 100644 |
376 |
+--- a/src/images/imagefactory.cpp |
377 |
++++ b/src/images/imagefactory.cpp |
378 |
+@@ -29,7 +29,7 @@ |
379 |
+ #include "imageinfo.h" |
380 |
+ #include "imagedirectory.h" |
381 |
+ #include "../core/filehandler.h" |
382 |
+-#include "../core/tellico_config.h" |
383 |
++#include "../config/tellico_config.h" |
384 |
+ #include "../utils/tellico_utils.h" |
385 |
+ #include "../tellico_debug.h" |
386 |
+ |
387 |
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp |
388 |
+index 8eefa772..00dda6fd 100644 |
389 |
+--- a/src/mainwindow.cpp |
390 |
++++ b/src/mainwindow.cpp |
391 |
+@@ -40,7 +40,7 @@ |
392 |
+ #include "controller.h" |
393 |
+ #include "importdialog.h" |
394 |
+ #include "exportdialog.h" |
395 |
+-#include "filehandler.h" // needed so static mainWindow variable can be set |
396 |
++#include "core/filehandler.h" // needed so static mainWindow variable can be set |
397 |
+ #include "translators/htmlexporter.h" // for printing |
398 |
+ #include "entryview.h" |
399 |
+ #include "entryiconview.h" |
400 |
+@@ -52,13 +52,13 @@ |
401 |
+ #include "fetchdialog.h" |
402 |
+ #include "reportdialog.h" |
403 |
+ #include "bibtexkeydialog.h" |
404 |
+-#include "tellico_strings.h" |
405 |
++#include "core/tellico_strings.h" |
406 |
+ #include "filterview.h" |
407 |
+ #include "loanview.h" |
408 |
+ #include "fetch/fetchmanager.h" |
409 |
+ #include "fetch/fetcherinitializer.h" |
410 |
+ #include "cite/actionmanager.h" |
411 |
+-#include "core/tellico_config.h" |
412 |
++#include "config/tellico_config.h" |
413 |
+ #include "core/netaccess.h" |
414 |
+ #include "dbusinterface.h" |
415 |
+ #include "models/models.h" |
416 |
+@@ -745,6 +745,7 @@ void MainWindow::initView() { |
417 |
+ m_detailedView, SLOT(slotRefreshImages())); |
418 |
+ |
419 |
+ m_iconView = m_viewStack->iconView(); |
420 |
++ // use the same model in both views so they are sync'ed |
421 |
+ m_iconView->setModel(m_detailedView->model()); |
422 |
+ Controller::self()->addObserver(m_iconView); |
423 |
+ m_detailedView->setWhatsThis(i18n("<qt>The <i>Column View</i> shows the value of multiple fields " |
424 |
+diff --git a/src/models/CMakeLists.txt b/src/models/CMakeLists.txt |
425 |
+index 58c695b5..8faa5554 100644 |
426 |
+--- a/src/models/CMakeLists.txt |
427 |
++++ b/src/models/CMakeLists.txt |
428 |
+@@ -7,18 +7,18 @@ SET(models_STAT_SRCS |
429 |
+ entrymodel.cpp |
430 |
+ entryselectionmodel.cpp |
431 |
+ entrysortmodel.cpp |
432 |
++ fieldcomparison.cpp |
433 |
+ filtermodel.cpp |
434 |
+ groupsortmodel.cpp |
435 |
+ modeliterator.cpp |
436 |
+ modelmanager.cpp |
437 |
+- modeltest.cpp |
438 |
+- ) |
439 |
++ stringcomparison.cpp |
440 |
++) |
441 |
+ |
442 |
+ add_library(tellicomodels STATIC ${models_STAT_SRCS}) |
443 |
+ |
444 |
+ target_link_libraries(tellicomodels |
445 |
+ core |
446 |
+- utils |
447 |
+ images |
448 |
+ Qt5::Core |
449 |
+ Qt5::Gui |
450 |
+diff --git a/src/models/entrymodel.cpp b/src/models/entrymodel.cpp |
451 |
+index 8db78f47..bb50836b 100644 |
452 |
+--- a/src/models/entrymodel.cpp |
453 |
++++ b/src/models/entrymodel.cpp |
454 |
+@@ -31,7 +31,7 @@ |
455 |
+ #include "../document.h" |
456 |
+ #include "../images/image.h" |
457 |
+ #include "../images/imagefactory.h" |
458 |
+-#include "../core/tellico_config.h" |
459 |
++#include "../config/tellico_config.h" |
460 |
+ #include "../tellico_debug.h" |
461 |
+ |
462 |
+ namespace { |
463 |
+diff --git a/src/models/entrysortmodel.cpp b/src/models/entrysortmodel.cpp |
464 |
+index 792ae81d..f11ffeb6 100644 |
465 |
+--- a/src/models/entrysortmodel.cpp |
466 |
++++ b/src/models/entrysortmodel.cpp |
467 |
+@@ -24,7 +24,7 @@ |
468 |
+ |
469 |
+ #include "entrysortmodel.h" |
470 |
+ #include "models.h" |
471 |
+-#include "../utils/fieldcomparison.h" |
472 |
++#include "fieldcomparison.h" |
473 |
+ #include "../field.h" |
474 |
+ #include "../entry.h" |
475 |
+ |
476 |
+diff --git a/src/utils/fieldcomparison.cpp b/src/models/fieldcomparison.cpp |
477 |
+similarity index 100% |
478 |
+rename from src/utils/fieldcomparison.cpp |
479 |
+rename to src/models/fieldcomparison.cpp |
480 |
+diff --git a/src/utils/fieldcomparison.h b/src/models/fieldcomparison.h |
481 |
+similarity index 100% |
482 |
+rename from src/utils/fieldcomparison.h |
483 |
+rename to src/models/fieldcomparison.h |
484 |
+diff --git a/src/models/groupsortmodel.cpp b/src/models/groupsortmodel.cpp |
485 |
+index 0326a755..483a0e2f 100644 |
486 |
+--- a/src/models/groupsortmodel.cpp |
487 |
++++ b/src/models/groupsortmodel.cpp |
488 |
+@@ -24,9 +24,9 @@ |
489 |
+ |
490 |
+ #include "groupsortmodel.h" |
491 |
+ #include "models.h" |
492 |
++#include "stringcomparison.h" |
493 |
+ #include "../field.h" |
494 |
+ #include "../entrygroup.h" |
495 |
+-#include "../utils/stringcomparison.h" |
496 |
+ #include "../document.h" |
497 |
+ #include "../tellico_debug.h" |
498 |
+ |
499 |
+diff --git a/src/utils/stringcomparison.cpp b/src/models/stringcomparison.cpp |
500 |
+similarity index 100% |
501 |
+rename from src/utils/stringcomparison.cpp |
502 |
+rename to src/models/stringcomparison.cpp |
503 |
+diff --git a/src/utils/stringcomparison.h b/src/models/stringcomparison.h |
504 |
+similarity index 100% |
505 |
+rename from src/utils/stringcomparison.h |
506 |
+rename to src/models/stringcomparison.h |
507 |
+diff --git a/src/newstuff/CMakeLists.txt b/src/newstuff/CMakeLists.txt |
508 |
+index 5a7f6963..db29b82b 100644 |
509 |
+--- a/src/newstuff/CMakeLists.txt |
510 |
++++ b/src/newstuff/CMakeLists.txt |
511 |
+@@ -14,6 +14,7 @@ TARGET_LINK_LIBRARIES(newstuff |
512 |
+ Qt5::Gui |
513 |
+ KF5::ConfigCore |
514 |
+ KF5::KIOCore |
515 |
++ KF5::Archive |
516 |
+ ) |
517 |
+ |
518 |
+ INSTALL(FILES tellico-template.knsrc tellico-script.knsrc DESTINATION ${KDE_INSTALL_CONFDIR}) |
519 |
+diff --git a/src/reportdialog.cpp b/src/reportdialog.cpp |
520 |
+index 77dc6ab9..198a461e 100644 |
521 |
+--- a/src/reportdialog.cpp |
522 |
++++ b/src/reportdialog.cpp |
523 |
+@@ -35,7 +35,7 @@ |
524 |
+ #include "utils/cursorsaver.h" |
525 |
+ #include "utils/datafileregistry.h" |
526 |
+ #include "utils/tellico_utils.h" |
527 |
+-#include "core/tellico_config.h" |
528 |
++#include "config/tellico_config.h" |
529 |
+ |
530 |
+ #include <KLocalizedString> |
531 |
+ #include <KHTMLPart> |
532 |
+diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt |
533 |
+index b3f8330a..0e1c0677 100644 |
534 |
+--- a/src/tests/CMakeLists.txt |
535 |
++++ b/src/tests/CMakeLists.txt |
536 |
+@@ -11,7 +11,7 @@ add_executable(entitytest entitytest.cpp) |
537 |
+ ecm_mark_nongui_executable(entitytest) |
538 |
+ add_test(entitytest entitytest) |
539 |
+ ecm_mark_as_test(entitytest) |
540 |
+-TARGET_LINK_LIBRARIES(entitytest utils Qt5::Test ) |
541 |
++TARGET_LINK_LIBRARIES(entitytest utils config Qt5::Test ) |
542 |
+ |
543 |
+ add_executable(cuecattest cuecattest.cpp) |
544 |
+ ecm_mark_nongui_executable(cuecattest) |
545 |
+@@ -35,25 +35,25 @@ add_executable(lcctest lcctest.cpp ../field.cpp ../fieldformat.cpp) |
546 |
+ ecm_mark_nongui_executable(lcctest) |
547 |
+ add_test(lcctest lcctest) |
548 |
+ ecm_mark_as_test(lcctest) |
549 |
+-TARGET_LINK_LIBRARIES(lcctest utils core Qt5::Test) |
550 |
++TARGET_LINK_LIBRARIES(lcctest tellicomodels Qt5::Test) |
551 |
+ |
552 |
+ add_executable(formattest formattest.cpp ../fieldformat.cpp) |
553 |
+ ecm_mark_nongui_executable(formattest) |
554 |
+ add_test(formattest formattest) |
555 |
+ ecm_mark_as_test(formattest) |
556 |
+-TARGET_LINK_LIBRARIES(formattest core Qt5::Test) |
557 |
++TARGET_LINK_LIBRARIES(formattest config Qt5::Test) |
558 |
+ |
559 |
+ add_executable(fieldtest fieldtest.cpp ../field.cpp ../fieldformat.cpp) |
560 |
+ ecm_mark_nongui_executable(fieldtest) |
561 |
+ add_test(fieldtest fieldtest) |
562 |
+ ecm_mark_as_test(fieldtest) |
563 |
+-TARGET_LINK_LIBRARIES(fieldtest core Qt5::Test) |
564 |
++TARGET_LINK_LIBRARIES(fieldtest config utils Qt5::Test) |
565 |
+ |
566 |
+ add_executable(comparisontest comparisontest.cpp ../field.cpp ../fieldformat.cpp) |
567 |
+ ecm_mark_nongui_executable(comparisontest) |
568 |
+ add_test(comparisontest comparisontest) |
569 |
+ ecm_mark_as_test(comparisontest) |
570 |
+-TARGET_LINK_LIBRARIES(comparisontest utils core Qt5::Test) |
571 |
++TARGET_LINK_LIBRARIES(comparisontest tellicomodels Qt5::Test) |
572 |
+ |
573 |
+ add_executable(imagetest imagetest.cpp ../utils/tellico_utils.cpp ../utils/guiproxy.cpp ../utils/cursorsaver.cpp) |
574 |
+ ecm_mark_nongui_executable(imagetest) |
575 |
+@@ -101,6 +101,7 @@ TARGET_LINK_LIBRARIES(translatorstest |
576 |
+ KF5::I18n |
577 |
+ KF5::Archive |
578 |
+ KF5::KIOWidgets |
579 |
++ KF5::ConfigWidgets |
580 |
+ ${LIBXML2_LIBRARIES} |
581 |
+ ${LIBXSLT_LIBRARIES} |
582 |
+ ${LIBXSLT_EXSLT_LIBRARIES} |
583 |
+@@ -111,6 +112,7 @@ set(TELLICO_TEST_LIBS |
584 |
+ collections |
585 |
+ utils |
586 |
+ images |
587 |
++ core |
588 |
+ tellicomodels |
589 |
+ Qt5::Test |
590 |
+ KF5::KIOCore |
591 |
+@@ -197,15 +199,16 @@ add_executable(bibtexmltest bibtexmltest.cpp |
592 |
+ ecm_mark_nongui_executable(bibtexmltest) |
593 |
+ add_test(bibtexmltest bibtexmltest) |
594 |
+ ecm_mark_as_test(bibtexmltest) |
595 |
+-TARGET_LINK_LIBRARIES(bibtexmltest translatorstest ${TELLICO_TEST_LIBS}) |
596 |
++TARGET_LINK_LIBRARIES(bibtexmltest translatorstest core ${TELLICO_TEST_LIBS}) |
597 |
+ |
598 |
+ add_executable(citetest citetest.cpp |
599 |
+ ../collections/bibtexcollection.cpp |
600 |
++ ../core/filehandler.cpp |
601 |
+ ) |
602 |
+ ecm_mark_nongui_executable(citetest) |
603 |
+ add_test(citetest citetest) |
604 |
+ ecm_mark_as_test(citetest) |
605 |
+-TARGET_LINK_LIBRARIES(citetest cite tellicotest Qt5::Test) |
606 |
++TARGET_LINK_LIBRARIES(citetest cite tellicotest config images Qt5::Test) |
607 |
+ ADD_DEPENDENCIES(citetest tellico_config) |
608 |
+ |
609 |
+ add_executable(ciwtest ciwtest.cpp |
610 |
+diff --git a/src/tests/citetest.cpp b/src/tests/citetest.cpp |
611 |
+index b51bf7a6..b34a7929 100644 |
612 |
+--- a/src/tests/citetest.cpp |
613 |
++++ b/src/tests/citetest.cpp |
614 |
+@@ -27,7 +27,7 @@ |
615 |
+ #include "citetest.h" |
616 |
+ #include "../cite/lyxpipe.h" |
617 |
+ #include "../cite/clipboard.h" |
618 |
+-#include "../core/tellico_config.h" |
619 |
++#include "../config/tellico_config.h" |
620 |
+ #include "../collections/bibtexcollection.h" |
621 |
+ |
622 |
+ #include <QTest> |
623 |
+diff --git a/src/tests/comparisontest.cpp b/src/tests/comparisontest.cpp |
624 |
+index 89a8d19b..f65ca197 100644 |
625 |
+--- a/src/tests/comparisontest.cpp |
626 |
++++ b/src/tests/comparisontest.cpp |
627 |
+@@ -25,8 +25,7 @@ |
628 |
+ #undef QT_NO_CAST_FROM_ASCII |
629 |
+ |
630 |
+ #include "comparisontest.h" |
631 |
+- |
632 |
+-#include "../utils/stringcomparison.h" |
633 |
++#include "../models/stringcomparison.h" |
634 |
+ |
635 |
+ #include <QTest> |
636 |
+ |
637 |
+diff --git a/src/tests/documenttest.cpp b/src/tests/documenttest.cpp |
638 |
+index 1f0ba8b6..9c1b18bc 100644 |
639 |
+--- a/src/tests/documenttest.cpp |
640 |
++++ b/src/tests/documenttest.cpp |
641 |
+@@ -28,7 +28,7 @@ |
642 |
+ #include "../document.h" |
643 |
+ #include "../images/imagefactory.h" |
644 |
+ #include "../images/image.h" |
645 |
+-#include "../core/tellico_config.h" |
646 |
++#include "../config/tellico_config.h" |
647 |
+ #include "../collections/bookcollection.h" |
648 |
+ #include "../collectionfactory.h" |
649 |
+ |
650 |
+diff --git a/src/tests/formattest.cpp b/src/tests/formattest.cpp |
651 |
+index a92b7380..962680cb 100644 |
652 |
+--- a/src/tests/formattest.cpp |
653 |
++++ b/src/tests/formattest.cpp |
654 |
+@@ -27,7 +27,7 @@ |
655 |
+ #include "formattest.h" |
656 |
+ |
657 |
+ #include "../fieldformat.h" |
658 |
+-#include "../core/tellico_config.h" |
659 |
++#include "../config/tellico_config.h" |
660 |
+ |
661 |
+ #include <QTest> |
662 |
+ |
663 |
+diff --git a/src/tests/htmlexportertest.cpp b/src/tests/htmlexportertest.cpp |
664 |
+index 42d8a9a8..c09e62d2 100644 |
665 |
+--- a/src/tests/htmlexportertest.cpp |
666 |
++++ b/src/tests/htmlexportertest.cpp |
667 |
+@@ -33,7 +33,7 @@ |
668 |
+ #include "../document.h" |
669 |
+ #include "../images/imagefactory.h" |
670 |
+ #include "../utils/datafileregistry.h" |
671 |
+-#include "../core/tellico_config.h" |
672 |
++#include "../config/tellico_config.h" |
673 |
+ |
674 |
+ #include <QTest> |
675 |
+ #include <QRegExp> |
676 |
+diff --git a/src/tests/lcctest.cpp b/src/tests/lcctest.cpp |
677 |
+index 08da8e06..a653bd25 100644 |
678 |
+--- a/src/tests/lcctest.cpp |
679 |
++++ b/src/tests/lcctest.cpp |
680 |
+@@ -25,8 +25,7 @@ |
681 |
+ #undef QT_NO_CAST_FROM_ASCII |
682 |
+ |
683 |
+ #include "lcctest.h" |
684 |
+- |
685 |
+-#include "../utils/stringcomparison.h" |
686 |
++#include "../models/stringcomparison.h" |
687 |
+ |
688 |
+ #include <QTest> |
689 |
+ |
690 |
+diff --git a/src/models/modeltest.cpp b/src/tests/modeltest.cpp |
691 |
+similarity index 99% |
692 |
+rename from src/models/modeltest.cpp |
693 |
+rename to src/tests/modeltest.cpp |
694 |
+index 12f41f33..80a39f57 100644 |
695 |
+--- a/src/models/modeltest.cpp |
696 |
++++ b/src/tests/modeltest.cpp |
697 |
+@@ -499,6 +499,7 @@ void ModelTest::layoutChanged() |
698 |
+ */ |
699 |
+ void ModelTest::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) |
700 |
+ { |
701 |
++// qDebug() << "ratbr" << parent << start << end; |
702 |
+ Changing c; |
703 |
+ c.parent = parent; |
704 |
+ c.oldSize = model->rowCount(parent); |
705 |
+@@ -514,6 +515,7 @@ void ModelTest::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int e |
706 |
+ */ |
707 |
+ void ModelTest::rowsRemoved(const QModelIndex & parent, int start, int end) |
708 |
+ { |
709 |
++// qDebug() << "rr" << parent << start << end; |
710 |
+ Changing c = remove.pop(); |
711 |
+ Q_ASSERT(c.parent == parent); |
712 |
+ Q_ASSERT(c.oldSize - (end - start + 1) == model->rowCount(parent)); |
713 |
+diff --git a/src/models/modeltest.h b/src/tests/modeltest.h |
714 |
+similarity index 100% |
715 |
+rename from src/models/modeltest.h |
716 |
+rename to src/tests/modeltest.h |
717 |
+diff --git a/src/translators/boardgamegeekimporter.cpp b/src/translators/boardgamegeekimporter.cpp |
718 |
+index 2bb35f0c..1ac70cbe 100644 |
719 |
+--- a/src/translators/boardgamegeekimporter.cpp |
720 |
++++ b/src/translators/boardgamegeekimporter.cpp |
721 |
+@@ -26,7 +26,7 @@ |
722 |
+ #include "../collections/boardgamecollection.h" |
723 |
+ #include "xslthandler.h" |
724 |
+ #include "tellicoimporter.h" |
725 |
+-#include "filehandler.h" |
726 |
++#include "../core/filehandler.h" |
727 |
+ #include "../utils/datafileregistry.h" |
728 |
+ #include "../tellico_debug.h" |
729 |
+ |
730 |
+diff --git a/src/translators/goodreadsimporter.cpp b/src/translators/goodreadsimporter.cpp |
731 |
+index eecb7e65..d03d05b0 100644 |
732 |
+--- a/src/translators/goodreadsimporter.cpp |
733 |
++++ b/src/translators/goodreadsimporter.cpp |
734 |
+@@ -25,7 +25,7 @@ |
735 |
+ #include "goodreadsimporter.h" |
736 |
+ #include "xslthandler.h" |
737 |
+ #include "tellicoimporter.h" |
738 |
+-#include "filehandler.h" |
739 |
++#include "../core/filehandler.h" |
740 |
+ #include "../utils/datafileregistry.h" |
741 |
+ #include "../tellico_debug.h" |
742 |
+ |
743 |
+diff --git a/src/translators/htmlexporter.cpp b/src/translators/htmlexporter.cpp |
744 |
+index acc712b0..79ef0039 100644 |
745 |
+--- a/src/translators/htmlexporter.cpp |
746 |
++++ b/src/translators/htmlexporter.cpp |
747 |
+@@ -29,7 +29,7 @@ |
748 |
+ #include "../document.h" |
749 |
+ #include "../core/filehandler.h" |
750 |
+ #include "../core/netaccess.h" |
751 |
+-#include "../core/tellico_config.h" |
752 |
++#include "../config/tellico_config.h" |
753 |
+ #include "../core/tellico_strings.h" |
754 |
+ #include "../images/image.h" |
755 |
+ #include "../images/imagefactory.h" |
756 |
+diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt |
757 |
+index a5851007..e5fa2b24 100644 |
758 |
+--- a/src/utils/CMakeLists.txt |
759 |
++++ b/src/utils/CMakeLists.txt |
760 |
+@@ -4,13 +4,11 @@ SET(utils_STAT_SRCS |
761 |
+ bibtexhandler.cpp |
762 |
+ cursorsaver.cpp |
763 |
+ datafileregistry.cpp |
764 |
+- fieldcomparison.cpp |
765 |
+ guiproxy.cpp |
766 |
+ iso5426converter.cpp |
767 |
+ iso6937converter.cpp |
768 |
+ isbnvalidator.cpp |
769 |
+ lccnvalidator.cpp |
770 |
+- stringcomparison.cpp |
771 |
+ string_utils.cpp |
772 |
+ tellico_utils.cpp |
773 |
+ upcvalidator.cpp |
774 |
+@@ -21,7 +19,6 @@ SET(utils_STAT_SRCS |
775 |
+ add_library(utils STATIC ${utils_STAT_SRCS}) |
776 |
+ |
777 |
+ TARGET_LINK_LIBRARIES(utils |
778 |
+- images # for FieldComparison |
779 |
+ Qt5::Core |
780 |
+ Qt5::Widgets |
781 |
+ Qt5::Xml |
782 |
+@@ -30,4 +27,5 @@ TARGET_LINK_LIBRARIES(utils |
783 |
+ KF5::I18n |
784 |
+ KF5::WidgetsAddons |
785 |
+ KF5::Codecs |
786 |
++ KF5::KIOCore |
787 |
+ ) |
788 |
+diff --git a/src/viewstack.cpp b/src/viewstack.cpp |
789 |
+index 0d25d274..3f292414 100644 |
790 |
+--- a/src/viewstack.cpp |
791 |
++++ b/src/viewstack.cpp |
792 |
+@@ -25,8 +25,7 @@ |
793 |
+ #include "viewstack.h" |
794 |
+ #include "detailedlistview.h" |
795 |
+ #include "entryiconview.h" |
796 |
+-#include "models/entrymodel.h" |
797 |
+-#include "core/tellico_config.h" |
798 |
++#include "config/tellico_config.h" |
799 |
+ |
800 |
+ #include <KLocalizedString> |
801 |
+ |
802 |
+@@ -42,7 +41,7 @@ using Tellico::ViewStack; |
803 |
+ |
804 |
+ ViewStack::ViewStack(QWidget* parent_) : QWidget(parent_) |
805 |
+ , m_listView(new DetailedListView(this)) |
806 |
+- , m_iconView(new EntryIconView(m_listView->sourceModel(), this)) { |
807 |
++ , m_iconView(new EntryIconView(this)) { |
808 |
+ QBoxLayout* lay = new QVBoxLayout(); |
809 |
+ lay->setMargin(0); |
810 |
+ lay->setSpacing(0); |
811 |
|
812 |
diff --git a/kde-misc/tellico/tellico-3.0.2-r1.ebuild b/kde-misc/tellico/tellico-3.0.2-r1.ebuild |
813 |
new file mode 100644 |
814 |
index 00000000000..e40e2597d7b |
815 |
--- /dev/null |
816 |
+++ b/kde-misc/tellico/tellico-3.0.2-r1.ebuild |
817 |
@@ -0,0 +1,91 @@ |
818 |
+# Copyright 1999-2017 Gentoo Foundation |
819 |
+# Distributed under the terms of the GNU General Public License v2 |
820 |
+ |
821 |
+EAPI=6 |
822 |
+ |
823 |
+KDE_HANDBOOK="forceoptional" |
824 |
+KDE_TEST="forceoptional" |
825 |
+VIRTUALX_REQUIRED="test" |
826 |
+inherit kde5 |
827 |
+ |
828 |
+DESCRIPTION="A collection manager based on KDE Frameworks" |
829 |
+HOMEPAGE="http://tellico-project.org/" |
830 |
+SRC_URI="http://tellico-project.org/files/${P}.tar.xz" |
831 |
+ |
832 |
+LICENSE="|| ( GPL-2 GPL-3 )" |
833 |
+KEYWORDS="~amd64 ~x86" |
834 |
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz" |
835 |
+ |
836 |
+COMMON_DEPEND=" |
837 |
+ $(add_frameworks_dep karchive) |
838 |
+ $(add_frameworks_dep kcodecs) |
839 |
+ $(add_frameworks_dep kcompletion) |
840 |
+ $(add_frameworks_dep kconfig) |
841 |
+ $(add_frameworks_dep kconfigwidgets) |
842 |
+ $(add_frameworks_dep kcoreaddons) |
843 |
+ $(add_frameworks_dep kcrash) |
844 |
+ $(add_frameworks_dep kguiaddons) |
845 |
+ $(add_frameworks_dep khtml) |
846 |
+ $(add_frameworks_dep kiconthemes) |
847 |
+ $(add_frameworks_dep kitemmodels) |
848 |
+ $(add_frameworks_dep ki18n) |
849 |
+ $(add_frameworks_dep kjobwidgets) |
850 |
+ $(add_frameworks_dep kio) |
851 |
+ $(add_frameworks_dep knewstuff) |
852 |
+ $(add_frameworks_dep kparts) |
853 |
+ $(add_frameworks_dep kservice) |
854 |
+ $(add_frameworks_dep ktextwidgets) |
855 |
+ $(add_frameworks_dep kwallet) |
856 |
+ $(add_frameworks_dep kwidgetsaddons) |
857 |
+ $(add_frameworks_dep kwindowsystem) |
858 |
+ $(add_frameworks_dep kxmlgui) |
859 |
+ $(add_frameworks_dep solid) |
860 |
+ $(add_frameworks_dep sonnet) |
861 |
+ $(add_qt_dep qtdbus) |
862 |
+ $(add_qt_dep qtgui) |
863 |
+ $(add_qt_dep qtnetwork) |
864 |
+ $(add_qt_dep qtwidgets) |
865 |
+ $(add_qt_dep qtxml) |
866 |
+ >=dev-perl/Text-BibTeX-0.780.0-r1 |
867 |
+ dev-libs/libxml2 |
868 |
+ dev-libs/libxslt |
869 |
+ cddb? ( $(add_kdeapps_dep libkcddb) ) |
870 |
+ discid? ( media-libs/libdiscid ) |
871 |
+ pdf? ( app-text/poppler[qt5] ) |
872 |
+ scanner? ( $(add_kdeapps_dep libksane) ) |
873 |
+ semantic-desktop? ( $(add_frameworks_dep kfilemetadata) ) |
874 |
+ taglib? ( >=media-libs/taglib-1.5 ) |
875 |
+ v4l? ( >=media-libs/libv4l-0.8.3 ) |
876 |
+ xmp? ( >=media-libs/exempi-2 ) |
877 |
+ yaz? ( >=dev-libs/yaz-2:0 ) |
878 |
+" |
879 |
+DEPEND="${COMMON_DEPEND} |
880 |
+ sys-devel/gettext |
881 |
+" |
882 |
+RDEPEND="${COMMON_DEPEND} |
883 |
+ !kde-misc/tellico:4 |
884 |
+" |
885 |
+ |
886 |
+# tests need network access |
887 |
+RESTRICT="test" |
888 |
+ |
889 |
+DOCS=( AUTHORS ChangeLog README ) |
890 |
+ |
891 |
+PATCHES=( "${FILESDIR}/${P}-cmake-3.9.patch" ) |
892 |
+ |
893 |
+src_configure() { |
894 |
+ local mycmakeargs=( |
895 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON |
896 |
+ $(cmake-utils_use_find_package cddb KF5Cddb) |
897 |
+ $(cmake-utils_use_find_package discid DiscID) |
898 |
+ $(cmake-utils_use_find_package pdf PopplerQt5) |
899 |
+ $(cmake-utils_use_find_package scanner KF5Sane) |
900 |
+ $(cmake-utils_use_find_package semantic-desktop KF5FileMetaData) |
901 |
+ $(cmake-utils_use_find_package taglib Taglib) |
902 |
+ -DENABLE_WEBCAM=$(usex v4l) |
903 |
+ $(cmake-utils_use_find_package xmp Exempi) |
904 |
+ $(cmake-utils_use_find_package yaz Yaz) |
905 |
+ ) |
906 |
+ |
907 |
+ kde5_src_configure |
908 |
+} |