public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/
@ 2017-08-12  8:20 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2017-08-12  8:20 UTC (permalink / raw
  To: gentoo-commits

commit:     807894ae54d9743b03088f9315d492e286c352d1
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 08:19:50 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 08:20:18 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=807894ae

app-office/kmymoney: Fix build with cmake-3.9

Tested-by: David Zaslavsky <diazona <AT> ellipsix.net>
Gentoo-bug: 627672
Package-Manager: Portage-2.3.6, Repoman-2.3.3

 .../kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch  | 38 ++++++++++++++++++++++
 app-office/kmymoney/kmymoney-4.8.0-r2.ebuild       |  1 +
 2 files changed, 39 insertions(+)

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
new file mode 100644
index 00000000000..93e8809d824
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-4.8.0-cmake-3.9.patch
@@ -0,0 +1,38 @@
+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/kmymoney-4.8.0-r2.ebuild b/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
index 757dc00ef9c..b49b40c1df4 100644
--- a/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
+++ b/app-office/kmymoney/kmymoney-4.8.0-r2.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
 	"${FILESDIR}/${P}-gpgmepp.patch"
 	"${FILESDIR}/${P}-kdepimlibs-optional.patch"
 	"${FILESDIR}/${P}-drop-national-onlinetasks.patch"
+	"${FILESDIR}/${P}-cmake-3.9.patch"
 )
 
 src_prepare() {


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/
@ 2018-03-19 17:16 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2018-03-19 17:16 UTC (permalink / raw
  To: gentoo-commits

commit:     e7f7da88a13f7160f8289f377e997abf10b4897c
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 19 17:00:58 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Mar 19 17:15:40 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f7da88

app-office/kmymoney: Fix USE=weboob

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 .../kmymoney/files/kmymoney-5.0.1-cmake.patch      |  34 ++++++
 app-office/kmymoney/kmymoney-5.0.1-r1.ebuild       | 116 +++++++++++++++++++++
 2 files changed, 150 insertions(+)

diff --git a/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch b/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch
new file mode 100644
index 00000000000..7ba8349b0fe
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.0.1-cmake.patch
@@ -0,0 +1,34 @@
+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/kmymoney-5.0.1-r1.ebuild b/app-office/kmymoney/kmymoney-5.0.1-r1.ebuild
new file mode 100644
index 00000000000..76c12cf2c4f
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.0.1-r1.ebuild
@@ -0,0 +1,116 @@
+# 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-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)
+		$(add_kdeapps_dep kholidays)
+	) )
+	ofx? ( dev-libs/libofx )
+	weboob? (
+		${PYTHON_DEPS}
+		$(add_qt_dep qtconcurrent)
+		www-client/weboob
+	)
+"
+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" )
+
+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
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/
@ 2019-08-11  8:19 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2019-08-11  8:19 UTC (permalink / raw
  To: gentoo-commits

commit:     115c7151193fee87da50340202ffd39e1b8f3c57
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 11 08:13:13 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 11 08:19:26 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=115c7151

app-office/kmymoney: Fix missing header with Frameworks 5.61

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kmymoney-5.0.5-missing-header.patch      | 24 ++++++++++++++++++++++
 app-office/kmymoney/kmymoney-5.0.5.ebuild          |  2 ++
 2 files changed, 26 insertions(+)

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
new file mode 100644
index 00000000000..d365607aecf
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.0.5-missing-header.patch
@@ -0,0 +1,24 @@
+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
index 8ab83390352..96a0d4c95e4 100644
--- a/app-office/kmymoney/kmymoney-5.0.5.ebuild
+++ b/app-office/kmymoney/kmymoney-5.0.5.ebuild
@@ -90,6 +90,8 @@ RDEPEND="${COMMON_DEPEND}
 	quotes? ( dev-perl/Finance-Quote )
 "
 
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
+
 pkg_setup() {
 	use weboob && python_setup
 	kde5_pkg_setup


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/
@ 2022-02-10 20:10 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-02-10 20:10 UTC (permalink / raw
  To: gentoo-commits

commit:     972b3ec622b6c26162d4e557d1ae5d1bb8d5010d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 10 18:43:34 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Feb 10 20:09:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972b3ec6

app-office/kmymoney: Fix build with >=kde-apps/akonadi-21.12.0

EAPI-8 bump.

Closes: https://bugs.gentoo.org/831729
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/kmymoney-5.1.2-akonadi-21.12.0.patch     | 38 ++++++++++++++++++++++
 app-office/kmymoney/kmymoney-5.1.2.ebuild          |  6 ++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch b/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch
new file mode 100644
index 000000000000..2af212241ca6
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch
@@ -0,0 +1,38 @@
+From a06d2fe154f755c3af1e7f261cd631929b9da998 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
+Date: Sat, 2 Oct 2021 22:16:06 +0300
+Subject: [PATCH] Fix Compile for Newer Akonadi Builds
+
+---
+ kmymoney/mymoney/mymoneycontact.cpp | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/kmymoney/mymoney/mymoneycontact.cpp b/kmymoney/mymoney/mymoneycontact.cpp
+index acc3575ef..a32357290 100644
+--- a/kmymoney/mymoney/mymoneycontact.cpp
++++ b/kmymoney/mymoney/mymoneycontact.cpp
+@@ -8,11 +8,20 @@
+ #include "mymoneycontact.h"
+ 
+ #ifdef ENABLE_ADDRESSBOOK
+-#include <KIdentityManagement/IdentityManager>
+ #include <KIdentityManagement/Identity>
++#include <KIdentityManagement/IdentityManager>
++#include <akonadi_version.h>
++
++#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
++#include <Akonadi/Collection>
++#include <Akonadi/ItemFetchScope>
++#include <Akonadi/RecursiveItemFetchJob>
++#else
+ #include <AkonadiCore/RecursiveItemFetchJob>
+ #include <AkonadiCore/ItemFetchScope>
+ #include <AkonadiCore/Collection>
++#endif
++
+ #include <KContacts/Addressee>
+ #include <QRegularExpression>
+ #endif
+-- 
+GitLab
+

diff --git a/app-office/kmymoney/kmymoney-5.1.2.ebuild b/app-office/kmymoney/kmymoney-5.1.2.ebuild
index 6ad28d6b1537..963c4c37aea9 100644
--- a/app-office/kmymoney/kmymoney-5.1.2.ebuild
+++ b/app-office/kmymoney/kmymoney-5.1.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 EGIT_BRANCH="5.1"
 ECM_HANDBOOK="optional"
@@ -81,6 +81,8 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="virtual/pkgconfig"
 
+PATCHES=( "${FILESDIR}/${P}-akonadi-21.12.0.patch" )
+
 pkg_setup() {
 	ecm_pkg_setup
 


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/
@ 2022-08-05 15:23 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-08-05 15:23 UTC (permalink / raw
  To: gentoo-commits

commit:     8cdbb2a849e7dab47ca3af5f7737a521e5c1e65e
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 13:05:20 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 15:10:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cdbb2a8

app-office/kmymoney: add 5.1.3

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kmymoney/Manifest                       |   1 +
 .../kmymoney/files/kmymoney-5.1.3-cmake.patch      |  28 +++++
 app-office/kmymoney/kmymoney-5.1.3.ebuild          | 135 +++++++++++++++++++++
 3 files changed, 164 insertions(+)

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index 116a9b40e8c7..d589ec3043b6 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1 +1,2 @@
 DIST kmymoney-5.1.2.tar.xz 12640912 BLAKE2B 72abd190914eef258e6745ca9835de14bdb2060b0d025f8bdb1bc0e12b773fc891b143fe36adb8b7afcc86498601f6e1a7f9485f9a11c875f4c75bfe01d93738 SHA512 38c60998be4e3ffb49091eb2085b293c2d5265f6582e980d2dc60a66a00862b6afd3e2152c752a9fb14a7bf8b6255a0c39b69b65e2f5c976f23d965e3a1cdf46
+DIST kmymoney-5.1.3.tar.xz 12647372 BLAKE2B 09580873985bb41c39c649bdb863ee25f4356dfea18b64d45f3b6bd528fd57fc2b5fd32a6541c10ed519da0e905bf6853589e7cab0f4c3b4f2945cd7a3181dba SHA512 2003f25b7df77691e5d3d0f450e0139b1e68336f59a4fc78af751c5b94ecfaf17a39ee1f58ed0c2cda642195c5277fbb63c87e857ebe9a6495dc7f88b9a38794

diff --git a/app-office/kmymoney/files/kmymoney-5.1.3-cmake.patch b/app-office/kmymoney/files/kmymoney-5.1.3-cmake.patch
new file mode 100644
index 000000000000..da629c10f8a7
--- /dev/null
+++ b/app-office/kmymoney/files/kmymoney-5.1.3-cmake.patch
@@ -0,0 +1,28 @@
+From 32cfeb7380dbd886a79a6676544e11f3668f3f50 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Fri, 5 Aug 2022 10:33:50 +0200
+Subject: [PATCH] Revert "Fix missing components"
+
+See also: https://invent.kde.org/office/kmymoney/-/issues/63
+
+This reverts commit 151357b7293d27a966dc9e36321847b31fb0f69d.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9b49d5c2c..b30181da3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -116,7 +116,7 @@ endif()
+ find_package(Qt5 5.6 REQUIRED COMPONENTS
+   Core DBus Widgets Svg Xml Test PrintSupport)
+ find_package(Qt5 5.6 OPTIONAL_COMPONENTS
+-  Sql Concurrent QuickWidgets WebEngineWidgets WebKitWidgets)
++  Sql Concurrent QuickWidgets)
+ 
+ find_package(KF5 5.2 REQUIRED COMPONENTS
+   ${REQ_KF5_COMPONENTS})
+-- 
+2.35.1
+

diff --git a/app-office/kmymoney/kmymoney-5.1.3.ebuild b/app-office/kmymoney/kmymoney-5.1.3.ebuild
new file mode 100644
index 000000000000..657b7f2731d0
--- /dev/null
+++ b/app-office/kmymoney/kmymoney-5.1.3.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+EGIT_BRANCH="5.1"
+ECM_HANDBOOK="optional"
+ECM_TEST="forceoptional"
+KFMIN=5.82.0
+QTMIN=5.15.5
+VIRTUALX_REQUIRED="test"
+VIRTUALDBUS_TEST="true"
+inherit ecm kde.org optfeature
+
+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"
+SLOT="5"
+IUSE="activities addressbook calendar hbci holidays"
+[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
+
+RDEPEND="
+	>=app-crypt/gpgme-1.7.1-r1:=[cxx]
+	>=app-office/libalkimia-7.0.0:=
+	dev-db/sqlcipher
+	dev-libs/gmp:0=[cxx(+)]
+	dev-libs/kdiagram:5
+	dev-libs/libgpg-error
+	dev-libs/libofx:=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5
+	>=dev-qt/qtsvg-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kitemmodels-${KFMIN}:5
+	>=kde-frameworks/kitemviews-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwallet-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
+	addressbook? (
+		kde-apps/akonadi:5
+		kde-apps/kidentitymanagement:5
+		>=kde-frameworks/kcontacts-${KFMIN}:5
+	)
+	calendar? ( dev-libs/libical:= )
+	hbci? (
+		>=dev-qt/qtdeclarative-${QTMIN}:5
+		>=net-libs/aqbanking-6.0.1
+		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
+	)
+	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
+pkg_setup() {
+	ecm_pkg_setup
+
+	if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then
+		ewarn "USE experimental set: Building unfinished features."
+		ewarn "This *will* chew up your data. You have been warned."
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_OFXIMPORTER=ON
+		-DENABLE_WEBENGINE=ON
+		-DENABLE_WOOB=OFF # ported to Py3; not yet re-added in Gentoo
+		-DUSE_QT_DESIGNER=OFF
+		$(cmake_use_find_package activities KF5Activities)
+		$(cmake_use_find_package addressbook KF5Akonadi)
+		$(cmake_use_find_package addressbook KF5Contacts)
+		$(cmake_use_find_package addressbook KF5IdentityManagement)
+		-DENABLE_LIBICAL=$(usex calendar)
+		-DENABLE_KBANKING=$(usex hbci)
+		$(cmake_use_find_package holidays KF5Holidays)
+	)
+	[[ ${KDE_BUILD_TYPE} = live ]] &&
+		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
+
+	ecm_src_configure
+}
+
+src_test() {
+	# bug 652636; bug 673052: needs kmymoney installed to succeed
+	local myctestargs=(
+		-E "(reports-chart-test|qsqlcipher-test)"
+	)
+
+	ecm_src_test
+}
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "more options for online stock quote retrieval" dev-perl/Finance-Quote
+	fi
+	if has_version "app-office/kmymoney[quotes]"; then
+		elog "Please note: IUSE=quotes flag is gone in ${PN}-5.1.1. ${PN} still"
+		elog "does online stock quote retrieval without it, but dev-perl/Finance-Quote"
+		elog "may provide additional sources. To keep the functionality, run:"
+		elog "  emerge --noreplace dev-perl/Finance-Quote"
+	fi
+	ecm_pkg_postinst
+}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/
@ 2022-09-16  7:59 Andreas Sturmlechner
  0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2022-09-16  7:59 UTC (permalink / raw
  To: gentoo-commits

commit:     255158d69c21f59e761ac132b19b0ad1761f1f70
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 16 07:25:17 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Sep 16 07:59:04 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255158d6

app-office/kmymoney: drop 5.1.2-r1

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 app-office/kmymoney/Manifest                       |   1 -
 .../files/kmymoney-5.1.2-akonadi-21.12.0.patch     |  38 ------
 app-office/kmymoney/kmymoney-5.1.2-r1.ebuild       | 135 ---------------------
 3 files changed, 174 deletions(-)

diff --git a/app-office/kmymoney/Manifest b/app-office/kmymoney/Manifest
index d589ec3043b6..339a3d985311 100644
--- a/app-office/kmymoney/Manifest
+++ b/app-office/kmymoney/Manifest
@@ -1,2 +1 @@
-DIST kmymoney-5.1.2.tar.xz 12640912 BLAKE2B 72abd190914eef258e6745ca9835de14bdb2060b0d025f8bdb1bc0e12b773fc891b143fe36adb8b7afcc86498601f6e1a7f9485f9a11c875f4c75bfe01d93738 SHA512 38c60998be4e3ffb49091eb2085b293c2d5265f6582e980d2dc60a66a00862b6afd3e2152c752a9fb14a7bf8b6255a0c39b69b65e2f5c976f23d965e3a1cdf46
 DIST kmymoney-5.1.3.tar.xz 12647372 BLAKE2B 09580873985bb41c39c649bdb863ee25f4356dfea18b64d45f3b6bd528fd57fc2b5fd32a6541c10ed519da0e905bf6853589e7cab0f4c3b4f2945cd7a3181dba SHA512 2003f25b7df77691e5d3d0f450e0139b1e68336f59a4fc78af751c5b94ecfaf17a39ee1f58ed0c2cda642195c5277fbb63c87e857ebe9a6495dc7f88b9a38794

diff --git a/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch b/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch
deleted file mode 100644
index 2af212241ca6..000000000000
--- a/app-office/kmymoney/files/kmymoney-5.1.2-akonadi-21.12.0.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From a06d2fe154f755c3af1e7f261cd631929b9da998 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?=C3=96mer=20Fad=C4=B1l=20USTA?= <omerusta@gmail.com>
-Date: Sat, 2 Oct 2021 22:16:06 +0300
-Subject: [PATCH] Fix Compile for Newer Akonadi Builds
-
----
- kmymoney/mymoney/mymoneycontact.cpp | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/kmymoney/mymoney/mymoneycontact.cpp b/kmymoney/mymoney/mymoneycontact.cpp
-index acc3575ef..a32357290 100644
---- a/kmymoney/mymoney/mymoneycontact.cpp
-+++ b/kmymoney/mymoney/mymoneycontact.cpp
-@@ -8,11 +8,20 @@
- #include "mymoneycontact.h"
- 
- #ifdef ENABLE_ADDRESSBOOK
--#include <KIdentityManagement/IdentityManager>
- #include <KIdentityManagement/Identity>
-+#include <KIdentityManagement/IdentityManager>
-+#include <akonadi_version.h>
-+
-+#if AKONADI_VERSION >= QT_VERSION_CHECK(5, 18, 41)
-+#include <Akonadi/Collection>
-+#include <Akonadi/ItemFetchScope>
-+#include <Akonadi/RecursiveItemFetchJob>
-+#else
- #include <AkonadiCore/RecursiveItemFetchJob>
- #include <AkonadiCore/ItemFetchScope>
- #include <AkonadiCore/Collection>
-+#endif
-+
- #include <KContacts/Addressee>
- #include <QRegularExpression>
- #endif
--- 
-GitLab
-

diff --git a/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild b/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild
deleted file mode 100644
index 44c995198e83..000000000000
--- a/app-office/kmymoney/kmymoney-5.1.2-r1.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-EGIT_BRANCH="5.1"
-ECM_HANDBOOK="optional"
-ECM_TEST="forceoptional"
-KFMIN=5.74.0
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-VIRTUALDBUS_TEST="true"
-inherit ecm kde.org optfeature
-
-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"
-SLOT="5"
-IUSE="activities addressbook calendar hbci holidays"
-[[ ${KDE_BUILD_TYPE} = live ]] && IUSE+=" experimental"
-
-RDEPEND="
-	>=app-crypt/gpgme-1.7.1-r1:=[cxx]
-	>=app-office/libalkimia-7.0.0:=
-	dev-db/sqlcipher
-	dev-libs/gmp:0=[cxx(+)]
-	dev-libs/kdiagram:5
-	dev-libs/libgpg-error
-	dev-libs/libofx:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtprintsupport-${QTMIN}:5
-	>=dev-qt/qtsql-${QTMIN}:5
-	>=dev-qt/qtsvg-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcodecs-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kiconthemes-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemmodels-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/kjobwidgets-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	activities? ( >=kde-frameworks/kactivities-${KFMIN}:5 )
-	addressbook? (
-		kde-apps/akonadi:5
-		kde-apps/kidentitymanagement:5
-		>=kde-frameworks/kcontacts-${KFMIN}:5
-	)
-	calendar? ( dev-libs/libical:= )
-	hbci? (
-		>=dev-qt/qtdeclarative-${QTMIN}:5
-		>=net-libs/aqbanking-6.0.1
-		>=sys-libs/gwenhywfar-5.1.2:=[qt5]
-	)
-	holidays? ( >=kde-frameworks/kholidays-${KFMIN}:5 )
-"
-DEPEND="${RDEPEND}
-	dev-libs/boost
-"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${P}-akonadi-21.12.0.patch" )
-
-pkg_setup() {
-	ecm_pkg_setup
-
-	if [[ ${KDE_BUILD_TYPE} = live ]] && use experimental; then
-		ewarn "USE experimental set: Building unfinished features."
-		ewarn "This *will* chew up your data. You have been warned."
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_OFXIMPORTER=ON
-		-DENABLE_WEBENGINE=ON
-		-DENABLE_WEBOOB=OFF # ported to Py3; not yet re-added in Gentoo
-		-DUSE_QT_DESIGNER=OFF
-		$(cmake_use_find_package activities KF5Activities)
-		$(cmake_use_find_package addressbook KF5Akonadi)
-		$(cmake_use_find_package addressbook KF5Contacts)
-		$(cmake_use_find_package addressbook KF5IdentityManagement)
-		-DENABLE_LIBICAL=$(usex calendar)
-		-DENABLE_KBANKING=$(usex hbci)
-		$(cmake_use_find_package holidays KF5Holidays)
-	)
-	[[ ${KDE_BUILD_TYPE} = live ]] &&
-		mycmakeargs+=( -DENABLE_UNFINISHEDFEATURES=$(usex experimental) )
-
-	ecm_src_configure
-}
-
-src_test() {
-	# bug 652636; bug 673052: needs kmymoney installed to succeed
-	local myctestargs=(
-		-E "(reports-chart-test|qsqlcipher-test)"
-	)
-
-	ecm_src_test
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "more options for online stock quote retrieval" dev-perl/Finance-Quote
-	fi
-	if has_version "app-office/kmymoney[quotes]"; then
-		elog "Please note: IUSE=quotes flag is gone in ${PN}-5.1.1. ${PN} still"
-		elog "does online stock quote retrieval without it, but dev-perl/Finance-Quote"
-		elog "may provide additional sources. To keep the functionality, run:"
-		elog "  emerge --noreplace dev-perl/Finance-Quote"
-	fi
-	ecm_pkg_postinst
-}


^ permalink raw reply related	[flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-09-16  7:59 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-19 17:16 [gentoo-commits] repo/gentoo:master commit in: app-office/kmymoney/files/, app-office/kmymoney/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2022-09-16  7:59 Andreas Sturmlechner
2022-08-05 15:23 Andreas Sturmlechner
2022-02-10 20:10 Andreas Sturmlechner
2019-08-11  8:19 Andreas Sturmlechner
2017-08-12  8:20 Andreas Sturmlechner

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox