[gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
commit: 9b32e473d0a82de08c6a1656f0d409bc8c797cd7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Dec 2 17:16:53 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Dec 3 05:03:07 2019 + 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 gentoo.org> app-office/kmymoney/Manifest | 1 - .../files/kmymoney-5.0.5-missing-header.patch | 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..000 --- 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 -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 - #include - - // --- -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..000 --- 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?
[gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
commit: 9eeaff895f32e6486b258b31a29b461b6d9250d1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Dec 13 17:49:31 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Dec 13 17:49:31 2018 + 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 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..000 --- 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 -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..000 --- 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 -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 - #include - #include -+#include - #include - - #include --- -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..000 --- 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) -
[gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
commit: 028175e62748f872494c2422deef19c2f5c69734 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 10 07:57:32 2018 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 10 08:01:10 2018 + 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 000..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+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 + #include + #include ++#include + #include + + #include +-- +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
[gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
commit: 4d996b040bbd0994062a6cc61703790344393a06 Author: Michael Palimaka gentoo org> AuthorDate: Sat Jan 27 00:59:27 2018 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Jan 27 01:01:52 2018 + 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 883635a9441cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381 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..000 --- 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..000 --- 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-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 -+
[gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
commit: 7ba20123fc43fc66d5151005ae529163ac030db3 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu May 18 19:15:45 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu May 18 19:48:03 2017 + 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 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 000..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+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 + + #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 AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits) +-{ +- Q_CHECK_PTR(aqlimits); +- +- QSharedPointer 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(); +-} +- + /** @todo Check if AB_TransactionLimits_GetMaxLenCustomerReference really is the limit for the sepa reference */ + QSharedPointer 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 AB_TransactionLimits_toGermanOnlineTaskSettings(const AB_TRANSACTION_LIMITS* aqlimits); +- +-/** + * @brief AB_TransactionLimits_toSepaOnlineTaskSettings + * @param aqlimits IN + */ +diff --git a/kmymoney/plugins/kbanking/mymoneybanking.cpp
[gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/, app-office/kmymoney/files/
commit: fed58623179ae14348a0f374a834e22fc830dff2 Author: Andreas Sturmlechner gmail com> AuthorDate: Wed Oct 26 10:55:25 2016 + Commit: Patrice Clement gentoo org> CommitDate: Fri Nov 25 21:52:10 2016 + 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 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 883635a9441cbe3d6c835fe1dbc1cc5ed5cc834f76c945030ec680aee4fc6ceb367fdde811672a392eb5cd7b735c858e0be5a7f7964a4ccf5f9ba8865381 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 ..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 ..4f84a17 --- /dev/null +++ b/app-office/kmymoney/files/kmymoney-4.8.0-fix-csvdialog.patch @@ -0,0 +1,22 @@ +From: Łukasz Wojniłowicz+Date: Sat, 06 Aug 2016 11:14:18 + +Subject: Remove Qt::WindowStaysOnTopHint from CSV dialog +X-Git-Url: http://quickgit.kde.org/?p=kmymoney.git=commitdiff=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 ..7b76eb1 --- /dev/null +++