snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

kmymoney: update to 4.8.1.1 

Closes: #10205 [via git-merge-pr]
This commit is contained in:
Helmut Pozimski 2017-12-26 10:37:20 +01:00 committed by Jürgen Buchmüller
parent 82f6aa735d
commit 6badca5c88
2 changed files with 3 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

196
srcpkgs/kmymoney/patches/backported-fix-for-bug-364355.patch
View File

@ -1,196 +0,0 @@
--- kmymoney/mymoney/storage/mymoneymap.h
+++ kmymoney/mymoney/storage/mymoneymap.h
@@ -195,7 +195,7 @@
that = *(dynamic_cast<QMap<Key, T>* >(const_cast<MyMoneyMap<Key, T>* >(this)));
}
- inline size_t count(void) const {
+ inline int count(void) const {
return QMap<Key, T>::count();
}
--- kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
+++ kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp
@@ -58,13 +58,13 @@
QCOMPARE(m->m_nextPayeeID, 0ul);
QCOMPARE(m->m_nextScheduleID, 0ul);
QCOMPARE(m->m_nextReportID, 0ul);
- QCOMPARE(m->m_institutionList.count(), 0ul);
- QCOMPARE(m->m_accountList.count(), 5ul);
- QCOMPARE(m->m_transactionList.count(), 0ul);
- QCOMPARE(m->m_transactionKeys.count(), 0ul);
- QCOMPARE(m->m_payeeList.count(), 0ul);
- QCOMPARE(m->m_tagList.count(), 0ul);
- QCOMPARE(m->m_scheduleList.count(), 0ul);
+ QCOMPARE(m->m_institutionList.count(), 0);
+ QCOMPARE(m->m_accountList.count(), 5);
+ QCOMPARE(m->m_transactionList.count(), 0);
+ QCOMPARE(m->m_transactionKeys.count(), 0);
+ QCOMPARE(m->m_payeeList.count(), 0);
+ QCOMPARE(m->m_tagList.count(), 0);
+ QCOMPARE(m->m_scheduleList.count(), 0);
QCOMPARE(m->m_dirty, false);
QCOMPARE(m->m_creationDate, QDate::currentDate());
@@ -187,7 +187,7 @@
QCOMPARE(m->m_nextAccountID, 1ul);
QCOMPARE(m->dirty(), true);
- QCOMPARE(m->m_accountList.count(), static_cast<std::size_t>(6));
+ QCOMPARE(m->m_accountList.count(), 6);
QCOMPARE(m->m_accountList["A000001"].name(), QLatin1String("AccountName"));
}
@@ -235,7 +235,7 @@
m->m_dirty = false;
QCOMPARE(m->m_nextAccountID, 2ul);
- QCOMPARE(m->m_accountList.count(), static_cast<std::size_t>(7));
+ QCOMPARE(m->m_accountList.count(), 7);
// try to add account to undefined account
try {
@@ -271,7 +271,7 @@
i.setName("Inst Name");
m->addInstitution(i);
- QCOMPARE(m->m_institutionList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_institutionList.count(), 1);
QCOMPARE(m->m_nextInstitutionID, 1ul);
QCOMPARE(m->m_institutionList["I000001"].name(), QLatin1String("Inst Name"));
}
@@ -950,11 +950,11 @@
// check that we can remove an unreferenced payee
MyMoneyPayee p = m->payee("P000001");
try {
- QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_payeeList.count(), 1);
m->removePayee(p);
m->commitTransaction();
m->startTransaction();
- QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(0));
+ QCOMPARE(m->m_payeeList.count(), 0);
QCOMPARE(m->dirty(), true);
} catch (const MyMoneyException &) {
QFAIL("Unexpected exception");
@@ -996,7 +996,7 @@
QFAIL("Expected exception");
} catch (const MyMoneyException &) {
}
- QCOMPARE(m->m_payeeList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_payeeList.count(), 1);
}
void MyMoneySeqAccessMgrTest::testAddTag()
@@ -1046,11 +1046,11 @@
// check that we can remove an unreferenced tag
MyMoneyTag ta = m->tag("G000001");
try {
- QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_tagList.count(), 1);
m->removeTag(ta);
m->commitTransaction();
m->startTransaction();
- QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(0));
+ QCOMPARE(m->m_tagList.count(), 0);
QCOMPARE(m->dirty(), true);
} catch (const MyMoneyException &) {
QFAIL("Unexpected exception");
@@ -1094,7 +1094,7 @@
QFAIL("Expected exception");
} catch (const MyMoneyException &) {
}
- QCOMPARE(m->m_tagList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_tagList.count(), 1);
}
void MyMoneySeqAccessMgrTest::testRemoveAccountFromTree()
@@ -1267,7 +1267,7 @@
try {
- QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(0));
+ QCOMPARE(m->m_scheduleList.count(), 0);
MyMoneyTransaction t1;
MyMoneySplit s1, s2;
s1.setAccountId("A000001");
@@ -1287,7 +1287,7 @@
m->addSchedule(schedule);
- QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_scheduleList.count(), 1);
QCOMPARE(schedule.id(), QLatin1String("SCH000001"));
QCOMPARE(m->m_scheduleList["SCH000001"].id(), QLatin1String("SCH000001"));
} catch (const MyMoneyException &) {
@@ -1342,7 +1342,7 @@
sched.setName("New Sched-Name");
try {
m->modifySchedule(sched);
- QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_scheduleList.count(), 1);
QCOMPARE(m->m_scheduleList["SCH000001"].name(), QLatin1String("New Sched-Name"));
} catch (const MyMoneyException &) {
@@ -1373,7 +1373,7 @@
try {
m->removeSchedule(sched);
m->commitTransaction();
- QCOMPARE(m->m_scheduleList.count(), static_cast<std::size_t>(0));
+ QCOMPARE(m->m_scheduleList.count(), 0);
} catch (const MyMoneyException &) {
m->rollbackTransaction();
@@ -1548,13 +1548,13 @@
void MyMoneySeqAccessMgrTest::testAddCurrency()
{
MyMoneySecurity curr("EUR", "Euro", "?", 100, 100);
- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(0));
+ QCOMPARE(m->m_currencyList.count(), 0);
m->m_dirty = false;
try {
m->addCurrency(curr);
m->commitTransaction();
m->startTransaction();
- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_currencyList.count(), 1);
QCOMPARE(m->m_currencyList["EUR"].name(), QLatin1String("Euro"));
QCOMPARE(m->dirty(), true);
} catch (const MyMoneyException &) {
@@ -1582,7 +1582,7 @@
m->modifyCurrency(curr);
m->commitTransaction();
m->startTransaction();
- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_currencyList.count(), 1);
QCOMPARE(m->m_currencyList["EUR"].name(), QLatin1String("EURO"));
QCOMPARE(m->dirty(), true);
} catch (const MyMoneyException &) {
@@ -1611,7 +1611,7 @@
m->removeCurrency(curr);
m->commitTransaction();
m->startTransaction();
- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(0));
+ QCOMPARE(m->m_currencyList.count(), 0);
QCOMPARE(m->dirty(), true);
} catch (const MyMoneyException &) {
QFAIL("Unexpected exception");
@@ -1668,7 +1668,7 @@
try {
m->addCurrency(unknownCurr);
m->m_dirty = false;
- QCOMPARE(m->m_currencyList.count(), static_cast<std::size_t>(2));
+ QCOMPARE(m->m_currencyList.count(), 2);
QCOMPARE(m->currencyList().count(), 2);
QCOMPARE(m->dirty(), false);
} catch (const MyMoneyException &) {
@@ -1797,7 +1797,7 @@
QCOMPARE(m->m_nextOnlineJobID, 1ul);
QCOMPARE(m->dirty(), true);
- QCOMPARE(m->m_onlineJobList.count(), static_cast<std::size_t>(1));
+ QCOMPARE(m->m_onlineJobList.count(), 1);
QVERIFY(! m->m_onlineJobList["O000001"].isNull());
}

6
srcpkgs/kmymoney/template
View File

@ -1,6 +1,6 @@
# Template file for 'kmymoney'
pkgname=kmymoney
version=4.8.0
version=4.8.1.1
revision=1
build_style=cmake
hostmakedepends="qt-qmake automoc4 perl doxygen pkg-config gwenhywfar-qt"
@ -10,8 +10,8 @@ homepage="https://kmymoney.org"
short_desc="Personal finance manager"
maintainer="Helmut Pozimski <helmut@pozimski.eu>"
license="GPL-2"
distfiles="http://download.kde.org/stable/kmymoney/4.8.0/src/${pkgname}-${version}.tar.xz"
checksum="c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2"
distfiles="http://download.kde.org/stable/kmymoney/${version}/src/${pkgname}-${version}.tar.xz"
checksum=2b1cbd141d51a3f4147c30c00c7d21022e761d8121f5a206092cf3548f805a34
kmymoney-devel_package() {
short_desc+=" - development files"