gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-23 16:49:10 -07:00
Code Issues Projects Releases Wiki Activity

app-office/kmymoney: version bump and a bunch of other changes.

Browse Source 
Changes:
* version bump to 4.8.0.
* add USE=pim,weboob.
* add USE=pim for optional kdepimlibs or app-crypt/gpgme[cxx] dependency.
* EAPI 6.
* fix HOMEPAGE, DESCRIPTION.

metadata.xml: no longer at sourceforge.

Gentoo-Bug: https://bugs.gentoo.org/587244

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2667

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
This commit is contained in:
Andreas Sturmlechner
2016-10-26 12:55:25 +02:00
committed by Patrice Clement
parent 7450026d58
commit fed5862317
9 changed files with 630 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app-office/kmymoney/Manifest
View File

@@ -1 +1,2 @@
DIST kmymoney-4.7.2.tar.xz 20391472 SHA256 bfb2c29ff30988f46324c2dae197a06b58d07336a1947adc22bcfed3e554393d SHA512 43db5b3e52d21dee517c8fadccf120aed5854dc16cbd7e265c327149c3a0c900ec02de06a56a9f5b8ad4d04c15730916c79238a3cf2778911e9d8cc4a65afbb1 WHIRLPOOL 461ce894aedb653e696572068ec7a006c3c3fcc2c7493caf634052393bc5874d19e3a6e87e73fd6100316d9bfbfe65eba4d6c87ea2f3b11ea4b354fc91422db7
DIST kmymoney-4.8.0.tar.xz 20785888 SHA256 c2a635710aafa6925a49803c480e043e0bf4bc5b62430689aa5eb95619f48ac2 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381 WHIRLPOOL acbada22e3e9c83e88e571b397c37da79eb36ce05a55786c352af306d3f863dc2db7140c9f1e1757393ea7f6dc9a1728debe077c71ce28b655c65e707f1130cd

29
app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch Normal file
View File

@@ -0,0 +1,29 @@
Some 8 cmake patches were necessary to get libalkimia detection right.
This just copies the current state of 4.8 branch.
--- a/CMakeLists.txt 2016-10-26 12:17:23.390317411 +0200
+++ b/CMakeLists.txt 2016-10-26 12:17:53.750544101 +0200
@@ -110,14 +110,21 @@
add_custom_target(apidoc ${DOXYGEN} ${CMAKE_CURRENT_BINARY_DIR}/kmymoney.doxygen)
endif(DOXYGEN_FOUND)
-find_package(LibAlkimia 4.3.2 REQUIRED)
+find_package(LibAlkimia REQUIRED)
#TODO: remove when LibAlkimia minimum version will be raised
if (NOT LIBALKIMIA_LIBRARIES AND LIBALKIMIA_LIBRARY)
# LibAlkimia 4.3.2 does not properly define LIBALKIMIA_LIBRARIES
find_package(GMP REQUIRED)
set(LIBALKIMIA_LIBRARIES ${GMP_LIBRARIES} ${LIBALKIMIA_LIBRARY} )
endif()
-
+# make sure we have the matching version of LibAlkimia (not too new)
+if(${LibAlkimia_FOUND})
+ if (DEFINED ${LibAlkimia_VERSION})
+ if (NOT "${LibAlkimia_VERSION}" VERSION_LESS "6.0.0")
+ message(FATAL_ERROR "This version of KMyMoney requires LibAlkimia < 6.0.0 and does not work with the installed version of LibAlkimia")
+ endif()
+ endif()
+endif()
# check for PkgConfig
find_package(PkgConfig)

22
app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch Normal file
View File

@@ -0,0 +1,22 @@
From: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>
Date: Sat, 06 Aug 2016 11:14:18 +0000
Subject: Remove Qt::WindowStaysOnTopHint from CSV dialog
X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=d129b22e2da6e7972008f2b5ef3eccc95d758201
---
Remove Qt::WindowStaysOnTopHint from CSV dialog
BUG: 363429
---
--- a/kmymoney/plugins/csvimport/csvdialog.cpp
+++ b/kmymoney/plugins/csvimport/csvdialog.cpp
@@ -224,7 +224,6 @@
m_investmentDlg->init();
Qt::WindowFlags eFlags = windowFlags();
- eFlags |= Qt::WindowStaysOnTopHint;
m_wiz->setWindowFlags(eFlags);
m_wiz->show();
}// CSVDialog

77
app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch Normal file
View File

@@ -0,0 +1,77 @@
From cddb71b5bbe0c7d73877f0308ad0ac64d9f99c20 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Thu, 10 Nov 2016 15:53:32 +0100
Subject: [PATCH 1/2] Use GpgME++ if possible, QGpgme from kdepimlibs-4 as
fallback
Remove bogus qgpgme include.
REVIEW: 129371
---
CMakeLists.txt | 9 ++++++++-
libkdchart/kdablibfakes/src/KDABLibFakes.h | 3 +++
libkgpgfile/CMakeLists.txt | 2 +-
libkgpgfile/kgpgfile.cpp | 1 -
4 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2251518..5a01673 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,14 @@ else (WIN32)
find_package(Boost "1.33.1" COMPONENTS graph)
endif (WIN32)
# needed by libkgpgfile
-find_package(QGpgme REQUIRED)
+find_package(Gpgmepp 1.7.0)
+set(GPGMEPP_LIBS Gpgmepp)
+if (NOT Gpgmepp_FOUND)
+ find_package(QGpgme REQUIRED)
+ set(GPGMEPP_LIBS ${QGPGME_LIBRARIES})
+else (NOT Gpgmepp_FOUND)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
+endif (NOT Gpgmepp_FOUND)
find_package(KdepimLibs REQUIRED)
find_package(SharedMimeInfo REQUIRED)
diff --git a/libkdchart/kdablibfakes/src/KDABLibFakes.h b/libkdchart/kdablibfakes/src/KDABLibFakes.h
index f47ec24..b998723 100644
--- a/libkdchart/kdablibfakes/src/KDABLibFakes.h
+++ b/libkdchart/kdablibfakes/src/KDABLibFakes.h
@@ -59,6 +59,9 @@
#elif defined (Q_OS_DARWIN) || defined (Q_OS_CYGWIN)
#define ISNAN(x) std::isnan(x)
#define ISINF(x) std::isinf(x)
+#elif defined (__GXX_EXPERIMENTAL_CXX0X) || __cplusplus >= 201103L
+#define ISNAN(x) std::isnan(x)
+#define ISINF(x) std::isinf(x)
#else
#define ISNAN(x) isnan(x)
#define ISINF(x) isinf(x)
diff --git a/libkgpgfile/CMakeLists.txt b/libkgpgfile/CMakeLists.txt
index a41a6a4..a7c982e 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_LIBS})
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
{
--
2.7.3

172
app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch Normal file
View File

@@ -0,0 +1,172 @@
From c66ab47628ad0cf76cc63de0bdf1ed578e4138ed Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
Date: Thu, 10 Nov 2016 16:18:42 +0100
Subject: [PATCH 2/2] Make kdepimlibs optional
Based on b5de50ccaa1571c4feb0c17ea8016554e3b822d7 from master.
REVIEW: 129371
---
CMakeLists.txt | 5 ++++-
kmymoney/dialogs/settings/ksettingsschedules.cpp | 5 ++++-
kmymoney/kmymoney.cpp | 20 +++++++++++++++++++-
3 files changed, 27 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a01673..6662521 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,7 +84,7 @@ if (NOT Gpgmepp_FOUND)
else (NOT Gpgmepp_FOUND)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x")
endif (NOT Gpgmepp_FOUND)
-find_package(KdepimLibs REQUIRED)
+find_package(KdepimLibs)
find_package(SharedMimeInfo REQUIRED)
# set the configuration switch signaling that KDE PIM libraries were found
@@ -417,6 +417,7 @@ macro(nice_yesno _varname)
endif(${_varname})
endmacro(nice_yesno _varname)
+nice_yesno("KdepimLibs_FOUND")
nice_yesno("LIBOFX_FOUND")
nice_yesno("LIBOFX_HAVE_CLIENTUID")
nice_yesno("KBANKING_FOUND")
@@ -433,6 +434,8 @@ message("
Configure results (user options):
--------------------------------------------
+KDE PIM holidays: ${nice_KdepimLibs_FOUND}
+
OFX plugin: ${nice_LIBOFX_FOUND}
OFX clientuid support ${nice_LIBOFX_HAVE_CLIENTUID}
diff --git a/kmymoney/dialogs/settings/ksettingsschedules.cpp b/kmymoney/dialogs/settings/ksettingsschedules.cpp
index da138a7..1f0d16f 100644
--- a/kmymoney/dialogs/settings/ksettingsschedules.cpp
+++ b/kmymoney/dialogs/settings/ksettingsschedules.cpp
@@ -24,8 +24,10 @@
#include <kdeversion.h>
#include <KStandardDirs>
+#ifdef HAVE_KDEPIMLIBS
#include <KHolidays/Holidays>
using namespace KHolidays;
+#endif
// ----------------------------------------------------------------------------
// Project Includes
@@ -50,6 +52,7 @@ KSettingsSchedules::KSettingsSchedules(QWidget* parent) :
void KSettingsSchedules::loadList()
{
QStringList regions;
+#ifdef HAVE_KDEPIMLIBS
QStringList regionCodes = HolidayRegion::regionCodes();
foreach (const QString &regionCode, regionCodes) {
@@ -65,7 +68,7 @@ void KSettingsSchedules::loadList()
regions << region;
}
regions.sort();
-
+#endif
m_regionMap[m_holidayRegion->itemText(0)] = "";
m_holidayRegion->insertItems(1, regions);
}
diff --git a/kmymoney/kmymoney.cpp b/kmymoney/kmymoney.cpp
index a4251f0..0bd2d3b 100644
--- a/kmymoney/kmymoney.cpp
+++ b/kmymoney/kmymoney.cpp
@@ -89,7 +89,9 @@
#include <kinputdialog.h>
#include <kxmlguifactory.h>
#include <krecentfilesaction.h>
+#ifdef HAVE_KDEPIMLIBS
#include <KHolidays/Holidays>
+#endif
// ----------------------------------------------------------------------------
// Project Includes
@@ -221,7 +223,9 @@ public:
m_additionalKeyLabel(0),
m_additionalKeyButton(0),
m_recentFiles(0),
+#ifdef HAVE_KDEPIMLIBS
m_holidayRegion(0),
+#endif
m_applicationIsReady(true) {
// since the days of the week are from 1 to 7,
// and a day of the week is used to index this bit array,
@@ -343,9 +347,10 @@ public:
KPushButton* m_additionalKeyButton;
KRecentFilesAction* m_recentFiles;
-
+#ifdef HAVE_KDEPIMLIBS
// used by the calendar interface for schedules
KHolidays::HolidayRegion* m_holidayRegion;
+#endif
QBitArray m_processingDays;
QMap<QDate, bool> m_holidayMap;
QStringList m_consistencyCheckResult;
@@ -455,7 +460,9 @@ KMyMoneyApp::~KMyMoneyApp()
delete d->m_transactionEditor;
delete d->m_endingBalanceDlg;
delete d->m_moveToAccountSelector;
+#ifdef HAVE_KDEPIMLIBS
delete d->m_holidayRegion;
+#endif
delete d;
}
@@ -7732,6 +7739,7 @@ void KMyMoneyApp::slotOnlineJobLog(const QStringList& onlineJobIds)
void KMyMoneyApp::setHolidayRegion(const QString& holidayRegion)
{
+#ifdef HAVE_KDEPIMLIBS
//since the cost of updating the cache is now not negligible
//check whether the region has been modified
if (!d->m_holidayRegion || d->m_holidayRegion->regionCode() != holidayRegion) {
@@ -7743,10 +7751,14 @@ void KMyMoneyApp::setHolidayRegion(const QString& holidayRegion)
//clear and update the holiday cache
preloadHolidays();
}
+#else
+ Q_UNUSED(holidayRegion);
+#endif
}
bool KMyMoneyApp::isProcessingDate(const QDate& date) const
{
+#ifdef HAVE_KDEPIMLIBS
if (!d->m_processingDays.testBit(date.dayOfWeek()))
return false;
if (!d->m_holidayRegion || !d->m_holidayRegion->isValid())
@@ -7760,10 +7772,15 @@ bool KMyMoneyApp::isProcessingDate(const QDate& date) const
d->m_holidayMap.insert(date, processingDay);
return processingDay;
}
+#else
+ Q_UNUSED(date);
+ return true;
+#endif
}
void KMyMoneyApp::preloadHolidays()
{
+#ifdef HAVE_KDEPIMLIBS
//clear the cache before loading
d->m_holidayMap.clear();
//only do this if it is a valid region
@@ -7792,6 +7809,7 @@ void KMyMoneyApp::preloadHolidays()
}
}
}
+#endif
}
KMStatus::KMStatus(const QString &text)
--
2.7.3

28
app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch Normal file
View File

@@ -0,0 +1,28 @@
From: Thomas Baumgart <thb@net-bembel.de>
Date: Wed, 13 Jul 2016 05:48:46 +0000
Subject: Added versioning to kmm_payeeidentifier library
X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git&a=commitdiff&h=1b818335b4242ad5096489ab4f8e3e7c3fc62d55
---
Added versioning to kmm_payeeidentifier library
The missing version caused incorrect naming of the library.
Modified version of patch provided by Christian Dávid in commit
4a0fed749df71bb2acfc15bd6c0bff4806927f01
BUG: 364387
FIXED-IN: 4.8.1
---
--- a/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
+++ b/kmymoney/mymoney/payeeidentifier/CMakeLists.txt
@@ -11,6 +11,8 @@
add_library( kmm_payeeidentifier SHARED
${PAYEEIDENTIFIER_SCRS}
)
+
+set_target_properties(kmm_payeeidentifier PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION})
generate_export_header( kmm_payeeidentifier )

210
app-office/kmymoney/files/kmymoney-4.8.0-tests.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());
}

89
app-office/kmymoney/kmymoney-4.8.0.ebuild Normal file
View File

@@ -0,0 +1,89 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
KDE_LINGUAS="bs ca ca@valencia cs da de el en_GB es et eu fi fr gl
hu it kk nds nl pl pt pt_BR ro ru sk sv tr uk zh_CN zh_TW"
KDE_HANDBOOK="optional"
VIRTUALX_REQUIRED="test"
VIRTUALDBUS_TEST="true"
inherit kde4-base
DESCRIPTION="Personal finance manager by KDE"
HOMEPAGE="https://kmymoney.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
fi
LICENSE="GPL-2"
SLOT="4"
KEYWORDS="~amd64 ~x86"
IUSE="debug calendar doc hbci ofx pim quotes weboob"
COMMON_DEPEND="
app-crypt/gpgme
<app-office/libalkimia-6.0.0
dev-libs/gmp:0=
dev-libs/libgpg-error
x11-misc/shared-mime-info
calendar? ( dev-libs/libical:= )
hbci? (
>=net-libs/aqbanking-5.5.1
>=sys-libs/gwenhywfar-4.15.3[qt4]
)
ofx? ( >=dev-libs/libofx-0.9.4 )
pim? ( $(add_kdeapps_dep kdepimlibs) )
!pim? ( app-crypt/gpgme[cxx] )
weboob? ( www-client/weboob )
"
RDEPEND="${COMMON_DEPEND}
quotes? ( dev-perl/Finance-Quote )
"
DEPEND="${COMMON_DEPEND}
dev-libs/boost
virtual/pkgconfig
doc? ( app-doc/doxygen )
"
PATCHES=(
"${FILESDIR}/${P}-tests.patch"
"${FILESDIR}/${P}-alkimia-detect.patch"
"${FILESDIR}/${P}-fix-csvdialog.patch"
"${FILESDIR}/${P}-soversion.patch"
"${FILESDIR}/${P}-gpgmepp.patch"
"${FILESDIR}/${P}-kdepimlibs-optional.patch"
)
src_prepare() {
kde4-base_src_prepare
# don't install as executable
sed -i kmymoney/CMakeLists.txt \
-e "/install.*kmymoney.appdata/ s/PROGRAMS/FILES/" || die
}
src_configure() {
local mycmakeargs=(
-DUSE_QT_DESIGNER=OFF
-DENABLE_LIBICAL=$(usex calendar)
-DUSE_DEVELOPER_DOC=$(usex doc)
-DENABLE_KBANKING=$(usex hbci)
-DENABLE_LIBOFX=$(usex ofx)
$(cmake-utils_use_find_package pim KdepimLibs)
$(cmake-utils_use_find_package '!pim' Gpgmepp)
-DENABLE_WEBOOB=$(usex weboob)
)
kde4-base_src_configure
}
src_compile() {
kde4-base_src_compile
use doc && kde4-base_src_compile apidoc
}
src_install() {
use doc && HTML_DOCS=("${BUILD_DIR}/apidocs/html/")
kde4-base_src_install
}

5
app-office/kmymoney/metadata.xml
View File

@@ -7,9 +7,8 @@
</maintainer>
<use>
<flag name="hbci">Enable HBCI support using <pkg>net-libs/aqbanking</pkg></flag>
<flag name="pim">Enable KDE PIM integration via <pkg>kde-apps/kdepimlibs</pkg></flag>
<flag name="quotes">Enable Online Stock Quote retrieval</flag>
<flag name="weboob">Enable import of online banking transactions extracted by <pkg>www-client/weboob</pkg></flag>
</use>
<upstream>
<remote-id type="sourceforge">kmymoney2</remote-id>
</upstream>
</pkgmetadata>