From f162c45e62262a3dfd96e96cd8d605325a503d67 Mon Sep 17 00:00:00 2001 From: Willy Sudiarto Raharjo Date: Wed, 31 May 2017 20:40:40 +0700 Subject: [PATCH] office/kmymoney: Fix build failure. Signed-off-by: Willy Sudiarto Raharjo --- office/kmymoney/kmymoney-qt4.patch | 211 ++++++++++++++++++++++++++++ office/kmymoney/kmymoney.SlackBuild | 7 +- 2 files changed, 215 insertions(+), 3 deletions(-) create mode 100644 office/kmymoney/kmymoney-qt4.patch diff --git a/office/kmymoney/kmymoney-qt4.patch b/office/kmymoney/kmymoney-qt4.patch new file mode 100644 index 0000000000..4ee5a3774d --- /dev/null +++ b/office/kmymoney/kmymoney-qt4.patch @@ -0,0 +1,211 @@ +From: Cristian Oneț +Date: Thu, 16 Jun 2016 07:06:32 +0000 +Subject: Fix the tests of the 4.8 build. +X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=29ab40829f86f6bd32229ededcc09bf2736e67bd +--- +Fix the tests of the 4.8 build. + +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. + +BUG: 364355 +--- + + +--- a/kmymoney/mymoney/storage/mymoneymap.h ++++ b/kmymoney/mymoney/storage/mymoneymap.h +@@ -195,7 +195,7 @@ + that = *(dynamic_cast* >(const_cast* >(this))); + } + +- inline size_t count(void) const { ++ inline int count(void) const { + return QMap::count(); + } + + +--- a/kmymoney/mymoney/storage/mymoneyseqaccessmgrtest.cpp ++++ b/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(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(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(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(1)); ++ QCOMPARE(m->m_payeeList.count(), 1); + m->removePayee(p); + m->commitTransaction(); + m->startTransaction(); +- QCOMPARE(m->m_payeeList.count(), static_cast(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(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(1)); ++ QCOMPARE(m->m_tagList.count(), 1); + m->removeTag(ta); + m->commitTransaction(); + m->startTransaction(); +- QCOMPARE(m->m_tagList.count(), static_cast(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(1)); ++ QCOMPARE(m->m_tagList.count(), 1); + } + + void MyMoneySeqAccessMgrTest::testRemoveAccountFromTree() +@@ -1267,7 +1267,7 @@ + + + try { +- QCOMPARE(m->m_scheduleList.count(), static_cast(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(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(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(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(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(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(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(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(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(1)); ++ QCOMPARE(m->m_onlineJobList.count(), 1); + QVERIFY(! m->m_onlineJobList["O000001"].isNull()); + + } + + diff --git a/office/kmymoney/kmymoney.SlackBuild b/office/kmymoney/kmymoney.SlackBuild index 5a8c413d27..996edac362 100644 --- a/office/kmymoney/kmymoney.SlackBuild +++ b/office/kmymoney/kmymoney.SlackBuild @@ -32,7 +32,7 @@ TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -43,8 +43,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -72,6 +72,7 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/kmymoney-qt4.patch mkdir -p build cd build cmake \