From c31f5768a9a75f42e05145000d318e938328a24e Mon Sep 17 00:00:00 2001 From: Christophe Nguyen Date: Fri, 5 Jan 2018 23:01:13 +0000 Subject: office/kmymoney: Updated for version 4.8.1.1. Signed-off-by: David Spencer --- office/kmymoney/kmymoney-qt4.patch | 211 ------------------------------------ office/kmymoney/kmymoney.SlackBuild | 4 +- office/kmymoney/kmymoney.info | 8 +- office/kmymoney/slack-desc | 2 +- 4 files changed, 7 insertions(+), 218 deletions(-) delete mode 100644 office/kmymoney/kmymoney-qt4.patch diff --git a/office/kmymoney/kmymoney-qt4.patch b/office/kmymoney/kmymoney-qt4.patch deleted file mode 100644 index 4ee5a3774d..0000000000 --- a/office/kmymoney/kmymoney-qt4.patch +++ /dev/null @@ -1,211 +0,0 @@ -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 996edac362..8e425d69ee 100644 --- a/office/kmymoney/kmymoney.SlackBuild +++ b/office/kmymoney/kmymoney.SlackBuild @@ -2,6 +2,7 @@ # SlackBuild script for kmymoney +# Copyright 2016-2018 Christophe Nguyen, France # Copyright 2010-2014 Gilcio Amaral # Copyright 2007-2008 Michiel van Wessem, Manchester, United Kingdom # All rights reserved. @@ -26,7 +27,7 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=kmymoney -VERSION=${VERSION:-4.8.0} +VERSION=${VERSION:-4.8.1.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -72,7 +73,6 @@ 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 \ diff --git a/office/kmymoney/kmymoney.info b/office/kmymoney/kmymoney.info index d1d0dd1fc8..4afdb19560 100644 --- a/office/kmymoney/kmymoney.info +++ b/office/kmymoney/kmymoney.info @@ -1,8 +1,8 @@ PRGNAM="kmymoney" -VERSION="4.8.0" -HOMEPAGE="http://www.kmymoney.org" -DOWNLOAD="http://download.kde.org/stable/kmymoney/4.8.0/src/kmymoney-4.8.0.tar.xz" -MD5SUM="a1cc5f862493f1abc1f660ffed4f1711" +VERSION="4.8.1.1" +HOMEPAGE="https://kmymoney.org" +DOWNLOAD="http://download.kde.org/stable/kmymoney/4.8.1.1/src/kmymoney-4.8.1.1.tar.xz" +MD5SUM="d7327184855fd88942e33428ce205b31" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="libalkimia" diff --git a/office/kmymoney/slack-desc b/office/kmymoney/slack-desc index 358a88a793..f9239e0c5c 100644 --- a/office/kmymoney/slack-desc +++ b/office/kmymoney/slack-desc @@ -13,7 +13,7 @@ kmymoney: personal or small-business use. It is a complete and full kmymoney: double-entry accounting software package. kmymoney: kmymoney: -kmymoney: Homepage: http://kmymoney2.sourceforge.net/ +kmymoney: Homepage: https://kmymoney.org kmymoney: kmymoney: kmymoney: -- cgit v1.2.3