Chakra_Linux/desktop
1
0
Fork 0
mirror of https://gitdl.cn/https://github.com/chakralinux/desktop.git synced 2025-01-24 02:22:13 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

kmymoney: add paches, build failed, log added for further investigation

Browse Source
This commit is contained in:
Chaoting Liu 2017-01-10 10:37:31 +00:00
parent d58d3670df
commit 8e3bb25ff2
4 changed files with 2194 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
kmymoney/4.8_build.patch Normal file
View File

@ -0,0 +1,210 @@
From: Cristian Oneț <onet.cristian@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());
}

14
kmymoney/PKGBUILD
View File

@ -1,20 +1,26 @@
pkgname=kmymoney
pkgver=4.8.0
pkgrel=3
pkgrel=4
pkgdesc="A finance manager for KDE4 with HBCI support"
arch=('x86_64')
url="http://kmymoney2.sourceforge.net"
license=('GPL')
depends=('kde-runtime' 'shared-mime-info' 'aqbanking' 'libofx>=0.9.10' 'libalkimia' 'boost-libs' 'kdepimlibs4')
makedepends=('cmake' 'automoc4' 'docbook-xml' 'gwenhywfar>=4.13.1' 'docbook-xsl' 'boost' 'doxygen')
makedepends=('cmake' 'automoc4' 'docbook-xml' 'docbook-xsl' 'boost' 'doxygen')
categories=('office')
install=$pkgname.install
source=(http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.xz)
sha256sums=('c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2')
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}"
mkdir -p build
patch -Np1 -i "${srcdir}"/4.8_build.patch
patch -Np1 -i "${srcdir}"/kmymoney-gpgme-1.7.patch
}
build() {

1936
kmymoney/kmymoney-4.8.0-4-x86_64-build.log Normal file
View File

File diff suppressed because it is too large Load Diff

38
kmymoney/kmymoney-gpgme-1.7.patch Normal file
View File

@ -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
{