[arch-commits] Commit in kmymoney/repos (10 files)
Antonio Rojas
arojas at archlinux.org
Thu Oct 27 22:24:28 UTC 2016
Date: Thursday, October 27, 2016 @ 22:24:27
Author: arojas
Revision: 193819
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
kmymoney/repos/community-staging-i686/
kmymoney/repos/community-staging-i686/4.8_build.patch
(from rev 193818, kmymoney/trunk/4.8_build.patch)
kmymoney/repos/community-staging-i686/PKGBUILD
(from rev 193818, kmymoney/trunk/PKGBUILD)
kmymoney/repos/community-staging-i686/kmymoney-gpgme-1.7.patch
(from rev 193818, kmymoney/trunk/kmymoney-gpgme-1.7.patch)
kmymoney/repos/community-staging-i686/kmymoney.changelog
(from rev 193818, kmymoney/trunk/kmymoney.changelog)
kmymoney/repos/community-staging-x86_64/
kmymoney/repos/community-staging-x86_64/4.8_build.patch
(from rev 193818, kmymoney/trunk/4.8_build.patch)
kmymoney/repos/community-staging-x86_64/PKGBUILD
(from rev 193818, kmymoney/trunk/PKGBUILD)
kmymoney/repos/community-staging-x86_64/kmymoney-gpgme-1.7.patch
(from rev 193818, kmymoney/trunk/kmymoney-gpgme-1.7.patch)
kmymoney/repos/community-staging-x86_64/kmymoney.changelog
(from rev 193818, kmymoney/trunk/kmymoney.changelog)
---------------------------------------------------+
community-staging-i686/4.8_build.patch | 210 ++++++++++++++++++++
community-staging-i686/PKGBUILD | 53 +++++
community-staging-i686/kmymoney-gpgme-1.7.patch | 38 +++
community-staging-i686/kmymoney.changelog | 57 +++++
community-staging-x86_64/4.8_build.patch | 210 ++++++++++++++++++++
community-staging-x86_64/PKGBUILD | 53 +++++
community-staging-x86_64/kmymoney-gpgme-1.7.patch | 38 +++
community-staging-x86_64/kmymoney.changelog | 57 +++++
8 files changed, 716 insertions(+)
Copied: kmymoney/repos/community-staging-i686/4.8_build.patch (from rev 193818, kmymoney/trunk/4.8_build.patch)
===================================================================
--- community-staging-i686/4.8_build.patch (rev 0)
+++ community-staging-i686/4.8_build.patch 2016-10-27 22:24:27 UTC (rev 193819)
@@ -0,0 +1,210 @@
+From: Cristian Oneț <onet.cristian at gmail.com>
+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<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();
+ }
+
+
+--- 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<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());
+
+ }
+
Copied: kmymoney/repos/community-staging-i686/PKGBUILD (from rev 193818, kmymoney/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-10-27 22:24:27 UTC (rev 193819)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Vamp898 <vamp898 at web.de>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Todd Maynard <arch at toddmaynard.com>
+
+pkgname=kmymoney
+pkgver=4.8.0
+pkgrel=4
+pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
+arch=('i686' 'x86_64')
+url="http://kmymoney2.sourceforge.net/"
+license=('GPL')
+depends=('kdebase-runtime' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs' 'kdepimlibs4')
+makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost' 'doxygen' 'patch')
+replaces=('kmymoney2')
+changelog=$pkgname.changelog
+source=(http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz
+ 4.8_build.patch kmymoney-gpgme-1.7.patch)
+sha256sums=('c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2'
+ '21cd9d7fece1b38b87ade8e4fc7f01397cf44a7fe0bc44cd08dda01d05207215'
+ '5a240ebedd8e6f80892187fc6543d58125c4832aff0698c0aa53ba6302033535')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+#https://bugs.kde.org/show_bug.cgi?id=364355
+ patch -Np1 -i "${srcdir}"/4.8_build.patch
+
+ # Build against gpgme++ from gpgme 1.7
+ patch -p1 -i "${srcdir}"/kmymoney-gpgme-1.7.patch
+}
+
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ mkdir build
+ cd build
+
+ cmake ../ \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver/build
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: kmymoney/repos/community-staging-i686/kmymoney-gpgme-1.7.patch (from rev 193818, kmymoney/trunk/kmymoney-gpgme-1.7.patch)
===================================================================
--- community-staging-i686/kmymoney-gpgme-1.7.patch (rev 0)
+++ community-staging-i686/kmymoney-gpgme-1.7.patch 2016-10-27 22:24:27 UTC (rev 193819)
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2251518..7ab4a02 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,7 @@ else (WIN32)
+ find_package(Boost "1.33.1" COMPONENTS graph)
+ endif (WIN32)
+ # needed by libkgpgfile
+-find_package(QGpgme REQUIRED)
++find_package(Gpgmepp REQUIRED)
+ find_package(KdepimLibs REQUIRED)
+ find_package(SharedMimeInfo REQUIRED)
+
+diff --git a/libkgpgfile/CMakeLists.txt b/libkgpgfile/CMakeLists.txt
+index a41a6a4..d60a93c 100644
+--- a/libkgpgfile/CMakeLists.txt
++++ b/libkgpgfile/CMakeLists.txt
+@@ -7,6 +7,6 @@ set(kgpgfile_STAT_SRCS
+ )
+
+ kde4_add_library(kgpgfile STATIC ${kgpgfile_STAT_SRCS})
+-target_link_libraries(kgpgfile ${QGPGME_LIBRARIES})
++target_link_libraries(kgpgfile Gpgmepp)
+
+
+diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp
+index b1870be..a5d3d4e 100644
+--- a/libkgpgfile/kgpgfile.cpp
++++ b/libkgpgfile/kgpgfile.cpp
+@@ -47,7 +47,6 @@
+ #include <gpgme++/keylistresult.h>
+ #include <gpgme++/key.h>
+ #include <gpgme++/data.h>
+-#include <qgpgme/dataprovider.h>
+
+ class KGPGFile::Private
+ {
+
Copied: kmymoney/repos/community-staging-i686/kmymoney.changelog (from rev 193818, kmymoney/trunk/kmymoney.changelog)
===================================================================
--- community-staging-i686/kmymoney.changelog (rev 0)
+++ community-staging-i686/kmymoney.changelog 2016-10-27 22:24:27 UTC (rev 193819)
@@ -0,0 +1,57 @@
+2016-06-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.8.0-2 #364355 fixed
+
+2016-06-15 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.8.0-1 x86_64
+ * i686 build fails https://bugs.kde.org/show_bug.cgi?id=364355
+
+2016-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.2-4 pacman hooks rebuild
+
+2016-01-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.2-3 libical rebuild
+
+2015-04-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.2-1
+
+2014-11-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.1-1
+
+2014-10-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.0-1
+
+2013-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.6.4-1
+
+2012-09-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.6.3-1
+
+2012-08-09 Eric Belanger <eric at archlinux.org>
+ * kmymoney 4.6.2-2
+ * Rebuild against libofx 0.9.5
+
+2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.5.3
+
+2010-12-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.5.2
+
+2010-10-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.5.1
+ * Added aqbanking dependency
+
+2010-08-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 4.5
+ * Package renamed to 'kmymoney'
+
+2010-05-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.0.5
+
+2010-04-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.0.4
+
+2010-04-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * FS#18974 broken OFX imported fixed in 1.0.3-2
+
+2010-03-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.0.3
Copied: kmymoney/repos/community-staging-x86_64/4.8_build.patch (from rev 193818, kmymoney/trunk/4.8_build.patch)
===================================================================
--- community-staging-x86_64/4.8_build.patch (rev 0)
+++ community-staging-x86_64/4.8_build.patch 2016-10-27 22:24:27 UTC (rev 193819)
@@ -0,0 +1,210 @@
+From: Cristian Oneț <onet.cristian at gmail.com>
+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<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();
+ }
+
+
+--- 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<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());
+
+ }
+
Copied: kmymoney/repos/community-staging-x86_64/PKGBUILD (from rev 193818, kmymoney/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-10-27 22:24:27 UTC (rev 193819)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Jaroslav Lichtblau <svetlemodry at archlinux.org>
+# Maintainer: Laurent Carlier <lordheavym at gmail.com>
+# Contributor: Vamp898 <vamp898 at web.de>
+# Contributor: Jaroslaw Swierczynski <swiergot at aur.archlinux.org>
+# Contributor: Eric Belanger <eric at archlinux.org>
+# Contributor: Todd Maynard <arch at toddmaynard.com>
+
+pkgname=kmymoney
+pkgver=4.8.0
+pkgrel=4
+pkgdesc="Personal finance manager for KDE which operates similarly to MS-Money or Quicken"
+arch=('i686' 'x86_64')
+url="http://kmymoney2.sourceforge.net/"
+license=('GPL')
+depends=('kdebase-runtime' 'shared-mime-info' 'aqbanking' 'libofx' 'libalkimia' 'boost-libs' 'kdepimlibs4')
+makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost' 'doxygen' 'patch')
+replaces=('kmymoney2')
+changelog=$pkgname.changelog
+source=(http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz
+ 4.8_build.patch kmymoney-gpgme-1.7.patch)
+sha256sums=('c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2'
+ '21cd9d7fece1b38b87ade8e4fc7f01397cf44a7fe0bc44cd08dda01d05207215'
+ '5a240ebedd8e6f80892187fc6543d58125c4832aff0698c0aa53ba6302033535')
+
+prepare() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+#https://bugs.kde.org/show_bug.cgi?id=364355
+ patch -Np1 -i "${srcdir}"/4.8_build.patch
+
+ # Build against gpgme++ from gpgme 1.7
+ patch -p1 -i "${srcdir}"/kmymoney-gpgme-1.7.patch
+}
+
+
+build() {
+ cd "${srcdir}"/$pkgname-$pkgver
+
+ mkdir build
+ cd build
+
+ cmake ../ \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=RELEASE -DCMAKE_SKIP_RPATH=YES
+ make
+}
+
+package() {
+ cd "${srcdir}"/$pkgname-$pkgver/build
+
+ make DESTDIR="${pkgdir}" install
+}
Copied: kmymoney/repos/community-staging-x86_64/kmymoney-gpgme-1.7.patch (from rev 193818, kmymoney/trunk/kmymoney-gpgme-1.7.patch)
===================================================================
--- community-staging-x86_64/kmymoney-gpgme-1.7.patch (rev 0)
+++ community-staging-x86_64/kmymoney-gpgme-1.7.patch 2016-10-27 22:24:27 UTC (rev 193819)
@@ -0,0 +1,38 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2251518..7ab4a02 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -76,7 +76,7 @@ else (WIN32)
+ find_package(Boost "1.33.1" COMPONENTS graph)
+ endif (WIN32)
+ # needed by libkgpgfile
+-find_package(QGpgme REQUIRED)
++find_package(Gpgmepp REQUIRED)
+ find_package(KdepimLibs REQUIRED)
+ find_package(SharedMimeInfo REQUIRED)
+
+diff --git a/libkgpgfile/CMakeLists.txt b/libkgpgfile/CMakeLists.txt
+index a41a6a4..d60a93c 100644
+--- a/libkgpgfile/CMakeLists.txt
++++ b/libkgpgfile/CMakeLists.txt
+@@ -7,6 +7,6 @@ set(kgpgfile_STAT_SRCS
+ )
+
+ kde4_add_library(kgpgfile STATIC ${kgpgfile_STAT_SRCS})
+-target_link_libraries(kgpgfile ${QGPGME_LIBRARIES})
++target_link_libraries(kgpgfile Gpgmepp)
+
+
+diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp
+index b1870be..a5d3d4e 100644
+--- a/libkgpgfile/kgpgfile.cpp
++++ b/libkgpgfile/kgpgfile.cpp
+@@ -47,7 +47,6 @@
+ #include <gpgme++/keylistresult.h>
+ #include <gpgme++/key.h>
+ #include <gpgme++/data.h>
+-#include <qgpgme/dataprovider.h>
+
+ class KGPGFile::Private
+ {
+
Copied: kmymoney/repos/community-staging-x86_64/kmymoney.changelog (from rev 193818, kmymoney/trunk/kmymoney.changelog)
===================================================================
--- community-staging-x86_64/kmymoney.changelog (rev 0)
+++ community-staging-x86_64/kmymoney.changelog 2016-10-27 22:24:27 UTC (rev 193819)
@@ -0,0 +1,57 @@
+2016-06-18 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.8.0-2 #364355 fixed
+
+2016-06-15 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.8.0-1 x86_64
+ * i686 build fails https://bugs.kde.org/show_bug.cgi?id=364355
+
+2016-04-29 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.2-4 pacman hooks rebuild
+
+2016-01-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.2-3 libical rebuild
+
+2015-04-28 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.2-1
+
+2014-11-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.1-1
+
+2014-10-02 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.7.0-1
+
+2013-10-06 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.6.4-1
+
+2012-09-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.6.3-1
+
+2012-08-09 Eric Belanger <eric at archlinux.org>
+ * kmymoney 4.6.2-2
+ * Rebuild against libofx 0.9.5
+
+2011-02-19 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.5.3
+
+2010-12-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.5.2
+
+2010-10-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * kmymoney 4.5.1
+ * Added aqbanking dependency
+
+2010-08-22 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 4.5
+ * Package renamed to 'kmymoney'
+
+2010-05-20 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.0.5
+
+2010-04-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.0.4
+
+2010-04-09 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * FS#18974 broken OFX imported fixed in 1.0.3-2
+
+2010-03-27 Jaroslav Lichtblau <svetlemodry at archlinux.org>
+ * Update to major release 1.0.3
More information about the arch-commits
mailing list