commit: cbc6ba105966f3f894dd30a3bff23ff28e78b782
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat May 18 17:47:05 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat May 18 18:14:54 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=cbc6ba10
app-office/merkuro: Fix TODOs (KPim6MessageComposer/Qt5Compat)
KPim6MessageComposer is part of kde-apps/messagelib:6, see upstream
commit d06a8a8f85e0ebb87d79878ef2231991ab93f254
dev-qt/qt5compat[qml] is still in use
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-office/merkuro/merkuro-24.05.49.9999.ebuild | 4 ++--
app-office/merkuro/merkuro-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/merkuro/merkuro-24.05.49.9999.ebuild
b/app-office/merkuro/merkuro-24.05.49.9999.ebuild
index e4b1a338f3..2776ab988a 100644
--- a/app-office/merkuro/merkuro-24.05.49.9999.ebuild
+++ b/app-office/merkuro/merkuro-24.05.49.9999.ebuild
@@ -21,7 +21,6 @@ IUSE=""
# All of the tests involve interacting with akonadi right now (as of 22.04)
RESTRICT="test"
-# TODO: Needs messagecomposer
DEPEND="
app-crypt/gpgme:=[cxx]
dev-libs/kirigami-addons:6
@@ -38,6 +37,7 @@ DEPEND="
>=kde-apps/kmime-${PVCUT}:6
>=kde-apps/mailcommon-${PVCUT}:6
>=kde-apps/mimetreeparser-${PVCUT}:6
+ >=kde-apps/messagelib-${PVCUT}:6
>=kde-frameworks/kcalendarcore-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcontacts-${KFMIN}:6
@@ -51,7 +51,7 @@ DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
"
-# TODO: is qt5compat still needed? 578c2acf4da3e7b26206a9834a79928630f76ecf
+# Qt5Compat.GraphicalEffects usage in multiple QML files
# qtlocation is needed at runtime only or fails to start
RDEPEND="${DEPEND}
>=dev-qt/qt5compat-${QTMIN}:6[qml]
diff --git a/app-office/merkuro/merkuro-9999.ebuild
b/app-office/merkuro/merkuro-9999.ebuild
index e4b1a338f3..2776ab988a 100644
--- a/app-office/merkuro/merkuro-9999.ebuild
+++ b/app-office/merkuro/merkuro-9999.ebuild
@@ -21,7 +21,6 @@ IUSE=""
# All of the tests involve interacting with akonadi right now (as of 22.04)
RESTRICT="test"
-# TODO: Needs messagecomposer
DEPEND="
app-crypt/gpgme:=[cxx]
dev-libs/kirigami-addons:6
@@ -38,6 +37,7 @@ DEPEND="
>=kde-apps/kmime-${PVCUT}:6
>=kde-apps/mailcommon-${PVCUT}:6
>=kde-apps/mimetreeparser-${PVCUT}:6
+ >=kde-apps/messagelib-${PVCUT}:6
>=kde-frameworks/kcalendarcore-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcontacts-${KFMIN}:6
@@ -51,7 +51,7 @@ DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
"
-# TODO: is qt5compat still needed? 578c2acf4da3e7b26206a9834a79928630f76ecf
+# Qt5Compat.GraphicalEffects usage in multiple QML files
# qtlocation is needed at runtime only or fails to start
RDEPEND="${DEPEND}
>=dev-qt/qt5compat-${QTMIN}:6[qml]
