* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
@ 2016-11-25 21:52 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2016-11-25 21:52 UTC (permalink / raw
To: gentoo-commits
commit: fed58623179ae14348a0f374a834e22fc830dff2
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Oct 26 10:55:25 2016 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 21:52:10 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed58623
app-office/kmymoney: version bump and a bunch of other changes.
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 <AT> gentoo.org>
app-office/kmymoney/Manifest | 1 +
.../files/kmymoney-4.8.0-alkimia-detect.patch | 29 +++
.../files/kmymoney-4.8.0-fix-csvdialog.patch | 22 +++
.../kmymoney/files/kmymoney-4.8.0-gpgmepp.patch | 77 ++++++++
.../files/kmymoney-4.8.0-kdepimlibs-optional.patch | 172 +++++++++++++++++
.../kmymoney/files/kmymoney-4.8.0-soversion.patch | 28 +++
.../kmymoney/files/kmymoney-4.8.0-tests.patch | 210 +++++++++++++++++++++
app-office/kmymoney/kmymoney-4.8.0.ebuild | 89 +++++++++
app-office/kmymoney/metadata.xml | 5 +-
9 files changed, 630 insertions(+), 3 deletions(-)
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 62c2584..f5d8b15 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -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
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch b/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch
new file mode 100644
index 00000000..628e7c8
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch
@@ -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)
+
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch b/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch
new file mode 100644
index 00000000..4f84a17
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch
@@ -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
+
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch b/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch
new file mode 100644
index 00000000..7b76eb1
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch
@@ -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
+
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch b/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch
new file mode 100644
index 00000000..30b4168
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch
@@ -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 ®ionCode, 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
+
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch b/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch
new file mode 100644
index 00000000..f115490
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch
@@ -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 )
+
+
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch b/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch
new file mode 100644
index 00000000..1b71180
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch
@@ -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());
+
+ }
+
diff --git a/app-office/kmymoney/kmymoney-4.8.0.ebuild b/app-office/kmymoney/kmymoney-4.8.0.ebuild
new file mode 100644
index 00000000..6b0183f
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.8.0.ebuild
@@ -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
+}
diff --git a/app-office/kmymoney/metadata.xml b/app-office/kmymoney/metadata.xml
index 2a07a76..5a113df 100644
--- a/app-office/kmymoney/metadata.xml
+++ b/app-office/kmymoney/metadata.xml
@@ -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>
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
@ 2017-05-18 19:49 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-05-18 19:49 UTC (permalink / raw
To: gentoo-commits
commit: 7ba20123fc43fc66d5151005ae529163ac030db3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 18 19:15:45 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 18 19:48:03 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ba20123
app-office/kmymoney: Drop national onlinetasks
Removed in master branch for not being supported by banks anymore.
Fixes moc issue with Qt4 and >=boost-1.63
Reported-by: Mark Nowiasz <mark+gentoo <AT> nowiasz.de>
Gentoo-bug: 617636
Package-Manager: Portage-2.3.5, Repoman-2.3.1
.../kmymoney-4.8.0-drop-national-onlinetasks.patch | 289 +++++++++++++++++++++
app-office/kmymoney/kmymoney-4.8.0-r2.ebuild | 90 +++++++
2 files changed, 379 insertions(+)
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch b/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch
new file mode 100644
index 00000000000..abcffed0227
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch
@@ -0,0 +1,289 @@
+commit 5979b1e92d67124591d10b18b173852882f077e7
+Author: Christian Dávid <christian-david@web.de>
+Date: Mon Jun 13 00:05:27 2016 +0200
+
+ Removed national credit transfers
+
+ They are not supported by the banks anymore. So they can be removed.
+
+ Unfortunately they contained the only example for a task converter.
+ Due to the removed plugin the CMakeLists.txt for sepa could be
+ simplified.
+
+ Cherry-picked from d514e650
+
+diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp b/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
+index 6c2b5d8a..8b67bcbb 100644
+--- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
++++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
+@@ -24,9 +24,9 @@
+ #include <aqbanking/value.h>
+
+ #include "payeeidentifier/payeeidentifiertyped.h"
++#include "payeeidentifier/nationalaccount/nationalaccount.h"
+ #include "tasksettings/credittransfersettingsbase.h"
+ #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
+-#include "onlinetasks/national/tasks/germanonlinetransfer.h"
+ #include "gwenhywfarqtoperators.h"
+
+ /**
+@@ -49,40 +49,6 @@ static const QString dtausChars = QString::fromUtf8("0123456789ABCDEFGHIJKLMNOPQ
+ */
+ static const QString sepaChars = QString("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz':?.,- (+)/");
+
+-QSharedPointer<germanOnlineTransfer::settings> AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits)
+-{
+- Q_CHECK_PTR(aqlimits);
+-
+- QSharedPointer<creditTransferSettingsBase> settings(new creditTransferSettingsBase);
+-
+- // AqBanking returns 0 as min length even if it requires one
+- int minLength = AB_TransactionLimits_GetMinLenPurpose(aqlimits);
+- if (minLength == 0)
+- minLength = 1;
+- settings->setPurposeLimits(AB_TransactionLimits_GetMaxLinesPurpose(aqlimits),
+- AB_TransactionLimits_GetMaxLenPurpose(aqlimits),
+- minLength
+- );
+-
+- // AqBanking returns 0 as min length even if it requires one
+- minLength = AB_TransactionLimits_GetMinLenRemoteName(aqlimits);
+- if (minLength == 0)
+- minLength = 1;
+- settings->setRecipientNameLimits(AB_TransactionLimits_GetMaxLinesRemoteName(aqlimits),
+- AB_TransactionLimits_GetMaxLenRemoteName(aqlimits),
+- minLength
+- );
+-
+- minLength = AB_TransactionLimits_GetMinLenLocalName(aqlimits);
+- if (minLength == 0)
+- minLength = 1;
+- settings->setPayeeNameLimits(1, AB_TransactionLimits_GetMaxLenLocalName(aqlimits), minLength);
+-
+- settings->setAllowedChars(dtausChars);
+-
+- return settings.dynamicCast<germanOnlineTransfer::settings>();
+-}
+-
+ /** @todo Check if AB_TransactionLimits_GetMaxLenCustomerReference really is the limit for the sepa reference */
+ QSharedPointer<sepaOnlineTransfer::settings> AB_TransactionLimits_toSepaOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits)
+ {
+diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
+index a314cd72..5205a884 100644
+--- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
++++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
+@@ -29,7 +29,6 @@
+
+ #include "onlinetasks/interfaces/tasks/ionlinetasksettings.h"
+ #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
+-#include "onlinetasks/national/tasks/germanonlinetransfer.h"
+
+ class AB_ACCOUNT;
+ class AB_TRANSACTION_LIMITS;
+@@ -43,12 +42,6 @@ class nationalAccount;
+ }
+
+ /**
+- * @brief AB_TransactionLimits_toGermanOnlineTaskSettings
+- * @param aqlimits IN
+- */
+-QSharedPointer<germanOnlineTransfer::settings> AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits);
+-
+-/**
+ * @brief AB_TransactionLimits_toSepaOnlineTaskSettings
+ * @param aqlimits IN
+ */
+diff --git a/kmymoney/plugins/kbanking/mymoneybanking.cpp b/kmymoney/plugins/kbanking/mymoneybanking.cpp
+index d8c4a571..a64eaf61 100644
+--- a/kmymoney/plugins/kbanking/mymoneybanking.cpp
++++ b/kmymoney/plugins/kbanking/mymoneybanking.cpp
+@@ -598,11 +598,7 @@ void KBankingPlugin::sendOnlineJob(QList<onlineJob>& jobs)
+
+ if (!jobs.isEmpty()) {
+ foreach (onlineJob job, jobs) {
+- if (germanOnlineTransfer::name() == job.task()->taskName()) {
+- onlineJobTyped<germanOnlineTransfer> typedJob(job);
+- enqueTransaction(typedJob);
+- job = typedJob;
+- } else if (sepaOnlineTransfer::name() == job.task()->taskName()) {
++ if (sepaOnlineTransfer::name() == job.task()->taskName()) {
+ onlineJobTyped<sepaOnlineTransfer> typedJob(job);
+ enqueTransaction(typedJob);
+ job = typedJob;
+@@ -646,14 +642,8 @@ QStringList KBankingPlugin::availableJobs(QString accountId)
+
+ // Check availableJobs
+
+- // national transfer
+- AB_JOB *abJob = AB_JobSingleTransfer_new(abAccount);
+- if (AB_Job_CheckAvailability(abJob) == 0)
+- list.append(germanOnlineTransfer::name());
+- AB_Job_free(abJob);
+-
+ // sepa transfer
+- abJob = AB_JobSepaTransfer_new(abAccount);
++ AB_JOB* abJob = AB_JobSepaTransfer_new(abAccount);
+ if (AB_Job_CheckAvailability(abJob) == 0)
+ list.append(sepaOnlineTransfer::name());
+ AB_Job_free(abJob);
+@@ -686,17 +676,7 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas
+ if (abAcc == 0)
+ return IonlineTaskSettings::ptr();
+
+- if (germanOnlineTransfer::name() == taskName) {
+- // Get Limits for germanOnlineTransfer
+- QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSingleTransfer_new(abAcc));
+- if (AB_Job_CheckAvailability(abJob.data()) != 0)
+- return IonlineTaskSettings::ptr();
+-
+- const AB_TRANSACTION_LIMITS* limits = AB_Job_GetFieldLimits(abJob.data());
+- return AB_TransactionLimits_toGermanOnlineTaskSettings(limits).dynamicCast<IonlineTaskSettings>();
+- //! @todo needs free? because that is not possible with const AB_TRANSACTION_LIMITS*
+- // AB_TransactionLimits_free( limits );
+- } else if (sepaOnlineTransfer::name() == taskName) {
++ if (sepaOnlineTransfer::name() == taskName) {
+ // Get limits for sepaonlinetransfer
+ QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSepaTransfer_new(abAcc));
+ if (AB_Job_CheckAvailability(abJob.data()) != 0)
+@@ -707,62 +687,6 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas
+ return IonlineTaskSettings::ptr();
+ }
+
+-bool KBankingPlugin::enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job)
+-{
+- /* get AqBanking account */
+- QString accId = job.constTask()->responsibleAccount();
+- AB_ACCOUNT *abAccount = aqbAccount(accId);
+- if (!abAccount) {
+- job.addJobMessage(onlineJobMessage(onlineJobMessage::warning, "KBanking", i18n("<qt>"
+- "The given application account <b>%1</b> "
+- "has not been mapped to an online "
+- "account."
+- "</qt>",
+- MyMoneyFile::instance()->account(accId).name())));
+- return false;
+- }
+- //setupAccountReference(acc, ba); // needed?
+-
+- AB_JOB *abJob = AB_JobSingleTransfer_new(abAccount);
+- int rv = AB_Job_CheckAvailability(abJob);
+- if (rv) {
+- qDebug("AB_ERROR_OFFSET is %i", AB_ERROR_OFFSET);
+- job.addJobMessage(onlineJobMessage::error, "AqBanking",
+- QString("National credit transfers for account \"%1\" are not available, error code %2.").arg(MyMoneyFile::instance()->account(accId).name(), rv),
+- QString::number(rv)
+- );
+- return false;
+- }
+- AB_TRANSACTION *abTransaction = AB_Transaction_new();
+-
+- // Recipient
+- payeeIdentifiers::nationalAccount beneficiaryAcc = job.task()->beneficiaryTyped();
+- AB_Transaction_SetRemoteAccount(abTransaction, beneficiaryAcc);
+-
+- // Origin Account
+- AB_Transaction_SetLocalAccount(abTransaction, abAccount);
+-
+- // Purpose
+- QStringList qPurpose = job.task()->purpose().split('\n', QString::SkipEmptyParts);
+- GWEN_STRINGLIST *purpose = GWEN_StringList_fromQStringList(qPurpose);
+- AB_Transaction_SetPurpose(abTransaction, purpose);
+- GWEN_StringList_free(purpose);
+-
+- // Other
+- AB_Transaction_SetTextKey(abTransaction, job.task()->textKey());
+- AB_Transaction_SetValue(abTransaction, AB_Value_fromMyMoneyMoney(job.task()->value()));
+-
+- /** @todo LOW remove Debug info */
+- qDebug() << "SetTransaction: " << AB_Job_SetTransaction(abJob, abTransaction);
+-
+- GWEN_DB_NODE *gwenNode = AB_Job_GetAppData(abJob);
+- GWEN_DB_SetCharValue(gwenNode, GWEN_DB_FLAGS_DEFAULT, "kmmOnlineJobId", m_kbanking->mappingId(job).toLatin1().constData());
+-
+- qDebug() << "Enqueue: " << m_kbanking->enqueueJob(abJob);
+- //delete localAcc;
+- return true;
+-}
+-
+ bool KBankingPlugin::enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job)
+ {
+ /* get AqBanking account */
+diff --git a/kmymoney/plugins/kbanking/mymoneybanking.h b/kmymoney/plugins/kbanking/mymoneybanking.h
+index c2559ae7..7936704e 100644
+--- a/kmymoney/plugins/kbanking/mymoneybanking.h
++++ b/kmymoney/plugins/kbanking/mymoneybanking.h
+@@ -64,7 +64,6 @@ class KBAccountSettings;
+
+ #include "mymoney/onlinejobtyped.h"
+ #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
+-#include "onlinetasks/national/tasks/germanonlinetransfer.h"
+
+ /**
+ * This class represents the KBanking plugin towards KMymoney.
+@@ -184,7 +183,6 @@ private:
+ */
+ void startPasswordTimer();
+
+- bool enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job);
+ bool enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job);
+
+
+diff --git a/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h b/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
+index 28d55a06..3bac6ce8 100644
+--- a/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
++++ b/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
+@@ -20,14 +20,13 @@
+ #define CREDITTRANSFERSETTINGSBASE_H
+
+ #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
+-#include "onlinetasks/national/tasks/germanonlinetransfer.h"
+
+ /**
+ * @brief Base class for sepaCreditTransfer and germanCreditTransfer settings
+ *
+ * @internal Both credit transfers have similar fields
+ */
+-class creditTransferSettingsBase : public sepaOnlineTransfer::settings, public germanOnlineTransfer::settings
++class creditTransferSettingsBase : public sepaOnlineTransfer::settings
+ {
+ public:
+ creditTransferSettingsBase()
+diff --git a/kmymoney/plugins/onlinetasks/CMakeLists.txt b/kmymoney/plugins/onlinetasks/CMakeLists.txt
+index 7be53137..2e57b214 100644
+--- a/kmymoney/plugins/onlinetasks/CMakeLists.txt
++++ b/kmymoney/plugins/onlinetasks/CMakeLists.txt
+@@ -1,5 +1,4 @@
+
+ add_subdirectory(interfaces)
+ add_subdirectory(sepa)
+-add_subdirectory(national)
+ add_subdirectory(unavailabletask)
+diff --git a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
+index 3c2d9db1..e3962d7a 100644
+--- a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
++++ b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
+@@ -2,6 +2,7 @@ set( sepaOnlineTasks_SRCS
+ tasks/sepaonlinetransferimpl.cpp
+ ui/sepacredittransferedit.cpp
+ sepastorageplugin.cpp
++ sepaonlinetasksloader.cpp
+ )
+
+ set( sepaOnlineTasks_HEADER
+@@ -12,14 +13,8 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS
+ ui/sepacredittransferedit.ui
+ )
+
+-automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS)
+-add_library( konlinetasks_sepa_OBJECTS OBJECT ${sepaOnlineTasks_SRCS} )
+-
+-# Add actual plugin here it is not part of the objects
+-# needed if multiple plugins are linked (needed for unit tests)
+-kde4_add_plugin(konlinetasks_sepa
+- $<TARGET_OBJECTS:konlinetasks_sepa_OBJECTS>
+- sepaonlinetasksloader.cpp
++add_library(konlinetasks_sepa MODULE
++ ${sepaOnlineTasks_SRCS}
+ )
+
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-sepaorders.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney-sepaorders.desktop)
diff --git a/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild b/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
new file mode 100644
index 00000000000..757dc00ef9c
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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="calendar debug doc hbci ofx pim quotes weboob"
+
+COMMON_DEPEND="
+ >=app-crypt/gpgme-1.7.0[cxx]
+ <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) )
+ 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"
+ "${FILESDIR}/${P}-drop-national-onlinetasks.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
+
+ # bug #617636, complement to drop-national-onlinetasks.patch
+ rm -r kmymoney/plugins/onlinetasks/national || 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)
+ -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
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
@ 2018-01-27 1:02 Michael Palimaka
0 siblings, 0 replies; 6+ messages in thread
From: Michael Palimaka @ 2018-01-27 1:02 UTC (permalink / raw
To: gentoo-commits
commit: 4d996b040bbd0994062a6cc61703790344393a06
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 00:59:27 2018 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 01:01:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d996b04
app-office/kmymoney: remove 4.8.0-r3
Package-Manager: Portage-2.3.19, Repoman-2.3.6
app-office/kmymoney/Manifest | 1 -
.../files/kmymoney-4.8.0-alkimia-detect.patch | 29 ---
.../kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch | 38 ---
.../kmymoney-4.8.0-drop-national-onlinetasks.patch | 289 ---------------------
.../files/kmymoney-4.8.0-fix-csvdialog.patch | 22 --
.../kmymoney/files/kmymoney-4.8.0-gpgmepp.patch | 77 ------
.../files/kmymoney-4.8.0-kdepimlibs-optional.patch | 172 ------------
.../kmymoney/files/kmymoney-4.8.0-soversion.patch | 28 --
.../kmymoney/files/kmymoney-4.8.0-tests.patch | 210 ---------------
app-office/kmymoney/kmymoney-4.8.0-r3.ebuild | 89 -------
10 files changed, 955 deletions(-)
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 736e8aee315..88f26a7d042 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,2 +1 @@
-DIST kmymoney-4.8.0.tar.xz 20785888 BLAKE2B 23819f5ef4f1ec0951f8b598041b7516efae94ccc6677404b133039023e6141e078226938d2c6d6fa6332803d4ee23d1c855e4db1945ada3d02d8302103876d0 SHA512 883635a94333341cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381
DIST kmymoney-4.8.1.1.tar.xz 20963444 BLAKE2B d2be72a1c7dc41f48405ee406c419b9eb74cc02a80949965b8241331c00fbec23c32177aea0a401a76ef64a97e25e9e532c28e4f29bf88c9c2fd04f608790df6 SHA512 1f730f7db9117469aebaab33891f6064f648fa0ad25afff9ac1fab8d638c376d8e1f013401512c4be060436d6bbdfdacad6427b1e0911ac6b46288db1e242783
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch b/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch
deleted file mode 100644
index 628e7c87538..00000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-alkimia-detect.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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)
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch b/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch
deleted file mode 100644
index 93e8809d824..00000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b0a68ca075928aa29ee1e0007bfb14d714f5a948 Mon Sep 17 00:00:00 2001
-From: Ralf Habacker <ralf.habacker@freenet.de>
-Date: Thu, 10 Aug 2017 13:45:04 +0200
-Subject: Fix 'Compile error on Fedora 26'
-
-CMake build system used some outdated variables which has been replaced
-by cmake build in variables to fix the issue.
-
-FIXED-IN:4.8.1
-BUG:383351
----
- kmymoney/dialogs/settings/CMakeLists.txt | 9 ++++-----
- 1 file changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/kmymoney/dialogs/settings/CMakeLists.txt b/kmymoney/dialogs/settings/CMakeLists.txt
-index 5aacbea..b007dfb 100644
---- a/kmymoney/dialogs/settings/CMakeLists.txt
-+++ b/kmymoney/dialogs/settings/CMakeLists.txt
-@@ -1,12 +1,11 @@
- add_custom_command(
-- OUTPUT ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h ${KMyMoney2_BINARY_DIR}/kmymoneysettings.cpp
-- DEPENDS ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
-- COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${KMyMoney2_BINARY_DIR}/ ${KMyMoney2_SOURCE_DIR}/kmymoney.kcfg ${KMyMoney2_SOURCE_DIR}/kmymoneysettings.kcfgc
-+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.h ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
-+ DEPENDS ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
-+ COMMAND ${KDE4_KCFGC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR}/ ${CMAKE_SOURCE_DIR}/kmymoney/kmymoney.kcfg ${CMAKE_SOURCE_DIR}/kmymoney/kmymoneysettings.kcfgc
- )
-
--
- set (libsettings_a_SOURCES
-- ${KMyMoney2_BINARY_DIR}/kmymoneysettings.h
-+ ${CMAKE_CURRENT_BINARY_DIR}/kmymoneysettings.cpp
- ksettingscolors.cpp
- ksettingsfonts.cpp
- ksettingsforecast.cpp
---
-cgit v0.11.2
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch b/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch
deleted file mode 100644
index abcffed0227..00000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-drop-national-onlinetasks.patch
+++ /dev/null
@@ -1,289 +0,0 @@
-commit 5979b1e92d67124591d10b18b173852882f077e7
-Author: Christian Dávid <christian-david@web.de>
-Date: Mon Jun 13 00:05:27 2016 +0200
-
- Removed national credit transfers
-
- They are not supported by the banks anymore. So they can be removed.
-
- Unfortunately they contained the only example for a task converter.
- Due to the removed plugin the CMakeLists.txt for sepa could be
- simplified.
-
- Cherry-picked from d514e650
-
-diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp b/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
-index 6c2b5d8a..8b67bcbb 100644
---- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
-+++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.cpp
-@@ -24,9 +24,9 @@
- #include <aqbanking/value.h>
-
- #include "payeeidentifier/payeeidentifiertyped.h"
-+#include "payeeidentifier/nationalaccount/nationalaccount.h"
- #include "tasksettings/credittransfersettingsbase.h"
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
--#include "onlinetasks/national/tasks/germanonlinetransfer.h"
- #include "gwenhywfarqtoperators.h"
-
- /**
-@@ -49,40 +49,6 @@ static const QString dtausChars = QString::fromUtf8("0123456789ABCDEFGHIJKLMNOPQ
- */
- static const QString sepaChars = QString("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz':?.,- (+)/");
-
--QSharedPointer<germanOnlineTransfer::settings> AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits)
--{
-- Q_CHECK_PTR(aqlimits);
--
-- QSharedPointer<creditTransferSettingsBase> settings(new creditTransferSettingsBase);
--
-- // AqBanking returns 0 as min length even if it requires one
-- int minLength = AB_TransactionLimits_GetMinLenPurpose(aqlimits);
-- if (minLength == 0)
-- minLength = 1;
-- settings->setPurposeLimits(AB_TransactionLimits_GetMaxLinesPurpose(aqlimits),
-- AB_TransactionLimits_GetMaxLenPurpose(aqlimits),
-- minLength
-- );
--
-- // AqBanking returns 0 as min length even if it requires one
-- minLength = AB_TransactionLimits_GetMinLenRemoteName(aqlimits);
-- if (minLength == 0)
-- minLength = 1;
-- settings->setRecipientNameLimits(AB_TransactionLimits_GetMaxLinesRemoteName(aqlimits),
-- AB_TransactionLimits_GetMaxLenRemoteName(aqlimits),
-- minLength
-- );
--
-- minLength = AB_TransactionLimits_GetMinLenLocalName(aqlimits);
-- if (minLength == 0)
-- minLength = 1;
-- settings->setPayeeNameLimits(1, AB_TransactionLimits_GetMaxLenLocalName(aqlimits), minLength);
--
-- settings->setAllowedChars(dtausChars);
--
-- return settings.dynamicCast<germanOnlineTransfer::settings>();
--}
--
- /** @todo Check if AB_TransactionLimits_GetMaxLenCustomerReference really is the limit for the sepa reference */
- QSharedPointer<sepaOnlineTransfer::settings> AB_TransactionLimits_toSepaOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits)
- {
-diff --git a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
-index a314cd72..5205a884 100644
---- a/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
-+++ b/kmymoney/plugins/kbanking/aqbankingkmmoperators.h
-@@ -29,7 +29,6 @@
-
- #include "onlinetasks/interfaces/tasks/ionlinetasksettings.h"
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
--#include "onlinetasks/national/tasks/germanonlinetransfer.h"
-
- class AB_ACCOUNT;
- class AB_TRANSACTION_LIMITS;
-@@ -43,12 +42,6 @@ class nationalAccount;
- }
-
- /**
-- * @brief AB_TransactionLimits_toGermanOnlineTaskSettings
-- * @param aqlimits IN
-- */
--QSharedPointer<germanOnlineTransfer::settings> AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits);
--
--/**
- * @brief AB_TransactionLimits_toSepaOnlineTaskSettings
- * @param aqlimits IN
- */
-diff --git a/kmymoney/plugins/kbanking/mymoneybanking.cpp b/kmymoney/plugins/kbanking/mymoneybanking.cpp
-index d8c4a571..a64eaf61 100644
---- a/kmymoney/plugins/kbanking/mymoneybanking.cpp
-+++ b/kmymoney/plugins/kbanking/mymoneybanking.cpp
-@@ -598,11 +598,7 @@ void KBankingPlugin::sendOnlineJob(QList<onlineJob>& jobs)
-
- if (!jobs.isEmpty()) {
- foreach (onlineJob job, jobs) {
-- if (germanOnlineTransfer::name() == job.task()->taskName()) {
-- onlineJobTyped<germanOnlineTransfer> typedJob(job);
-- enqueTransaction(typedJob);
-- job = typedJob;
-- } else if (sepaOnlineTransfer::name() == job.task()->taskName()) {
-+ if (sepaOnlineTransfer::name() == job.task()->taskName()) {
- onlineJobTyped<sepaOnlineTransfer> typedJob(job);
- enqueTransaction(typedJob);
- job = typedJob;
-@@ -646,14 +642,8 @@ QStringList KBankingPlugin::availableJobs(QString accountId)
-
- // Check availableJobs
-
-- // national transfer
-- AB_JOB *abJob = AB_JobSingleTransfer_new(abAccount);
-- if (AB_Job_CheckAvailability(abJob) == 0)
-- list.append(germanOnlineTransfer::name());
-- AB_Job_free(abJob);
--
- // sepa transfer
-- abJob = AB_JobSepaTransfer_new(abAccount);
-+ AB_JOB* abJob = AB_JobSepaTransfer_new(abAccount);
- if (AB_Job_CheckAvailability(abJob) == 0)
- list.append(sepaOnlineTransfer::name());
- AB_Job_free(abJob);
-@@ -686,17 +676,7 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas
- if (abAcc == 0)
- return IonlineTaskSettings::ptr();
-
-- if (germanOnlineTransfer::name() == taskName) {
-- // Get Limits for germanOnlineTransfer
-- QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSingleTransfer_new(abAcc));
-- if (AB_Job_CheckAvailability(abJob.data()) != 0)
-- return IonlineTaskSettings::ptr();
--
-- const AB_TRANSACTION_LIMITS* limits = AB_Job_GetFieldLimits(abJob.data());
-- return AB_TransactionLimits_toGermanOnlineTaskSettings(limits).dynamicCast<IonlineTaskSettings>();
-- //! @todo needs free? because that is not possible with const AB_TRANSACTION_LIMITS*
-- // AB_TransactionLimits_free( limits );
-- } else if (sepaOnlineTransfer::name() == taskName) {
-+ if (sepaOnlineTransfer::name() == taskName) {
- // Get limits for sepaonlinetransfer
- QScopedPointer<AB_JOB, QScopedPointerAbJobDeleter> abJob(AB_JobSepaTransfer_new(abAcc));
- if (AB_Job_CheckAvailability(abJob.data()) != 0)
-@@ -707,62 +687,6 @@ IonlineTaskSettings::ptr KBankingPlugin::settings(QString accountId, QString tas
- return IonlineTaskSettings::ptr();
- }
-
--bool KBankingPlugin::enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job)
--{
-- /* get AqBanking account */
-- QString accId = job.constTask()->responsibleAccount();
-- AB_ACCOUNT *abAccount = aqbAccount(accId);
-- if (!abAccount) {
-- job.addJobMessage(onlineJobMessage(onlineJobMessage::warning, "KBanking", i18n("<qt>"
-- "The given application account <b>%1</b> "
-- "has not been mapped to an online "
-- "account."
-- "</qt>",
-- MyMoneyFile::instance()->account(accId).name())));
-- return false;
-- }
-- //setupAccountReference(acc, ba); // needed?
--
-- AB_JOB *abJob = AB_JobSingleTransfer_new(abAccount);
-- int rv = AB_Job_CheckAvailability(abJob);
-- if (rv) {
-- qDebug("AB_ERROR_OFFSET is %i", AB_ERROR_OFFSET);
-- job.addJobMessage(onlineJobMessage::error, "AqBanking",
-- QString("National credit transfers for account \"%1\" are not available, error code %2.").arg(MyMoneyFile::instance()->account(accId).name(), rv),
-- QString::number(rv)
-- );
-- return false;
-- }
-- AB_TRANSACTION *abTransaction = AB_Transaction_new();
--
-- // Recipient
-- payeeIdentifiers::nationalAccount beneficiaryAcc = job.task()->beneficiaryTyped();
-- AB_Transaction_SetRemoteAccount(abTransaction, beneficiaryAcc);
--
-- // Origin Account
-- AB_Transaction_SetLocalAccount(abTransaction, abAccount);
--
-- // Purpose
-- QStringList qPurpose = job.task()->purpose().split('\n', QString::SkipEmptyParts);
-- GWEN_STRINGLIST *purpose = GWEN_StringList_fromQStringList(qPurpose);
-- AB_Transaction_SetPurpose(abTransaction, purpose);
-- GWEN_StringList_free(purpose);
--
-- // Other
-- AB_Transaction_SetTextKey(abTransaction, job.task()->textKey());
-- AB_Transaction_SetValue(abTransaction, AB_Value_fromMyMoneyMoney(job.task()->value()));
--
-- /** @todo LOW remove Debug info */
-- qDebug() << "SetTransaction: " << AB_Job_SetTransaction(abJob, abTransaction);
--
-- GWEN_DB_NODE *gwenNode = AB_Job_GetAppData(abJob);
-- GWEN_DB_SetCharValue(gwenNode, GWEN_DB_FLAGS_DEFAULT, "kmmOnlineJobId", m_kbanking->mappingId(job).toLatin1().constData());
--
-- qDebug() << "Enqueue: " << m_kbanking->enqueueJob(abJob);
-- //delete localAcc;
-- return true;
--}
--
- bool KBankingPlugin::enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job)
- {
- /* get AqBanking account */
-diff --git a/kmymoney/plugins/kbanking/mymoneybanking.h b/kmymoney/plugins/kbanking/mymoneybanking.h
-index c2559ae7..7936704e 100644
---- a/kmymoney/plugins/kbanking/mymoneybanking.h
-+++ b/kmymoney/plugins/kbanking/mymoneybanking.h
-@@ -64,7 +64,6 @@ class KBAccountSettings;
-
- #include "mymoney/onlinejobtyped.h"
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
--#include "onlinetasks/national/tasks/germanonlinetransfer.h"
-
- /**
- * This class represents the KBanking plugin towards KMymoney.
-@@ -184,7 +183,6 @@ private:
- */
- void startPasswordTimer();
-
-- bool enqueTransaction(onlineJobTyped<germanOnlineTransfer>& job);
- bool enqueTransaction(onlineJobTyped<sepaOnlineTransfer>& job);
-
-
-diff --git a/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h b/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
-index 28d55a06..3bac6ce8 100644
---- a/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
-+++ b/kmymoney/plugins/kbanking/tasksettings/credittransfersettingsbase.h
-@@ -20,14 +20,13 @@
- #define CREDITTRANSFERSETTINGSBASE_H
-
- #include "onlinetasks/sepa/tasks/sepaonlinetransfer.h"
--#include "onlinetasks/national/tasks/germanonlinetransfer.h"
-
- /**
- * @brief Base class for sepaCreditTransfer and germanCreditTransfer settings
- *
- * @internal Both credit transfers have similar fields
- */
--class creditTransferSettingsBase : public sepaOnlineTransfer::settings, public germanOnlineTransfer::settings
-+class creditTransferSettingsBase : public sepaOnlineTransfer::settings
- {
- public:
- creditTransferSettingsBase()
-diff --git a/kmymoney/plugins/onlinetasks/CMakeLists.txt b/kmymoney/plugins/onlinetasks/CMakeLists.txt
-index 7be53137..2e57b214 100644
---- a/kmymoney/plugins/onlinetasks/CMakeLists.txt
-+++ b/kmymoney/plugins/onlinetasks/CMakeLists.txt
-@@ -1,5 +1,4 @@
-
- add_subdirectory(interfaces)
- add_subdirectory(sepa)
--add_subdirectory(national)
- add_subdirectory(unavailabletask)
-diff --git a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-index 3c2d9db1..e3962d7a 100644
---- a/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-+++ b/kmymoney/plugins/onlinetasks/sepa/CMakeLists.txt
-@@ -2,6 +2,7 @@ set( sepaOnlineTasks_SRCS
- tasks/sepaonlinetransferimpl.cpp
- ui/sepacredittransferedit.cpp
- sepastorageplugin.cpp
-+ sepaonlinetasksloader.cpp
- )
-
- set( sepaOnlineTasks_HEADER
-@@ -12,14 +13,8 @@ kde4_add_ui_files( sepaOnlineTasks_SRCS
- ui/sepacredittransferedit.ui
- )
-
--automoc4( konlinetasks_sepa_OBJECTS sepaOnlineTasks_SRCS)
--add_library( konlinetasks_sepa_OBJECTS OBJECT ${sepaOnlineTasks_SRCS} )
--
--# Add actual plugin here it is not part of the objects
--# needed if multiple plugins are linked (needed for unit tests)
--kde4_add_plugin(konlinetasks_sepa
-- $<TARGET_OBJECTS:konlinetasks_sepa_OBJECTS>
-- sepaonlinetasksloader.cpp
-+add_library(konlinetasks_sepa MODULE
-+ ${sepaOnlineTasks_SRCS}
- )
-
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kmymoney-sepaorders.desktop.in ${CMAKE_CURRENT_BINARY_DIR}/kmymoney-sepaorders.desktop)
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch b/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch
deleted file mode 100644
index 4f84a17f5b5..00000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch b/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch
deleted file mode 100644
index 7b76eb1358c..00000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-gpgmepp.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-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
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch b/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch
deleted file mode 100644
index 30b416868cf..00000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-kdepimlibs-optional.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-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 ®ionCode, 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
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch b/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch
deleted file mode 100644
index f1154908cde..00000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-soversion.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-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 )
-
-
diff --git a/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch b/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch
deleted file mode 100644
index 1b71180096a..00000000000
--- a/app-office/kmymoney/files/kmymoney-4.8.0-tests.patch
+++ /dev/null
@@ -1,210 +0,0 @@
-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());
-
- }
-
diff --git a/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild b/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild
deleted file mode 100644
index b61523303b5..00000000000
--- a/app-office/kmymoney/kmymoney-4.8.0-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-SQL_REQUIRED="always"
-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="calendar debug doc hbci ofx quotes weboob"
-
-COMMON_DEPEND="
- >=app-crypt/gpgme-1.7.0[cxx]
- <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 )
- 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"
- "${FILESDIR}/${P}-drop-national-onlinetasks.patch"
- "${FILESDIR}/${P}-cmake-3.9.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
-
- # bug #617636, complement to drop-national-onlinetasks.patch
- rm -r kmymoney/plugins/onlinetasks/national || 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)
- -DCMAKE_DISABLE_FIND_PACKAGE_KdepimLibs=ON
- -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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
@ 2018-05-10 8:01 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-05-10 8:01 UTC (permalink / raw
To: gentoo-commits
commit: 028175e62748f872494c2422deef19c2f5c69734
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 10 07:57:32 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 10 08:01:10 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=028175e6
app-office/kmymoney: Fix build with Qt 5.11
Package-Manager: Portage-2.3.36, Repoman-2.3.9
.../kmymoney/files/kmymoney-5.0.1-qt-5.11.patch | 23 ++++++++++++++++++++++
app-office/kmymoney/kmymoney-5.0.1-r2.ebuild | 5 ++++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
new file mode 100644
index 00000000000..4158e0f8ed5
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
@@ -0,0 +1,23 @@
+From e5198a902996b27bf9abde0ad24af82d55ab5dc1 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Thu, 10 May 2018 09:35:34 +0200
+Subject: Fix build with Qt 5.11
+
+---
+ kmymoney/plugins/kbanking/widgets/chiptandialog.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
+index 928e7a8..53fb2a3 100644
+--- a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
++++ b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
+@@ -28,6 +28,7 @@
+ #include <QQuickView>
+ #include <QQuickItem>
+ #include <QPushButton>
++#include <QRegExpValidator>
+ #include <QStandardPaths>
+
+ #include <KLocalizedString>
+--
+cgit v0.11.2
diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
index 44363179fe0..7891db19927 100644
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
@@ -87,7 +87,10 @@ RDEPEND="${COMMON_DEPEND}
quotes? ( dev-perl/Finance-Quote )
"
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+ "${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-qt-5.11.patch"
+)
pkg_setup() {
use weboob && python_setup
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
@ 2018-12-13 18:00 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-12-13 18:00 UTC (permalink / raw
To: gentoo-commits
commit: 9eeaff895f32e6486b258b31a29b461b6d9250d1
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 17:49:31 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 17:49:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eeaff89
app-office/kmymoney: Drop 5.0.1-r2
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/kmymoney/Manifest | 1 -
.../kmymoney/files/kmymoney-5.0.1-cmake.patch | 34 ------
.../kmymoney/files/kmymoney-5.0.1-qt-5.11.patch | 23 ----
app-office/kmymoney/kmymoney-5.0.1-r2.ebuild | 125 ---------------------
4 files changed, 183 deletions(-)
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 124c17a189c..c0f46f21fe7 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,2 +1 @@
-DIST kmymoney-5.0.1.tar.xz 13307860 BLAKE2B df61285f848df693510f1807bbf66b7cfec4498f2c540df3420731734a8ced8c4ae6426e338af2cecc85278120087eddc261a9e35bad50722991e3bb617d4a9c SHA512 74ace8d98f144c503d572c68cf50c27664a49bc5f4428788b69a1da52b8f72e97e1bb70914dbf041c43884c3b6340e28390618dec179ebe3d1b3ea63bede93e7
DIST kmymoney-5.0.2.tar.xz 11682108 BLAKE2B 310ec19938950f05654555be1c1f0091233e1c3e497c9481ff0a199ad8f34efe517fb5f2c54cf6e521b03bddf9aec89976e346f1dba72b1f245c4d8af349864a SHA512 a2d6e28a68a7d8bf05e4a0c88b398ff8d9b644384d7113e6abeea4572df8b054a31edaaddd6cad7dc5aaddef492c0477df3a92a4e2d4efdfba7722f54453ca47
diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch b/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch
deleted file mode 100644
index 7ba8349b0fe..00000000000
--- a/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b4053d2b41c3ff5c3e3f3cc452eef0e72202b5ad Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Mon, 19 Mar 2018 17:51:27 +0100
-Subject: [PATCH] Fix weboob option in custom configure summary
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eff5b22d..ac466943 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -317,7 +317,7 @@ nice_yesno("KMM_ADDRESSBOOK_FOUND")
- nice_yesno("LIBOFX_FOUND")
- nice_yesno("LIBOFX_HAVE_CLIENTUID")
- nice_yesno("KBANKING_FOUND")
--nice_yesno("WEBOOB_FOUND")
-+nice_yesno("ENABLE_WEBOOB")
- nice_yesno("LIBICAL_FOUND")
- nice_yesno("ENABLE_SQLCIPHER")
- nice_yesno("USE_QT_DESIGNER")
-@@ -340,7 +340,7 @@ OFX plugin: ${nice_LIBOFX_FOUND}
-
- KBanking plugin: ${nice_KBANKING_FOUND}
-
--weboob plugin: ${nice_WEBOOB_FOUND}
-+weboob plugin: ${nice_ENABLE_WEBOOB}
-
- iCalendar export plugin: ${nice_LIBICAL_FOUND}
-
---
-2.16.2
-
diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch b/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
deleted file mode 100644
index 4158e0f8ed5..00000000000
--- a/app-office/kmymoney/files/kmymoney-5.0.1-qt-5.11.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e5198a902996b27bf9abde0ad24af82d55ab5dc1 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Thu, 10 May 2018 09:35:34 +0200
-Subject: Fix build with Qt 5.11
-
----
- kmymoney/plugins/kbanking/widgets/chiptandialog.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
-index 928e7a8..53fb2a3 100644
---- a/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
-+++ b/kmymoney/plugins/kbanking/widgets/chiptandialog.cpp
-@@ -28,6 +28,7 @@
- #include <QQuickView>
- #include <QQuickItem>
- #include <QPushButton>
-+#include <QRegExpValidator>
- #include <QStandardPaths>
-
- #include <KLocalizedString>
---
-cgit v0.11.2
diff --git a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
deleted file mode 100644
index 7891db19927..00000000000
--- a/app-office/kmymoney/kmymoney-5.0.1-r2.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-KDE_GCC_MINIMAL="6.4"
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde5 python-single-r1
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 x86"
-IUSE="activities addressbook calendar hbci holidays ofx quotes weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep kdewebkit)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwebkit)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- >=app-crypt/gpgme-1.7.1-r1[cxx]
- >=app-office/libalkimia-6.0.0
- dev-libs/gmp:0=
- dev-libs/kdiagram:5
- dev-libs/libgpg-error
- x11-misc/shared-mime-info
- activities? ( $(add_frameworks_dep kactivities) )
- addressbook? (
- $(add_kdeapps_dep akonadi)
- $(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep kidentitymanagement)
- )
- calendar? ( dev-libs/libical:= )
- hbci? (
- >=net-libs/aqbanking-5.6.5
- >=sys-libs/gwenhywfar-4.15.3-r1[qt5]
- )
- holidays? ( $(add_frameworks_dep kholidays) )
- ofx? ( dev-libs/libofx )
- weboob? (
- ${PYTHON_DEPS}
- $(add_qt_dep qtconcurrent)
- www-client/weboob[${PYTHON_USEDEP}]
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/kmymoney:4
- quotes? ( dev-perl/Finance-Quote )
-"
-
-PATCHES=(
- "${FILESDIR}/${P}-cmake.patch"
- "${FILESDIR}/${P}-qt-5.11.patch"
-)
-
-pkg_setup() {
- use weboob && python_setup
- kde5_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QT_DESIGNER=OFF
- $(cmake-utils_use_find_package activities KF5Activities)
- $(cmake-utils_use_find_package addressbook KF5Akonadi)
- $(cmake-utils_use_find_package addressbook KF5Contacts)
- $(cmake-utils_use_find_package addressbook KF5IdentityManagement)
- -DENABLE_KBANKING=$(usex hbci)
- -DENABLE_LIBICAL=$(usex calendar)
- $(cmake-utils_use_find_package holidays KF5Holidays)
- -DENABLE_OFXIMPORTER=$(usex ofx)
- -DENABLE_WEBENGINE=OFF
- -DENABLE_WEBOOB=$(usex weboob)
- $(cmake-utils_use_find_package weboob PythonLibs)
- )
- kde5_src_configure
-}
-
-src_test() {
- # bug: 652636
- local myctestargs=(
- -E "(reports-chart-test)"
- )
-
- kde5_src_test
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
@ 2019-12-03 5:04 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-12-03 5:04 UTC (permalink / raw
To: gentoo-commits
commit: 9b32e473d0a82de08c6a1656f0d409bc8c797cd7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 2 17:16:53 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Dec 3 05:03:07 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b32e473
app-office/kmymoney: Drop 5.0.5
Package-Manager: Portage-2.3.80, Repoman-2.3.19
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/kmymoney/Manifest | 1 -
| 24 ----
app-office/kmymoney/kmymoney-5.0.5.ebuild | 125 ---------------------
3 files changed, 150 deletions(-)
diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index e0ef22397c2..897a1abef65 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,2 +1 @@
-DIST kmymoney-5.0.5.tar.xz 11706112 BLAKE2B 7c0e51ad2404a88affd7b99c8ca59b813b646a7d995b5d7f6db311c8813f2966d14b34271f3d9de73d07c763fb191e9f4c0737e64feb35a62cd719856c20bab1 SHA512 ba8033b974b93d47cd2a732a352025715845d3dff016a49babb6b724d5e9b726f84f5e2a1f1f42765a6ff35a00d3d995397f2831981d48cb8468d1407030584c
DIST kmymoney-5.0.7.tar.xz 11667088 BLAKE2B 4d523bb9ea5d41dc6aa6e52b0b982384c6e6ad3cf6981e961f137320a36fc395136b81dfd3b8c8085375c46dc9affaa5b746f9250cce72a6c8ad6af669e5109c SHA512 af0663bc7ac3fe59a8c7db09942bbb8a182ea5f7ee3bdc05e7ed449c7172040de2282997db95fcce823f7d3d8f6f2b43229b5e4ba3b349eb8ea3b2756636f6ed
diff --git a/app-office/kmymoney/files/kmymoney-5.0.5-missing-header.patch b/app-office/kmymoney/files/kmymoney-5.0.5-missing-header.patch
deleted file mode 100644
index d365607aecf..00000000000
--- a/app-office/kmymoney/files/kmymoney-5.0.5-missing-header.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b48fc8588f1fd98b116fce21ebfda6416f558146 Mon Sep 17 00:00:00 2001
-From: Luca Beltrame <lbeltrame@kde.org>
-Date: Sun, 21 Jul 2019 09:10:44 +0200
-Subject: Fix build with Qt 5.13
-
-Yet another case of QMap no longer being included.
----
- kmymoney/plugins/kmymoneyplugin.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/kmymoney/plugins/kmymoneyplugin.h b/kmymoney/plugins/kmymoneyplugin.h
-index abd6b64..ccff5d3 100644
---- a/kmymoney/plugins/kmymoneyplugin.h
-+++ b/kmymoney/plugins/kmymoneyplugin.h
-@@ -25,6 +25,7 @@
- // ----------------------------------------------------------------------------
- // QT Includes
-
-+#include <QMap>
- #include <QObject>
-
- // ----------------------------------------------------------------------------
---
-cgit v1.1
diff --git a/app-office/kmymoney/kmymoney-5.0.5.ebuild b/app-office/kmymoney/kmymoney-5.0.5.ebuild
deleted file mode 100644
index 44508ca3d7d..00000000000
--- a/app-office/kmymoney/kmymoney-5.0.5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 )
-
-KDE_HANDBOOK="optional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit kde5 python-single-r1
-
-DESCRIPTION="Personal finance manager based on KDE Frameworks"
-HOMEPAGE="https://kmymoney.org"
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
- KEYWORDS="amd64 x86"
-fi
-
-LICENSE="GPL-2"
-IUSE="activities addressbook calendar hbci holidays ofx quotes webkit weboob"
-
-REQUIRED_USE="weboob? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="virtual/pkgconfig"
-COMMON_DEPEND="
- $(add_frameworks_dep karchive)
- $(add_frameworks_dep kcmutils)
- $(add_frameworks_dep kcompletion)
- $(add_frameworks_dep kcodecs)
- $(add_frameworks_dep kconfig)
- $(add_frameworks_dep kconfigwidgets)
- $(add_frameworks_dep kcoreaddons)
- $(add_frameworks_dep ki18n)
- $(add_frameworks_dep kio)
- $(add_frameworks_dep kiconthemes)
- $(add_frameworks_dep kitemmodels)
- $(add_frameworks_dep kitemviews)
- $(add_frameworks_dep kjobwidgets)
- $(add_frameworks_dep knotifications)
- $(add_frameworks_dep kservice)
- $(add_frameworks_dep ktextwidgets)
- $(add_frameworks_dep kwallet)
- $(add_frameworks_dep kwidgetsaddons)
- $(add_frameworks_dep kxmlgui)
- $(add_frameworks_dep sonnet)
- $(add_qt_dep qtdbus)
- $(add_qt_dep qtgui)
- $(add_qt_dep qtnetwork)
- $(add_qt_dep qtprintsupport)
- $(add_qt_dep qtsql)
- $(add_qt_dep qtsvg)
- $(add_qt_dep qtwidgets)
- $(add_qt_dep qtxml)
- >=app-crypt/gpgme-1.7.1-r1[cxx]
- >=app-office/libalkimia-6.0.0
- dev-libs/gmp:0=
- dev-libs/kdiagram:5
- dev-libs/libgpg-error
- activities? ( $(add_frameworks_dep kactivities) )
- addressbook? (
- $(add_kdeapps_dep akonadi)
- $(add_kdeapps_dep kcontacts)
- $(add_kdeapps_dep kidentitymanagement)
- )
- calendar? ( dev-libs/libical:= )
- hbci? (
- >=net-libs/aqbanking-5.6.5
- >=sys-libs/gwenhywfar-4.15.3-r1[qt5]
- )
- holidays? ( $(add_frameworks_dep kholidays) )
- ofx? ( dev-libs/libofx )
- webkit? (
- $(add_frameworks_dep kdewebkit)
- >=dev-qt/qtwebkit-5.212.0_pre20180120:5
- )
- !webkit? ( $(add_qt_dep qtwebengine 'widgets') )
- weboob? (
- ${PYTHON_DEPS}
- $(add_qt_dep qtconcurrent)
- www-client/weboob[${PYTHON_USEDEP}]
- )
-"
-DEPEND="${COMMON_DEPEND}
- dev-libs/boost
-"
-RDEPEND="${COMMON_DEPEND}
- !app-office/kmymoney:4
- quotes? ( dev-perl/Finance-Quote )
-"
-
-PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
-
-pkg_setup() {
- use weboob && python_setup
- kde5_pkg_setup
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_QT_DESIGNER=OFF
- $(cmake-utils_use_find_package activities KF5Activities)
- $(cmake-utils_use_find_package addressbook KF5Akonadi)
- $(cmake-utils_use_find_package addressbook KF5Contacts)
- $(cmake-utils_use_find_package addressbook KF5IdentityManagement)
- -DENABLE_KBANKING=$(usex hbci)
- -DENABLE_LIBICAL=$(usex calendar)
- $(cmake-utils_use_find_package holidays KF5Holidays)
- -DENABLE_OFXIMPORTER=$(usex ofx)
- -DENABLE_WEBENGINE=$(usex !webkit)
- -DENABLE_WEBOOB=$(usex weboob)
- $(cmake-utils_use_find_package weboob PythonLibs)
- )
- kde5_src_configure
-}
-
-src_test() {
- # bug 652636; bug 673052: needs kmymoney installed to succeed
- local myctestargs=(
- -E "(reports-chart-test|qsqlcipher-test)"
- )
-
- kde5_src_test
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2019-12-03 5:04 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-05-10 8:01 [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2019-12-03 5:04 Andreas Sturmlechner
2018-12-13 18:00 Andreas Sturmlechner
2018-01-27 1:02 Michael Palimaka
2017-05-18 19:49 Andreas Sturmlechner
2016-11-25 21:52 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox