1 |
commit: 4d996b040bbd0994062a6cc61703790344393a06 |
2 |
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 27 00:59:27 2018 +0000 |
4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 27 01:01:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d996b04 |
7 |
|
8 |
app-office/kmymoney: remove 4.8.0-r3 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
app-office/kmymoney/Manifest | 1 - |
13 |
.../files/kmymoney-4.8.0-alkimia-detect.patch | 29 --- |
14 |
.../kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch | 38 --- |
15 |
.../kmymoney-4.8.0-drop-national-onlinetasks.patch | 289 --------------------- |
16 |
.../files/kmymoney-4.8.0-fix-csvdialog.patch | 22 -- |
17 |
.../kmymoney/files/kmymoney-4.8.0-gpgmepp.patch | 77 ------ |
18 |
.../files/kmymoney-4.8.0-kdepimlibs-optional.patch | 172 ------------ |
19 |
.../kmymoney/files/kmymoney-4.8.0-soversion.patch | 28 -- |
20 |
.../kmymoney/files/kmymoney-4.8.0-tests.patch | 210 --------------- |
21 |
app-office/kmymoney/kmymoney-4.8.0-r3.ebuild | 89 ------- |
22 |
10 files changed, 955 deletions(-) |
23 |
|
24 |
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest |
25 |
index 736e8aee315..88f26a7d042 100644 |
26 |
--- a/app-office/kmymoney/Manifest |
27 |
+++ b/app-office/kmymoney/Manifest |
28 |
@@ -1,2 +1 @@ |
29 |
-DIST kmymoney-4.8.0.tar.xz 20785888 BLAKE2B 23819f5ef4f1ec0951f8b598041b7516efae94ccc6677404b133039023e6141e078226938d2c6d6fa6332803d4ee23d1c855e4db1945ada3d02d8302103876d0 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381 |
30 |
DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783 |
31 |
|
32 |
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch b/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch |
33 |
deleted file mode 100644 |
34 |
index 628e7c87538..00000000000 |
35 |
--- a/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch |
36 |
+++ /dev/null |
37 |
@@ -1,29 +0,0 @@ |
38 |
-Some 8 cmake patches were necessary to get libalkimia detection right. |
39 |
-This just copies the current state of 4.8 branch. |
40 |
- |
41 |
---- a/CMakeLists.txt 2016-10-26 12:17:23.390317411 +0200 |
42 |
-+++ b/CMakeLists.txt 2016-10-26 12:17:53.750544101 +0200 |
43 |
-@@ -110,14 +110,21 @@ |
44 |
- add_custom_target(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen) |
45 |
- endif(DOXYGEN_FOUND) |
46 |
- |
47 |
--find_package(LibAlkimia 4.3.2 REQUIRED) |
48 |
-+find_package(LibAlkimia REQUIRED) |
49 |
- #TODO: remove when LibAlkimia minimum version will be raised |
50 |
- if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY) |
51 |
- # LibAlkimia 4.3.2 does not properly define LIBALKIMIA_LIBRARIES |
52 |
- find_package(GMP REQUIRED) |
53 |
- set(LIBALKIMIA_LIBRARIES ${GMP_LIBRARIES} ${LIBALKIMIA_LIBRARY} ) |
54 |
- endif() |
55 |
-- |
56 |
-+# make sure we have the matching version of LibAlkimia (not too new) |
57 |
-+if(${LibAlkimia_FOUND}) |
58 |
-+ if (DEFINED ${LibAlkimia_VERSION}) |
59 |
-+ if (NOT "${LibAlkimia_VERSION}" VERSION_LESS "6.0.0") |
60 |
-+ message(FATAL_ERROR "This version of KMyMoney requires LibAlkimia < 6.0.0 and does not work with the installed version of LibAlkimia") |
61 |
-+ endif() |
62 |
-+ endif() |
63 |
-+endif() |
64 |
- # check for PkgConfig |
65 |
- find_package(PkgConfig) |
66 |
- |
67 |
|
68 |
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch b/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch |
69 |
deleted file mode 100644 |
70 |
index 93e8809d824..00000000000 |
71 |
--- a/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch |
72 |
+++ /dev/null |
73 |
@@ -1,38 +0,0 @@ |
74 |
-From b0a68ca075928aa29ee1e0007bfb14d714f5a948 Mon Sep 17 00:00:00 2001 |
75 |
-From: Ralf Habacker <ralf.habacker@×××××××.de> |
76 |
-Date: Thu, 10 Aug 2017 13:45:04 +0200 |
77 |
-Subject: Fix 'Compile error on Fedora 26' |
78 |
- |
79 |
-CMake build system used some outdated variables which has been replaced |
80 |
-by cmake build in variables to fix the issue. |
81 |
- |
82 |
-FIXED-IN:4.8.1 |
83 |
-BUG:383351 |
84 |
---- |
85 |
- kmymoney/dialogs/settings/CMakeLists.txt | 9 ++++----- |
86 |
- 1 file changed, 4 insertions(+), 5 deletions(-) |
87 |
- |
88 |
-diff --git a/kmymoney/dialogs/settings/CMakeLists.txt b/kmymoney/dialogs/settings/CMakeLists.txt |
89 |
-index 5aacbea..b007dfb 100644 |
90 |
---- a/kmymoney/dialogs/settings/CMakeLists.txt |
91 |
-+++ b/kmymoney/dialogs/settings/CMakeLists.txt |
92 |
-@@ -1,12 +1,11 @@ |
93 |
- add_custom_command( |
94 |
-- OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp |
95 |
-- DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc |
96 |
-- COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc |
97 |
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp |
98 |
-+ DEPENDS ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc |
99 |
-+ COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc |
100 |
- ) |
101 |
- |
102 |
-- |
103 |
- set (libsettings_a_SOURCES |
104 |
-- ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h |
105 |
-+ ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp |
106 |
- ksettingscolors.cpp |
107 |
- ksettingsfonts.cpp |
108 |
- ksettingsforecast.cpp |
109 |
--- |
110 |
-cgit v0.11.2 |
111 |
- |
112 |
|
113 |
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch b/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch |
114 |
deleted file mode 100644 |
115 |
index abcffed0227..00000000000 |
116 |
--- a/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch |
117 |
+++ /dev/null |
118 |
@@ -1,289 +0,0 @@ |
119 |
-commit 5979b1e92d67124591d10b18b173852882f077e7 |
120 |
-Author: Christian Dávid <christian-david@×××.de> |
121 |
-Date: Mon Jun 13 00:05:27 2016 +0200 |
122 |
- |
123 |
- Removed national credit transfers |
124 |
- |
125 |
- They are not supported by the banks anymore. So they can be removed. |
126 |
- |
127 |
- Unfortunately they contained the only example for a task converter. |
128 |
- Due to the removed plugin the CMakeLists.txt for sepa could be |
129 |
- simplified. |
130 |
- |
131 |
- Cherry-picked from d514e650 |
132 |
- |
133 |
-diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp b/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp |
134 |
-index 6c2b5d8a..8b67bcbb 100644 |
135 |
---- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp |
136 |
-+++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp |
137 |
-@@ -24,9 +24,9 @@ |
138 |
- #include <aqbanking/value.h> |
139 |
- |
140 |
- #include "payeeidentifier/payeeidentifiertyped.h" |
141 |
-+#include "payeeidentifier/nationalaccount/nationalaccount.h" |
142 |
- #include "tasksettings/credittransfersettingsbase.h" |
143 |
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h" |
144 |
--#include "onlinetasks/national/tasks/germanonlinetransfer.h" |
145 |
- #include "gwenhywfarqtoperators.h" |
146 |
- |
147 |
- /** |
148 |
-@@ -49,40 +49,6 @@ static const QString dtausChars = QString::fromUtf8("0123456789ABCDEFGHIJKLMNOPQ |
149 |
- */ |
150 |
- static const QString sepaChars = QString("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz':?.,- (+)/"); |
151 |
- |
152 |
--QSharedPointer<germanOnlineTransfer::settings> AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits) |
153 |
--{ |
154 |
-- Q_CHECK_PTR(aqlimits); |
155 |
-- |
156 |
-- QSharedPointer<creditTransferSettingsBase> settings(new creditTransferSettingsBase); |
157 |
-- |
158 |
-- // AqBanking returns 0 as min length even if it requires one |
159 |
-- int minLength = AB_TransactionLimits_GetMinLenPurpose(aqlimits); |
160 |
-- if (minLength == 0) |
161 |
-- minLength = 1; |
162 |
-- settings->setPurposeLimits(AB_TransactionLimits_GetMaxLinesPurpose(aqlimits), |
163 |
-- AB_TransactionLimits_GetMaxLenPurpose(aqlimits), |
164 |
-- minLength |
165 |
-- ); |
166 |
-- |
167 |
-- // AqBanking returns 0 as min length even if it requires one |
168 |
-- minLength = AB_TransactionLimits_GetMinLenRemoteName(aqlimits); |
169 |
-- if (minLength == 0) |
170 |
-- minLength = 1; |
171 |
-- settings->setRecipientNameLimits(AB_TransactionLimits_GetMaxLinesRemoteName(aqlimits), |
172 |
-- AB_TransactionLimits_GetMaxLenRemoteName(aqlimits), |
173 |
-- minLength |
174 |
-- ); |
175 |
-- |
176 |
-- minLength = AB_TransactionLimits_GetMinLenLocalName(aqlimits); |
177 |
-- if (minLength == 0) |
178 |
-- minLength = 1; |
179 |
-- settings->setPayeeNameLimits(1, AB_TransactionLimits_GetMaxLenLocalName(aqlimits), minLength); |
180 |
-- |
181 |
-- settings->setAllowedChars(dtausChars); |
182 |
-- |
183 |
-- return settings.dynamicCast<germanOnlineTransfer::settings>(); |
184 |
--} |
185 |
-- |
186 |
- /** @todo Check if AB_TransactionLimits_GetMaxLenCustomerReference really is the limit for the sepa reference */ |
187 |
- QSharedPointer<sepaOnlineTransfer::settings> AB_TransactionLimits_toSepaOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits) |
188 |
- { |
189 |
-diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h |
190 |
-index a314cd72..5205a884 100644 |
191 |
---- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h |
192 |
-+++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h |
193 |
-@@ -29,7 +29,6 @@ |
194 |
- |
195 |
- #include "onlinetasks/interfaces/tasks/ionlinetasksettings.h" |
196 |
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h" |
197 |
--#include "onlinetasks/national/tasks/germanonlinetransfer.h" |
198 |
- |
199 |
- class AB_ACCOUNT; |
200 |
- class AB_TRANSACTION_LIMITS; |
201 |
-@@ -43,12 +42,6 @@ class nationalAccount; |
202 |
- } |
203 |
- |
204 |
- /** |
205 |
-- * @brief AB_TransactionLimits_toGermanOnlineTaskSettings |
206 |
-- * @param aqlimits IN |
207 |
-- */ |
208 |
--QSharedPointer<germanOnlineTransfer::settings> AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits); |
209 |
-- |
210 |
--/** |
211 |
- * @brief AB_TransactionLimits_toSepaOnlineTaskSettings |
212 |
- * @param aqlimits IN |
213 |
- */ |
214 |
-diff --git a/kmymoney/plugins/kbanking/mymoneybanking.cpp b/kmymoney/plugins/kbanking/mymoneybanking.cpp |
215 |
-index d8c4a571..a64eaf61 100644 |
216 |
---- a/kmymoney/plugins/kbanking/mymoneybanking.cpp |
217 |
-+++ b/kmymoney/plugins/kbanking/mymoneybanking.cpp |
218 |
-@@ -598,11 +598,7 @@ void KBankingPlugin::sendOnlineJob(QList<onlineJob>& jobs) |
219 |
- |
220 |
- if (!jobs.isEmpty()) { |
221 |
- foreach (onlineJob job, jobs) { |
222 |
-- if (germanOnlineTransfer::name() == job.task()->taskName()) { |
223 |
-- onlineJobTyped<germanOnlineTransfer> typedJob(job); |
224 |
-- enqueTransaction(typedJob); |
225 |
-- job = typedJob; |
226 |
-- } else if (sepaOnlineTransfer::name() == job.task()->taskName()) { |
227 |
-+ if (sepaOnlineTransfer::name() == job.task()->taskName()) { |
228 |
- onlineJobTyped<sepaOnlineTransfer> typedJob(job); |
229 |
- enqueTransaction(typedJob); |
230 |
- job = typedJob; |
231 |
-@@ -646,14 +642,8 @@ QStringList KBankingPlugin::availableJobs(QString accountId) |
232 |
- |
233 |
- // Check availableJobs |
234 |
- |
235 |
-- // national transfer |
236 |
-- AB_JOB *abJob = AB_JobSingleTransfer_new(abAccount); |
237 |
-- if (AB_Job_CheckAvailability(abJob) == 0) |
238 |
-- list.append(germanOnlineTransfer::name()); |
239 |
-- AB_Job_free(abJob); |
240 |
-- |
241 |
- // sepa transfer |
242 |
-- abJob = AB_JobSepaTransfer_new(abAccount); |
243 |
-+ AB_JOB* abJob = AB_JobSepaTransfer_new(abAccount); |
244 |
- if (AB_Job_CheckAvailability(abJob) == 0) |
245 |
- list.append(sepaOnlineTransfer::name()); |
246 |
- AB_Job_free(abJob); |
247 |
-@@ -686,17 +676,7 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas |
248 |
- if (abAcc == 0) |
249 |
- return IonlineTaskSettings::ptr(); |
250 |
- |
251 |
-- if (germanOnlineTransfer::name() == taskName) { |
252 |
-- // Get Limits for germanOnlineTransfer |
253 |
-- QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSingleTransfer_new(abAcc)); |
254 |
-- if (AB_Job_CheckAvailability(abJob.data()) != 0) |
255 |
-- return IonlineTaskSettings::ptr(); |
256 |
-- |
257 |
-- const AB_TRANSACTION_LIMITS* limits = AB_Job_GetFieldLimits(abJob.data()); |
258 |
-- return AB_TransactionLimits_toGermanOnlineTaskSettings(limits).dynamicCast<IonlineTaskSettings>(); |
259 |
-- //! @todo needs free? because that is not possible with const AB_TRANSACTION_LIMITS* |
260 |
-- // AB_TransactionLimits_free( limits ); |
261 |
-- } else if (sepaOnlineTransfer::name() == taskName) { |
262 |
-+ if (sepaOnlineTransfer::name() == taskName) { |
263 |
- // Get limits for sepaonlinetransfer |
264 |
- QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSepaTransfer_new(abAcc)); |
265 |
- if (AB_Job_CheckAvailability(abJob.data()) != 0) |
266 |
-@@ -707,62 +687,6 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas |
267 |
- return IonlineTaskSettings::ptr(); |
268 |
- } |
269 |
- |
270 |
--bool KBankingPlugin::enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job) |
271 |
--{ |
272 |
-- /* get AqBanking account */ |
273 |
-- QString accId = job.constTask()->responsibleAccount(); |
274 |
-- AB_ACCOUNT *abAccount = aqbAccount(accId); |
275 |
-- if (!abAccount) { |
276 |
-- job.addJobMessage(onlineJobMessage(onlineJobMessage::warning, "KBanking", i18n("<qt>" |
277 |
-- "The given application account <b>%1</b> " |
278 |
-- "has not been mapped to an online " |
279 |
-- "account." |
280 |
-- "</qt>", |
281 |
-- MyMoneyFile::instance()->account(accId).name()))); |
282 |
-- return false; |
283 |
-- } |
284 |
-- //setupAccountReference(acc, ba); // needed? |
285 |
-- |
286 |
-- AB_JOB *abJob = AB_JobSingleTransfer_new(abAccount); |
287 |
-- int rv = AB_Job_CheckAvailability(abJob); |
288 |
-- if (rv) { |
289 |
-- qDebug("AB_ERROR_OFFSET is %i", AB_ERROR_OFFSET); |
290 |
-- job.addJobMessage(onlineJobMessage::error, "AqBanking", |
291 |
-- QString("National credit transfers for account \"%1\" are not available, error code %2.").arg(MyMoneyFile::instance()->account(accId).name(), rv), |
292 |
-- QString::number(rv) |
293 |
-- ); |
294 |
-- return false; |
295 |
-- } |
296 |
-- AB_TRANSACTION *abTransaction = AB_Transaction_new(); |
297 |
-- |
298 |
-- // Recipient |
299 |
-- payeeIdentifiers::nationalAccount beneficiaryAcc = job.task()->beneficiaryTyped(); |
300 |
-- AB_Transaction_SetRemoteAccount(abTransaction, beneficiaryAcc); |
301 |
-- |
302 |
-- // Origin Account |
303 |
-- AB_Transaction_SetLocalAccount(abTransaction, abAccount); |
304 |
-- |
305 |
-- // Purpose |
306 |
-- QStringList qPurpose = job.task()->purpose().split('\n', QString::SkipEmptyParts); |
307 |
-- GWEN_STRINGLIST *purpose = GWEN_StringList_fromQStringList(qPurpose); |
308 |
-- AB_Transaction_SetPurpose(abTransaction, purpose); |
309 |
-- GWEN_StringList_free(purpose); |
310 |
-- |
311 |
-- // Other |
312 |
-- AB_Transaction_SetTextKey(abTransaction, job.task()->textKey()); |
313 |
-- AB_Transaction_SetValue(abTransaction, AB_Value_fromMyMoneyMoney(job.task()->value())); |
314 |
-- |
315 |
-- /** @todo LOW remove Debug info */ |
316 |
-- qDebug() << "SetTransaction: " << AB_Job_SetTransaction(abJob, abTransaction); |
317 |
-- |
318 |
-- GWEN_DB_NODE *gwenNode = AB_Job_GetAppData(abJob); |
319 |
-- GWEN_DB_SetCharValue(gwenNode, GWEN_DB_FLAGS_DEFAULT, "kmmOnlineJobId", m_kbanking->mappingId(job).toLatin1().constData()); |
320 |
-- |
321 |
-- qDebug() << "Enqueue: " << m_kbanking->enqueueJob(abJob); |
322 |
-- //delete localAcc; |
323 |
-- return true; |
324 |
--} |
325 |
-- |
326 |
- bool KBankingPlugin::enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job) |
327 |
- { |
328 |
- /* get AqBanking account */ |
329 |
-diff --git a/kmymoney/plugins/kbanking/mymoneybanking.h b/kmymoney/plugins/kbanking/mymoneybanking.h |
330 |
-index c2559ae7..7936704e 100644 |
331 |
---- a/kmymoney/plugins/kbanking/mymoneybanking.h |
332 |
-+++ b/kmymoney/plugins/kbanking/mymoneybanking.h |
333 |
-@@ -64,7 +64,6 @@ class KBAccountSettings; |
334 |
- |
335 |
- #include "mymoney/onlinejobtyped.h" |
336 |
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h" |
337 |
--#include "onlinetasks/national/tasks/germanonlinetransfer.h" |
338 |
- |
339 |
- /** |
340 |
- * This class represents the KBanking plugin towards KMymoney. |
341 |
-@@ -184,7 +183,6 @@ private: |
342 |
- */ |
343 |
- void startPasswordTimer(); |
344 |
- |
345 |
-- bool enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job); |
346 |
- bool enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job); |
347 |
- |
348 |
- |
349 |
-diff --git a/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h b/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h |
350 |
-index 28d55a06..3bac6ce8 100644 |
351 |
---- a/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h |
352 |
-+++ b/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h |
353 |
-@@ -20,14 +20,13 @@ |
354 |
- #define CREDITTRANSFERSETTINGSBASE_H |
355 |
- |
356 |
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h" |
357 |
--#include "onlinetasks/national/tasks/germanonlinetransfer.h" |
358 |
- |
359 |
- /** |
360 |
- * @brief Base class for sepaCreditTransfer and germanCreditTransfer settings |
361 |
- * |
362 |
- * @internal Both credit transfers have similar fields |
363 |
- */ |
364 |
--class creditTransferSettingsBase : public sepaOnlineTransfer::settings, public germanOnlineTransfer::settings |
365 |
-+class creditTransferSettingsBase : public sepaOnlineTransfer::settings |
366 |
- { |
367 |
- public: |
368 |
- creditTransferSettingsBase() |
369 |
-diff --git a/kmymoney/plugins/onlinetasks/CMakeLists.txt b/kmymoney/plugins/onlinetasks/CMakeLists.txt |
370 |
-index 7be53137..2e57b214 100644 |
371 |
---- a/kmymoney/plugins/onlinetasks/CMakeLists.txt |
372 |
-+++ b/kmymoney/plugins/onlinetasks/CMakeLists.txt |
373 |
-@@ -1,5 +1,4 @@ |
374 |
- |
375 |
- add_subdirectory(interfaces) |
376 |
- add_subdirectory(sepa) |
377 |
--add_subdirectory(national) |
378 |
- add_subdirectory(unavailabletask) |
379 |
-diff --git a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt |
380 |
-index 3c2d9db1..e3962d7a 100644 |
381 |
---- a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt |
382 |
-+++ b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt |
383 |
-@@ -2,6 +2,7 @@ set( sepaOnlineTasks_SRCS |
384 |
- tasks/sepaonlinetransferimpl.cpp |
385 |
- ui/sepacredittransferedit.cpp |
386 |
- sepastorageplugin.cpp |
387 |
-+ sepaonlinetasksloader.cpp |
388 |
- ) |
389 |
- |
390 |
- set( sepaOnlineTasks_HEADER |
391 |
-@@ -12,14 +13,8 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS |
392 |
- ui/sepacredittransferedit.ui |
393 |
- ) |
394 |
- |
395 |
--automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS) |
396 |
--add_library( konlinetasks_sepa_OBJECTS OBJECT ${sepaOnlineTasks_SRCS} ) |
397 |
-- |
398 |
--# Add actual plugin here it is not part of the objects |
399 |
--# needed if multiple plugins are linked (needed for unit tests) |
400 |
--kde4_add_plugin(konlinetasks_sepa |
401 |
-- $<TARGET_OBJECTS:konlinetasks_sepa_OBJECTS> |
402 |
-- sepaonlinetasksloader.cpp |
403 |
-+add_library(konlinetasks_sepa MODULE |
404 |
-+ ${sepaOnlineTasks_SRCS} |
405 |
- ) |
406 |
- |
407 |
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-sepaorders.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney-sepaorders.desktop) |
408 |
|
409 |
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch b/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch |
410 |
deleted file mode 100644 |
411 |
index 4f84a17f5b5..00000000000 |
412 |
--- a/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch |
413 |
+++ /dev/null |
414 |
@@ -1,22 +0,0 @@ |
415 |
-From: Łukasz Wojniłowicz <lukasz.wojnilowicz@×××××.com> |
416 |
-Date: Sat, 06 Aug 2016 11:14:18 +0000 |
417 |
-Subject: Remove Qt::WindowStaysOnTopHint from CSV dialog |
418 |
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=d129b22e2da6e7972008f2b5ef3eccc95d758201 |
419 |
---- |
420 |
-Remove Qt::WindowStaysOnTopHint from CSV dialog |
421 |
- |
422 |
-BUG: 363429 |
423 |
---- |
424 |
- |
425 |
- |
426 |
---- a/kmymoney/plugins/csvimport/csvdialog.cpp |
427 |
-+++ b/kmymoney/plugins/csvimport/csvdialog.cpp |
428 |
-@@ -224,7 +224,6 @@ |
429 |
- |
430 |
- m_investmentDlg->init(); |
431 |
- Qt::WindowFlags eFlags = windowFlags(); |
432 |
-- eFlags |= Qt::WindowStaysOnTopHint; |
433 |
- m_wiz->setWindowFlags(eFlags); |
434 |
- m_wiz->show(); |
435 |
- }// CSVDialog |
436 |
- |
437 |
|
438 |
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch b/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch |
439 |
deleted file mode 100644 |
440 |
index 7b76eb1358c..00000000000 |
441 |
--- a/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch |
442 |
+++ /dev/null |
443 |
@@ -1,77 +0,0 @@ |
444 |
-From cddb71b5bbe0c7d73877f0308ad0ac64d9f99c20 Mon Sep 17 00:00:00 2001 |
445 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
446 |
-Date: Thu, 10 Nov 2016 15:53:32 +0100 |
447 |
-Subject: [PATCH 1/2] Use GpgME++ if possible, QGpgme from kdepimlibs-4 as |
448 |
- fallback |
449 |
- |
450 |
-Remove bogus qgpgme include. |
451 |
- |
452 |
-REVIEW: 129371 |
453 |
---- |
454 |
- CMakeLists.txt | 9 ++++++++- |
455 |
- libkdchart/kdablibfakes/src/KDABLibFakes.h | 3 +++ |
456 |
- libkgpgfile/CMakeLists.txt | 2 +- |
457 |
- libkgpgfile/kgpgfile.cpp | 1 - |
458 |
- 4 files changed, 12 insertions(+), 3 deletions(-) |
459 |
- |
460 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
461 |
-index 2251518..5a01673 100644 |
462 |
---- a/CMakeLists.txt |
463 |
-+++ b/CMakeLists.txt |
464 |
-@@ -76,7 +76,14 @@ else (WIN32) |
465 |
- find_package(Boost "1.33.1" COMPONENTS graph) |
466 |
- endif (WIN32) |
467 |
- # needed by libkgpgfile |
468 |
--find_package(QGpgme REQUIRED) |
469 |
-+find_package(Gpgmepp 1.7.0) |
470 |
-+set(GPGMEPP_LIBS Gpgmepp) |
471 |
-+if (NOT Gpgmepp_FOUND) |
472 |
-+ find_package(QGpgme REQUIRED) |
473 |
-+ set(GPGMEPP_LIBS ${QGPGME_LIBRARIES}) |
474 |
-+else (NOT Gpgmepp_FOUND) |
475 |
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") |
476 |
-+endif (NOT Gpgmepp_FOUND) |
477 |
- find_package(KdepimLibs REQUIRED) |
478 |
- find_package(SharedMimeInfo REQUIRED) |
479 |
- |
480 |
-diff --git a/libkdchart/kdablibfakes/src/KDABLibFakes.h b/libkdchart/kdablibfakes/src/KDABLibFakes.h |
481 |
-index f47ec24..b998723 100644 |
482 |
---- a/libkdchart/kdablibfakes/src/KDABLibFakes.h |
483 |
-+++ b/libkdchart/kdablibfakes/src/KDABLibFakes.h |
484 |
-@@ -59,6 +59,9 @@ |
485 |
- #elif defined (Q_OS_DARWIN) || defined (Q_OS_CYGWIN) |
486 |
- #define ISNAN(x) std::isnan(x) |
487 |
- #define ISINF(x) std::isinf(x) |
488 |
-+#elif defined (__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L |
489 |
-+#define ISNAN(x) std::isnan(x) |
490 |
-+#define ISINF(x) std::isinf(x) |
491 |
- #else |
492 |
- #define ISNAN(x) isnan(x) |
493 |
- #define ISINF(x) isinf(x) |
494 |
-diff --git a/libkgpgfile/CMakeLists.txt b/libkgpgfile/CMakeLists.txt |
495 |
-index a41a6a4..a7c982e 100644 |
496 |
---- a/libkgpgfile/CMakeLists.txt |
497 |
-+++ b/libkgpgfile/CMakeLists.txt |
498 |
-@@ -7,6 +7,6 @@ set(kgpgfile_STAT_SRCS |
499 |
- ) |
500 |
- |
501 |
- kde4_add_library(kgpgfile STATIC ${kgpgfile_STAT_SRCS}) |
502 |
--target_link_libraries(kgpgfile ${QGPGME_LIBRARIES}) |
503 |
-+target_link_libraries(kgpgfile ${GPGMEPP_LIBS}) |
504 |
- |
505 |
- |
506 |
-diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp |
507 |
-index b1870be..a5d3d4e 100644 |
508 |
---- a/libkgpgfile/kgpgfile.cpp |
509 |
-+++ b/libkgpgfile/kgpgfile.cpp |
510 |
-@@ -47,7 +47,6 @@ |
511 |
- #include <gpgme++/keylistresult.h> |
512 |
- #include <gpgme++/key.h> |
513 |
- #include <gpgme++/data.h> |
514 |
--#include <qgpgme/dataprovider.h> |
515 |
- |
516 |
- class KGPGFile::Private |
517 |
- { |
518 |
--- |
519 |
-2.7.3 |
520 |
- |
521 |
|
522 |
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch b/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch |
523 |
deleted file mode 100644 |
524 |
index 30b416868cf..00000000000 |
525 |
--- a/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch |
526 |
+++ /dev/null |
527 |
@@ -1,172 +0,0 @@ |
528 |
-From c66ab47628ad0cf76cc63de0bdf1ed578e4138ed Mon Sep 17 00:00:00 2001 |
529 |
-From: Andreas Sturmlechner <andreas.sturmlechner@×××××.com> |
530 |
-Date: Thu, 10 Nov 2016 16:18:42 +0100 |
531 |
-Subject: [PATCH 2/2] Make kdepimlibs optional |
532 |
- |
533 |
-Based on b5de50ccaa1571c4feb0c17ea8016554e3b822d7 from master. |
534 |
- |
535 |
-REVIEW: 129371 |
536 |
---- |
537 |
- CMakeLists.txt | 5 ++++- |
538 |
- kmymoney/dialogs/settings/ksettingsschedules.cpp | 5 ++++- |
539 |
- kmymoney/kmymoney.cpp | 20 +++++++++++++++++++- |
540 |
- 3 files changed, 27 insertions(+), 3 deletions(-) |
541 |
- |
542 |
-diff --git a/CMakeLists.txt b/CMakeLists.txt |
543 |
-index 5a01673..6662521 100644 |
544 |
---- a/CMakeLists.txt |
545 |
-+++ b/CMakeLists.txt |
546 |
-@@ -84,7 +84,7 @@ if (NOT Gpgmepp_FOUND) |
547 |
- else (NOT Gpgmepp_FOUND) |
548 |
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") |
549 |
- endif (NOT Gpgmepp_FOUND) |
550 |
--find_package(KdepimLibs REQUIRED) |
551 |
-+find_package(KdepimLibs) |
552 |
- find_package(SharedMimeInfo REQUIRED) |
553 |
- |
554 |
- # set the configuration switch signaling that KDE PIM libraries were found |
555 |
-@@ -417,6 +417,7 @@ macro(nice_yesno _varname) |
556 |
- endif(${_varname}) |
557 |
- endmacro(nice_yesno _varname) |
558 |
- |
559 |
-+nice_yesno("KdepimLibs_FOUND") |
560 |
- nice_yesno("LIBOFX_FOUND") |
561 |
- nice_yesno("LIBOFX_HAVE_CLIENTUID") |
562 |
- nice_yesno("KBANKING_FOUND") |
563 |
-@@ -433,6 +434,8 @@ message(" |
564 |
- |
565 |
- Configure results (user options): |
566 |
- -------------------------------------------- |
567 |
-+KDE PIM holidays: ${nice_KdepimLibs_FOUND} |
568 |
-+ |
569 |
- OFX plugin: ${nice_LIBOFX_FOUND} |
570 |
- OFX clientuid support ${nice_LIBOFX_HAVE_CLIENTUID} |
571 |
- |
572 |
-diff --git a/kmymoney/dialogs/settings/ksettingsschedules.cpp b/kmymoney/dialogs/settings/ksettingsschedules.cpp |
573 |
-index da138a7..1f0d16f 100644 |
574 |
---- a/kmymoney/dialogs/settings/ksettingsschedules.cpp |
575 |
-+++ b/kmymoney/dialogs/settings/ksettingsschedules.cpp |
576 |
-@@ -24,8 +24,10 @@ |
577 |
- |
578 |
- #include <kdeversion.h> |
579 |
- #include <KStandardDirs> |
580 |
-+#ifdef HAVE_KDEPIMLIBS |
581 |
- #include <KHolidays/Holidays> |
582 |
- using namespace KHolidays; |
583 |
-+#endif |
584 |
- |
585 |
- // ---------------------------------------------------------------------------- |
586 |
- // Project Includes |
587 |
-@@ -50,6 +52,7 @@ KSettingsSchedules::KSettingsSchedules(QWidget* parent) : |
588 |
- void KSettingsSchedules::loadList() |
589 |
- { |
590 |
- QStringList regions; |
591 |
-+#ifdef HAVE_KDEPIMLIBS |
592 |
- QStringList regionCodes = HolidayRegion::regionCodes(); |
593 |
- |
594 |
- foreach (const QString ®ionCode, regionCodes) { |
595 |
-@@ -65,7 +68,7 @@ void KSettingsSchedules::loadList() |
596 |
- regions << region; |
597 |
- } |
598 |
- regions.sort(); |
599 |
-- |
600 |
-+#endif |
601 |
- m_regionMap[m_holidayRegion->itemText(0)] = ""; |
602 |
- m_holidayRegion->insertItems(1, regions); |
603 |
- } |
604 |
-diff --git a/kmymoney/kmymoney.cpp b/kmymoney/kmymoney.cpp |
605 |
-index a4251f0..0bd2d3b 100644 |
606 |
---- a/kmymoney/kmymoney.cpp |
607 |
-+++ b/kmymoney/kmymoney.cpp |
608 |
-@@ -89,7 +89,9 @@ |
609 |
- #include <kinputdialog.h> |
610 |
- #include <kxmlguifactory.h> |
611 |
- #include <krecentfilesaction.h> |
612 |
-+#ifdef HAVE_KDEPIMLIBS |
613 |
- #include <KHolidays/Holidays> |
614 |
-+#endif |
615 |
- |
616 |
- // ---------------------------------------------------------------------------- |
617 |
- // Project Includes |
618 |
-@@ -221,7 +223,9 @@ public: |
619 |
- m_additionalKeyLabel(0), |
620 |
- m_additionalKeyButton(0), |
621 |
- m_recentFiles(0), |
622 |
-+#ifdef HAVE_KDEPIMLIBS |
623 |
- m_holidayRegion(0), |
624 |
-+#endif |
625 |
- m_applicationIsReady(true) { |
626 |
- // since the days of the week are from 1 to 7, |
627 |
- // and a day of the week is used to index this bit array, |
628 |
-@@ -343,9 +347,10 @@ public: |
629 |
- KPushButton* m_additionalKeyButton; |
630 |
- |
631 |
- KRecentFilesAction* m_recentFiles; |
632 |
-- |
633 |
-+#ifdef HAVE_KDEPIMLIBS |
634 |
- // used by the calendar interface for schedules |
635 |
- KHolidays::HolidayRegion* m_holidayRegion; |
636 |
-+#endif |
637 |
- QBitArray m_processingDays; |
638 |
- QMap<QDate, bool> m_holidayMap; |
639 |
- QStringList m_consistencyCheckResult; |
640 |
-@@ -455,7 +460,9 @@ KMyMoneyApp::~KMyMoneyApp() |
641 |
- delete d->m_transactionEditor; |
642 |
- delete d->m_endingBalanceDlg; |
643 |
- delete d->m_moveToAccountSelector; |
644 |
-+#ifdef HAVE_KDEPIMLIBS |
645 |
- delete d->m_holidayRegion; |
646 |
-+#endif |
647 |
- delete d; |
648 |
- } |
649 |
- |
650 |
-@@ -7732,6 +7739,7 @@ void KMyMoneyApp::slotOnlineJobLog(const QStringList& onlineJobIds) |
651 |
- |
652 |
- void KMyMoneyApp::setHolidayRegion(const QString& holidayRegion) |
653 |
- { |
654 |
-+#ifdef HAVE_KDEPIMLIBS |
655 |
- //since the cost of updating the cache is now not negligible |
656 |
- //check whether the region has been modified |
657 |
- if (!d->m_holidayRegion || d->m_holidayRegion->regionCode() != holidayRegion) { |
658 |
-@@ -7743,10 +7751,14 @@ void KMyMoneyApp::setHolidayRegion(const QString& holidayRegion) |
659 |
- //clear and update the holiday cache |
660 |
- preloadHolidays(); |
661 |
- } |
662 |
-+#else |
663 |
-+ Q_UNUSED(holidayRegion); |
664 |
-+#endif |
665 |
- } |
666 |
- |
667 |
- bool KMyMoneyApp::isProcessingDate(const QDate& date) const |
668 |
- { |
669 |
-+#ifdef HAVE_KDEPIMLIBS |
670 |
- if (!d->m_processingDays.testBit(date.dayOfWeek())) |
671 |
- return false; |
672 |
- if (!d->m_holidayRegion || !d->m_holidayRegion->isValid()) |
673 |
-@@ -7760,10 +7772,15 @@ bool KMyMoneyApp::isProcessingDate(const QDate& date) const |
674 |
- d->m_holidayMap.insert(date, processingDay); |
675 |
- return processingDay; |
676 |
- } |
677 |
-+#else |
678 |
-+ Q_UNUSED(date); |
679 |
-+ return true; |
680 |
-+#endif |
681 |
- } |
682 |
- |
683 |
- void KMyMoneyApp::preloadHolidays() |
684 |
- { |
685 |
-+#ifdef HAVE_KDEPIMLIBS |
686 |
- //clear the cache before loading |
687 |
- d->m_holidayMap.clear(); |
688 |
- //only do this if it is a valid region |
689 |
-@@ -7792,6 +7809,7 @@ void KMyMoneyApp::preloadHolidays() |
690 |
- } |
691 |
- } |
692 |
- } |
693 |
-+#endif |
694 |
- } |
695 |
- |
696 |
- KMStatus::KMStatus(const QString &text) |
697 |
--- |
698 |
-2.7.3 |
699 |
- |
700 |
|
701 |
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch b/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch |
702 |
deleted file mode 100644 |
703 |
index f1154908cde..00000000000 |
704 |
--- a/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch |
705 |
+++ /dev/null |
706 |
@@ -1,28 +0,0 @@ |
707 |
-From: Thomas Baumgart <thb@××××××××××.de> |
708 |
-Date: Wed, 13 Jul 2016 05:48:46 +0000 |
709 |
-Subject: Added versioning to kmm_payeeidentifier library |
710 |
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=1b818335b4242ad5096489ab4f8e3e7c3fc62d55 |
711 |
---- |
712 |
-Added versioning to kmm_payeeidentifier library |
713 |
- |
714 |
-The missing version caused incorrect naming of the library. |
715 |
- |
716 |
-Modified version of patch provided by Christian Dávid in commit |
717 |
-4a0fed749df71bb2acfc15bd6c0bff4806927f01 |
718 |
-BUG: 364387 |
719 |
-FIXED-IN: 4.8.1 |
720 |
---- |
721 |
- |
722 |
- |
723 |
---- a/kmymoney/mymoney/payeeidentifier/CMakeLists.txt |
724 |
-+++ b/kmymoney/mymoney/payeeidentifier/CMakeLists.txt |
725 |
-@@ -11,6 +11,8 @@ |
726 |
- add_library( kmm_payeeidentifier SHARED |
727 |
- ${PAYEEIDENTIFIER_SCRS} |
728 |
- ) |
729 |
-+ |
730 |
-+set_target_properties(kmm_payeeidentifier PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION}) |
731 |
- |
732 |
- generate_export_header( kmm_payeeidentifier ) |
733 |
- |
734 |
- |
735 |
|
736 |
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch b/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch |
737 |
deleted file mode 100644 |
738 |
index 1b71180096a..00000000000 |
739 |
--- a/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch |
740 |
+++ /dev/null |
741 |
@@ -1,210 +0,0 @@ |
742 |
-From: Cristian Oneț <onet.cristian@×××××.com> |
743 |
-Date: Thu, 16 Jun 2016 07:06:32 +0000 |
744 |
-Subject: Fix the tests of the 4.8 build. |
745 |
-X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=29ab40829f86f6bd32229ededcc09bf2736e67bd |
746 |
---- |
747 |
-Fix the tests of the 4.8 build. |
748 |
- |
749 |
-Do this by backporting the change that is already in frameworks in commit 77085ff468336f26f6bcf5f2a1a08e16409172e6. Did not use cherry pick because the testfile was moved in frameworks. |
750 |
- |
751 |
-BUG: 364355 |
752 |
---- |
753 |
- |
754 |
- |
755 |
---- a/kmymoney/mymoney/storage/mymoneymap.h |
756 |
-+++ b/kmymoney/mymoney/storage/mymoneymap.h |
757 |
-@@ -195,7 +195,7 @@ |
758 |
- that = *(dynamic_cast<QMap<Key, T>* >(const_cast<MyMoneyMap<Key, T>* >(this))); |
759 |
- } |
760 |
- |
761 |
-- inline size_t count(void) const { |
762 |
-+ inline int count(void) const { |
763 |
- return QMap<Key, T>::count(); |
764 |
- } |
765 |
- |
766 |
- |
767 |
---- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp |
768 |
-+++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp |
769 |
-@@ -58,13 +58,13 @@ |
770 |
- QCOMPARE(m->m_nextPayeeID, 0ul); |
771 |
- QCOMPARE(m->m_nextScheduleID, 0ul); |
772 |
- QCOMPARE(m->m_nextReportID, 0ul); |
773 |
-- QCOMPARE(m->m_institutionList.count(), 0ul); |
774 |
-- QCOMPARE(m->m_accountList.count(), 5ul); |
775 |
-- QCOMPARE(m->m_transactionList.count(), 0ul); |
776 |
-- QCOMPARE(m->m_transactionKeys.count(), 0ul); |
777 |
-- QCOMPARE(m->m_payeeList.count(), 0ul); |
778 |
-- QCOMPARE(m->m_tagList.count(), 0ul); |
779 |
-- QCOMPARE(m->m_scheduleList.count(), 0ul); |
780 |
-+ QCOMPARE(m->m_institutionList.count(), 0); |
781 |
-+ QCOMPARE(m->m_accountList.count(), 5); |
782 |
-+ QCOMPARE(m->m_transactionList.count(), 0); |
783 |
-+ QCOMPARE(m->m_transactionKeys.count(), 0); |
784 |
-+ QCOMPARE(m->m_payeeList.count(), 0); |
785 |
-+ QCOMPARE(m->m_tagList.count(), 0); |
786 |
-+ QCOMPARE(m->m_scheduleList.count(), 0); |
787 |
- |
788 |
- QCOMPARE(m->m_dirty, false); |
789 |
- QCOMPARE(m->m_creationDate, QDate::currentDate()); |
790 |
-@@ -187,7 +187,7 @@ |
791 |
- |
792 |
- QCOMPARE(m->m_nextAccountID, 1ul); |
793 |
- QCOMPARE(m->dirty(), true); |
794 |
-- QCOMPARE(m->m_accountList.count(), static_cast<std::size_t>(6)); |
795 |
-+ QCOMPARE(m->m_accountList.count(), 6); |
796 |
- QCOMPARE(m->m_accountList["A000001"].name(), QLatin1String("AccountName")); |
797 |
- } |
798 |
- |
799 |
-@@ -235,7 +235,7 @@ |
800 |
- m->m_dirty = false; |
801 |
- |
802 |
- QCOMPARE(m->m_nextAccountID, 2ul); |
803 |
-- QCOMPARE(m->m_accountList.count(), static_cast<std::size_t>(7)); |
804 |
-+ QCOMPARE(m->m_accountList.count(), 7); |
805 |
- |
806 |
- // try to add account to undefined account |
807 |
- try { |
808 |
-@@ -271,7 +271,7 @@ |
809 |
- i.setName("Inst Name"); |
810 |
- |
811 |
- m->addInstitution(i); |
812 |
-- QCOMPARE(m->m_institutionList.count(), static_cast<std::size_t>(1)); |
813 |
-+ QCOMPARE(m->m_institutionList.count(), 1); |
814 |
- QCOMPARE(m->m_nextInstitutionID, 1ul); |
815 |
- QCOMPARE(m->m_institutionList["I000001"].name(), QLatin1String("Inst Name")); |
816 |
- } |
817 |
-@@ -950,11 +950,11 @@ |
818 |
- // check that we can remove an unreferenced payee |
819 |
- MyMoneyPayee p = m->payee("P000001"); |
820 |
- try { |
821 |
-- QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(1)); |
822 |
-+ QCOMPARE(m->m_payeeList.count(), 1); |
823 |
- m->removePayee(p); |
824 |
- m->commitTransaction(); |
825 |
- m->startTransaction(); |
826 |
-- QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(0)); |
827 |
-+ QCOMPARE(m->m_payeeList.count(), 0); |
828 |
- QCOMPARE(m->dirty(), true); |
829 |
- } catch (const MyMoneyException &) { |
830 |
- QFAIL("Unexpected exception"); |
831 |
-@@ -996,7 +996,7 @@ |
832 |
- QFAIL("Expected exception"); |
833 |
- } catch (const MyMoneyException &) { |
834 |
- } |
835 |
-- QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(1)); |
836 |
-+ QCOMPARE(m->m_payeeList.count(), 1); |
837 |
- } |
838 |
- |
839 |
- void MyMoneySeqAccessMgrTest::testAddTag() |
840 |
-@@ -1046,11 +1046,11 @@ |
841 |
- // check that we can remove an unreferenced tag |
842 |
- MyMoneyTag ta = m->tag("G000001"); |
843 |
- try { |
844 |
-- QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(1)); |
845 |
-+ QCOMPARE(m->m_tagList.count(), 1); |
846 |
- m->removeTag(ta); |
847 |
- m->commitTransaction(); |
848 |
- m->startTransaction(); |
849 |
-- QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(0)); |
850 |
-+ QCOMPARE(m->m_tagList.count(), 0); |
851 |
- QCOMPARE(m->dirty(), true); |
852 |
- } catch (const MyMoneyException &) { |
853 |
- QFAIL("Unexpected exception"); |
854 |
-@@ -1094,7 +1094,7 @@ |
855 |
- QFAIL("Expected exception"); |
856 |
- } catch (const MyMoneyException &) { |
857 |
- } |
858 |
-- QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(1)); |
859 |
-+ QCOMPARE(m->m_tagList.count(), 1); |
860 |
- } |
861 |
- |
862 |
- void MyMoneySeqAccessMgrTest::testRemoveAccountFromTree() |
863 |
-@@ -1267,7 +1267,7 @@ |
864 |
- |
865 |
- |
866 |
- try { |
867 |
-- QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(0)); |
868 |
-+ QCOMPARE(m->m_scheduleList.count(), 0); |
869 |
- MyMoneyTransaction t1; |
870 |
- MyMoneySplit s1, s2; |
871 |
- s1.setAccountId("A000001"); |
872 |
-@@ -1287,7 +1287,7 @@ |
873 |
- |
874 |
- m->addSchedule(schedule); |
875 |
- |
876 |
-- QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(1)); |
877 |
-+ QCOMPARE(m->m_scheduleList.count(), 1); |
878 |
- QCOMPARE(schedule.id(), QLatin1String("SCH000001")); |
879 |
- QCOMPARE(m->m_scheduleList["SCH000001"].id(), QLatin1String("SCH000001")); |
880 |
- } catch (const MyMoneyException &) { |
881 |
-@@ -1342,7 +1342,7 @@ |
882 |
- sched.setName("New Sched-Name"); |
883 |
- try { |
884 |
- m->modifySchedule(sched); |
885 |
-- QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(1)); |
886 |
-+ QCOMPARE(m->m_scheduleList.count(), 1); |
887 |
- QCOMPARE(m->m_scheduleList["SCH000001"].name(), QLatin1String("New Sched-Name")); |
888 |
- |
889 |
- } catch (const MyMoneyException &) { |
890 |
-@@ -1373,7 +1373,7 @@ |
891 |
- try { |
892 |
- m->removeSchedule(sched); |
893 |
- m->commitTransaction(); |
894 |
-- QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(0)); |
895 |
-+ QCOMPARE(m->m_scheduleList.count(), 0); |
896 |
- |
897 |
- } catch (const MyMoneyException &) { |
898 |
- m->rollbackTransaction(); |
899 |
-@@ -1548,13 +1548,13 @@ |
900 |
- void MyMoneySeqAccessMgrTest::testAddCurrency() |
901 |
- { |
902 |
- MyMoneySecurity curr("EUR", "Euro", "?", 100, 100); |
903 |
-- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(0)); |
904 |
-+ QCOMPARE(m->m_currencyList.count(), 0); |
905 |
- m->m_dirty = false; |
906 |
- try { |
907 |
- m->addCurrency(curr); |
908 |
- m->commitTransaction(); |
909 |
- m->startTransaction(); |
910 |
-- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(1)); |
911 |
-+ QCOMPARE(m->m_currencyList.count(), 1); |
912 |
- QCOMPARE(m->m_currencyList["EUR"].name(), QLatin1String("Euro")); |
913 |
- QCOMPARE(m->dirty(), true); |
914 |
- } catch (const MyMoneyException &) { |
915 |
-@@ -1582,7 +1582,7 @@ |
916 |
- m->modifyCurrency(curr); |
917 |
- m->commitTransaction(); |
918 |
- m->startTransaction(); |
919 |
-- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(1)); |
920 |
-+ QCOMPARE(m->m_currencyList.count(), 1); |
921 |
- QCOMPARE(m->m_currencyList["EUR"].name(), QLatin1String("EURO")); |
922 |
- QCOMPARE(m->dirty(), true); |
923 |
- } catch (const MyMoneyException &) { |
924 |
-@@ -1611,7 +1611,7 @@ |
925 |
- m->removeCurrency(curr); |
926 |
- m->commitTransaction(); |
927 |
- m->startTransaction(); |
928 |
-- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(0)); |
929 |
-+ QCOMPARE(m->m_currencyList.count(), 0); |
930 |
- QCOMPARE(m->dirty(), true); |
931 |
- } catch (const MyMoneyException &) { |
932 |
- QFAIL("Unexpected exception"); |
933 |
-@@ -1668,7 +1668,7 @@ |
934 |
- try { |
935 |
- m->addCurrency(unknownCurr); |
936 |
- m->m_dirty = false; |
937 |
-- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(2)); |
938 |
-+ QCOMPARE(m->m_currencyList.count(), 2); |
939 |
- QCOMPARE(m->currencyList().count(), 2); |
940 |
- QCOMPARE(m->dirty(), false); |
941 |
- } catch (const MyMoneyException &) { |
942 |
-@@ -1797,7 +1797,7 @@ |
943 |
- |
944 |
- QCOMPARE(m->m_nextOnlineJobID, 1ul); |
945 |
- QCOMPARE(m->dirty(), true); |
946 |
-- QCOMPARE(m->m_onlineJobList.count(), static_cast<std::size_t>(1)); |
947 |
-+ QCOMPARE(m->m_onlineJobList.count(), 1); |
948 |
- QVERIFY(! m->m_onlineJobList["O000001"].isNull()); |
949 |
- |
950 |
- } |
951 |
- |
952 |
|
953 |
diff --git a/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild b/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild |
954 |
deleted file mode 100644 |
955 |
index b61523303b5..00000000000 |
956 |
--- a/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild |
957 |
+++ /dev/null |
958 |
@@ -1,89 +0,0 @@ |
959 |
-# Copyright 1999-2017 Gentoo Foundation |
960 |
-# Distributed under the terms of the GNU General Public License v2 |
961 |
- |
962 |
-EAPI=6 |
963 |
- |
964 |
-KDE_HANDBOOK="optional" |
965 |
-SQL_REQUIRED="always" |
966 |
-VIRTUALX_REQUIRED="test" |
967 |
-VIRTUALDBUS_TEST="true" |
968 |
-inherit kde4-base |
969 |
- |
970 |
-DESCRIPTION="Personal finance manager by KDE" |
971 |
-HOMEPAGE="https://kmymoney.org/" |
972 |
-if [[ ${KDE_BUILD_TYPE} = release ]]; then |
973 |
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" |
974 |
-fi |
975 |
- |
976 |
-LICENSE="GPL-2" |
977 |
-SLOT="4" |
978 |
-KEYWORDS="amd64 x86" |
979 |
-IUSE="calendar debug doc hbci ofx quotes weboob" |
980 |
- |
981 |
-COMMON_DEPEND=" |
982 |
- >=app-crypt/gpgme-1.7.0[cxx] |
983 |
- <app-office/libalkimia-6.0.0 |
984 |
- dev-libs/gmp:0= |
985 |
- dev-libs/libgpg-error |
986 |
- x11-misc/shared-mime-info |
987 |
- calendar? ( dev-libs/libical:= ) |
988 |
- hbci? ( |
989 |
- >=net-libs/aqbanking-5.5.1 |
990 |
- >=sys-libs/gwenhywfar-4.15.3[qt4] |
991 |
- ) |
992 |
- ofx? ( >=dev-libs/libofx-0.9.4 ) |
993 |
- weboob? ( www-client/weboob ) |
994 |
-" |
995 |
-RDEPEND="${COMMON_DEPEND} |
996 |
- quotes? ( dev-perl/Finance-Quote ) |
997 |
-" |
998 |
-DEPEND="${COMMON_DEPEND} |
999 |
- dev-libs/boost |
1000 |
- virtual/pkgconfig |
1001 |
- doc? ( app-doc/doxygen ) |
1002 |
-" |
1003 |
- |
1004 |
-PATCHES=( |
1005 |
- "${FILESDIR}/${P}-tests.patch" |
1006 |
- "${FILESDIR}/${P}-alkimia-detect.patch" |
1007 |
- "${FILESDIR}/${P}-fix-csvdialog.patch" |
1008 |
- "${FILESDIR}/${P}-soversion.patch" |
1009 |
- "${FILESDIR}/${P}-gpgmepp.patch" |
1010 |
- "${FILESDIR}/${P}-kdepimlibs-optional.patch" |
1011 |
- "${FILESDIR}/${P}-drop-national-onlinetasks.patch" |
1012 |
- "${FILESDIR}/${P}-cmake-3.9.patch" |
1013 |
-) |
1014 |
- |
1015 |
-src_prepare() { |
1016 |
- kde4-base_src_prepare |
1017 |
- |
1018 |
- # don't install as executable |
1019 |
- sed -i kmymoney/CMakeLists.txt \ |
1020 |
- -e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die |
1021 |
- |
1022 |
- # bug #617636, complement to drop-national-onlinetasks.patch |
1023 |
- rm -r kmymoney/plugins/onlinetasks/national || die |
1024 |
-} |
1025 |
- |
1026 |
-src_configure() { |
1027 |
- local mycmakeargs=( |
1028 |
- -DUSE_QT_DESIGNER=OFF |
1029 |
- -DENABLE_LIBICAL=$(usex calendar) |
1030 |
- -DUSE_DEVELOPER_DOC=$(usex doc) |
1031 |
- -DENABLE_KBANKING=$(usex hbci) |
1032 |
- -DENABLE_LIBOFX=$(usex ofx) |
1033 |
- -DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON |
1034 |
- -DENABLE_WEBOOB=$(usex weboob) |
1035 |
- ) |
1036 |
- kde4-base_src_configure |
1037 |
-} |
1038 |
- |
1039 |
-src_compile() { |
1040 |
- kde4-base_src_compile |
1041 |
- use doc && kde4-base_src_compile apidoc |
1042 |
-} |
1043 |
- |
1044 |
-src_install() { |
1045 |
- use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/") |
1046 |
- kde4-base_src_install |
1047 |
-} |