diff options
| author | exi <exi@wthack.de> | 2016-09-12 13:42:44 +0300 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2016-09-13 09:45:15 +0200 |
| commit | 18ba3297f04af05b340f467209d83aa34cd43f98 (patch) | |
| tree | 557ee72e2d4d0ba78774e3909a3ed89443b2d88d | |
| parent | 6ff44c571bb3c9bc810afcb7d7f9ea72c713e37d (diff) | |
| download | nixlib-18ba3297f04af05b340f467209d83aa34cd43f98.tar nixlib-18ba3297f04af05b340f467209d83aa34cd43f98.tar.gz nixlib-18ba3297f04af05b340f467209d83aa34cd43f98.tar.bz2 nixlib-18ba3297f04af05b340f467209d83aa34cd43f98.tar.lz nixlib-18ba3297f04af05b340f467209d83aa34cd43f98.tar.xz nixlib-18ba3297f04af05b340f467209d83aa34cd43f98.tar.zst nixlib-18ba3297f04af05b340f467209d83aa34cd43f98.zip | |
Fix kmymoney test build failure on 32bit
(cherry picked from commit f4618e14b956055da3df400fa9d302c5ea64a7f8) Signed-off-by: Domen Kožar <domen@dev.si>
| -rw-r--r-- | pkgs/applications/office/kmymoney/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/applications/office/kmymoney/seqaccessmgrtest.patch | 26 |
2 files changed, 30 insertions, 1 deletions
diff --git a/pkgs/applications/office/kmymoney/default.nix b/pkgs/applications/office/kmymoney/default.nix index 2516cfd45971..f375da175044 100644 --- a/pkgs/applications/office/kmymoney/default.nix +++ b/pkgs/applications/office/kmymoney/default.nix @@ -21,7 +21,10 @@ stdenv.mkDerivation rec { KDEDIRS = libalkimia; - patches = [ ./qgpgme.patch ]; + patches = [ + ./qgpgme.patch + ./seqaccessmgrtest.patch + ]; meta = { homepage = http://kmymoney2.sourceforge.net/; diff --git a/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch new file mode 100644 index 000000000000..d01a433ba09a --- /dev/null +++ b/pkgs/applications/office/kmymoney/seqaccessmgrtest.patch @@ -0,0 +1,26 @@ +Fix tests for 32bit builds until we can bring these upstream +diff --git a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp +index dcb4b4a..e803203 100644 +--- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp ++++ b/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp +@@ -58,13 +58,13 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor() + 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(), (size_t)0); ++ QCOMPARE(m->m_accountList.count(), (size_t)5); ++ QCOMPARE(m->m_transactionList.count(), (size_t)0); ++ QCOMPARE(m->m_transactionKeys.count(), (size_t)0); ++ QCOMPARE(m->m_payeeList.count(), (size_t)0); ++ QCOMPARE(m->m_tagList.count(), (size_t)0); ++ QCOMPARE(m->m_scheduleList.count(), (size_t)0); + + QCOMPARE(m->m_dirty, false); + QCOMPARE(m->m_creationDate, QDate::currentDate()); |