[gentoo-commits] proj/kde:master commit in: app-office/merkuro/
commit: cbc6ba105966f3f894dd30a3bff23ff28e78b782
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sat May 18 17:47:05 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sat May 18 18:14:54 2024 +
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 gentoo.org>
app-office/merkuro/merkuro-24.05.49..ebuild | 4 ++--
app-office/merkuro/merkuro-.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/app-office/merkuro/merkuro-24.05.49..ebuild
b/app-office/merkuro/merkuro-24.05.49..ebuild
index e4b1a338f3..2776ab988a 100644
--- a/app-office/merkuro/merkuro-24.05.49..ebuild
+++ b/app-office/merkuro/merkuro-24.05.49..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-.ebuild
b/app-office/merkuro/merkuro-.ebuild
index e4b1a338f3..2776ab988a 100644
--- a/app-office/merkuro/merkuro-.ebuild
+++ b/app-office/merkuro/merkuro-.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]
[gentoo-commits] proj/kde:master commit in: app-office/merkuro/
commit: ff4e2629442155044d5f061acded04ae1d911c58
Author: Sam James gentoo org>
AuthorDate: Sun Feb 25 21:26:20 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 25 21:33:44 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ff4e2629
app-office/merkuro: refresh deps
* Add kmailtransport (upstream commit 1191aab21e066f3045634ad238503a39a8bc8f1b)
* Add kmbox, kmime (upstream commit c75d1a55c02f37ff2677fa95ed4a6344a9d015bd)
* Add TODO re qt5compat (upstream commit
578c2acf4da3e7b26206a9834a79928630f76ecf)
* Add TODO re kmessagecomposer (upstream commit
d06a8a8f85e0ebb87d79878ef2231991ab93f254)
Signed-off-by: Sam James gentoo.org>
app-office/merkuro/merkuro-.ebuild | 5 +
1 file changed, 5 insertions(+)
diff --git a/app-office/merkuro/merkuro-.ebuild
b/app-office/merkuro/merkuro-.ebuild
index bc2c6a57e7..2ddad73239 100644
--- a/app-office/merkuro/merkuro-.ebuild
+++ b/app-office/merkuro/merkuro-.ebuild
@@ -21,6 +21,7 @@ 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
@@ -32,6 +33,9 @@ DEPEND="
>=kde-apps/akonadi-mime-${PVCUT}:6
>=kde-apps/kcalutils-${PVCUT}:6
>=kde-apps/kidentitymanagement-${PVCUT}:6
+ >=kde-apps/kmailtransport-${PVCUT}:6
+ >=kde-apps/kmbox-${PVCUT}:6
+ >=kde-apps/kmime-${PVCUT}:6
>=kde-apps/mailcommon-${PVCUT}:6
>=kde-apps/mimetreeparser-${PVCUT}:6
>=kde-frameworks/kcalendarcore-${KFMIN}:6
@@ -47,6 +51,7 @@ DEPEND="
>=kde-frameworks/kwindowsystem-${KFMIN}:6
>=kde-frameworks/kxmlgui-${KFMIN}:6
"
+# TODO: is qt5compat still needed? 578c2acf4da3e7b26206a9834a79928630f76ecf
# qtlocation is needed at runtime only or fails to start
RDEPEND="${DEPEND}
>=dev-qt/qt5compat-${QTMIN}:6[qml]
[gentoo-commits] proj/kde:master commit in: app-office/merkuro/
commit: 40d41cf9d8ae8f8630908ccd6fe16888044da2fe
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Sun Jan 7 18:03:22 2024 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Sun Jan 7 18:04:59 2024 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=40d41cf9
app-office/merkuro: Add new dependency
Signed-off-by: Andreas Sturmlechner gentoo.org>
app-office/merkuro/merkuro-24.02.49..ebuild | 1 +
app-office/merkuro/merkuro-.ebuild | 1 +
2 files changed, 2 insertions(+)
diff --git a/app-office/merkuro/merkuro-24.02.49..ebuild
b/app-office/merkuro/merkuro-24.02.49..ebuild
index ecc1277db7..0aa72efa9d 100644
--- a/app-office/merkuro/merkuro-24.02.49..ebuild
+++ b/app-office/merkuro/merkuro-24.02.49..ebuild
@@ -33,6 +33,7 @@ DEPEND="
>=kde-apps/kcalutils-${PVCUT}:6
>=kde-apps/kidentitymanagement-${PVCUT}:6
>=kde-apps/mailcommon-${PVCUT}:6
+ >=kde-apps/mimetreeparser-${PVCUT}:6
>=kde-frameworks/kcalendarcore-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcontacts-${KFMIN}:6
diff --git a/app-office/merkuro/merkuro-.ebuild
b/app-office/merkuro/merkuro-.ebuild
index ecc1277db7..0aa72efa9d 100644
--- a/app-office/merkuro/merkuro-.ebuild
+++ b/app-office/merkuro/merkuro-.ebuild
@@ -33,6 +33,7 @@ DEPEND="
>=kde-apps/kcalutils-${PVCUT}:6
>=kde-apps/kidentitymanagement-${PVCUT}:6
>=kde-apps/mailcommon-${PVCUT}:6
+ >=kde-apps/mimetreeparser-${PVCUT}:6
>=kde-frameworks/kcalendarcore-${KFMIN}:6
>=kde-frameworks/kconfigwidgets-${KFMIN}:6
>=kde-frameworks/kcontacts-${KFMIN}:6
[gentoo-commits] proj/kde:master commit in: app-office/merkuro/
commit: 325a023ff788ceb006dfd390c0fa582362c4 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Dec 23 09:16:08 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Dec 23 15:46:24 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=325a app-office/merkuro: update HOMEPAGE Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Andreas Sturmlechner gentoo.org> app-office/merkuro/merkuro-23.08.49..ebuild | 2 +- app-office/merkuro/merkuro-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app-office/merkuro/merkuro-23.08.49..ebuild b/app-office/merkuro/merkuro-23.08.49..ebuild index 680605a913..68b9daa46b 100644 --- a/app-office/merkuro/merkuro-23.08.49..ebuild +++ b/app-office/merkuro/merkuro-23.08.49..ebuild @@ -11,7 +11,7 @@ QTMIN=5.15.9 inherit ecm gear.kde.org DESCRIPTION="Calendar application using Akonadi" -HOMEPAGE="https://apps.kde.org/kalendar/; +HOMEPAGE="https://apps.kde.org/merkuro.calendar/; LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" SLOT="5" diff --git a/app-office/merkuro/merkuro-.ebuild b/app-office/merkuro/merkuro-.ebuild index 5acdbe06c4..d15a31bfc1 100644 --- a/app-office/merkuro/merkuro-.ebuild +++ b/app-office/merkuro/merkuro-.ebuild @@ -11,7 +11,7 @@ QTMIN=6.6.0 inherit ecm gear.kde.org DESCRIPTION="Calendar application using Akonadi" -HOMEPAGE="https://apps.kde.org/kalendar/; +HOMEPAGE="https://apps.kde.org/merkuro.calendar/; LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0" SLOT="6"
[gentoo-commits] proj/kde:master commit in: app-office/merkuro/
commit: c5ef13acabaa6d53bdf72c6b86744b17b1a99510
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Dec 6 21:34:11 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun Dec 17 12:04:28 2023 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=c5ef13ac
app-office/merkuro: Port to KF6
Signed-off-by: Andreas Sturmlechner gentoo.org>
Signed-off-by: Sam James gentoo.org>
app-office/merkuro/merkuro-.ebuild | 62 --
1 file changed, 30 insertions(+), 32 deletions(-)
diff --git a/app-office/merkuro/merkuro-.ebuild
b/app-office/merkuro/merkuro-.ebuild
index 680605a913..a3cd63d41a 100644
--- a/app-office/merkuro/merkuro-.ebuild
+++ b/app-office/merkuro/merkuro-.ebuild
@@ -6,15 +6,15 @@ EAPI=8
KDE_ORG_CATEGORY="pim"
ECM_TEST="forceoptional"
PVCUT=$(ver_cut 1-3)
-KFMIN=5.106.0
-QTMIN=5.15.9
+KFMIN=5.245.0
+QTMIN=6.6.0
inherit ecm gear.kde.org
DESCRIPTION="Calendar application using Akonadi"
HOMEPAGE="https://apps.kde.org/kalendar/;
LICENSE="|| ( GPL-2 GPL-3 ) CC0-1.0"
-SLOT="5"
+SLOT="6"
KEYWORDS=""
IUSE=""
@@ -23,36 +23,34 @@ RESTRICT="test"
DEPEND="
app-crypt/gpgme:=[cxx]
- >=dev-libs/kirigami-addons-0.7.2:5
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtquickcontrols2-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=kde-apps/akonadi-${PVCUT}:5
- >=kde-apps/akonadi-contacts-${PVCUT}:5
- >=kde-apps/akonadi-mime-${PVCUT}:5
- >=kde-apps/kcalutils-${PVCUT}:5
- >=kde-apps/kidentitymanagement-${PVCUT}:5
- >=kde-apps/mailcommon-${PVCUT}:5
- >=kde-frameworks/kcalendarcore-${KFMIN}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcontacts-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kdbusaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kiconthemes-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/kirigami-${KFMIN}:5
- >=kde-frameworks/kitemmodels-${KFMIN}:5
- >=kde-frameworks/kwindowsystem-${KFMIN}:5
- >=kde-frameworks/kxmlgui-${KFMIN}:5
+ dev-libs/kirigami-addons:6
+ >=dev-qt/qtbase-${QTMIN}:6[dbus,gui]
+ >=dev-qt/qtdeclarative-${QTMIN}:6
+ >=dev-qt/qtsvg-${QTMIN}:6
+ >=kde-apps/akonadi-${PVCUT}:6
+ >=kde-apps/akonadi-contacts-${PVCUT}:6
+ >=kde-apps/akonadi-mime-${PVCUT}:6
+ >=kde-apps/kcalutils-${PVCUT}:6
+ >=kde-apps/kidentitymanagement-${PVCUT}:6
+ >=kde-apps/mailcommon-${PVCUT}:6
+ >=kde-frameworks/kcalendarcore-${KFMIN}:6
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:6
+ >=kde-frameworks/kcontacts-${KFMIN}:6
+ >=kde-frameworks/kcoreaddons-${KFMIN}:6
+ >=kde-frameworks/kdbusaddons-${KFMIN}:6
+ >=kde-frameworks/ki18n-${KFMIN}:6
+ >=kde-frameworks/kiconthemes-${KFMIN}:6
+ >=kde-frameworks/kio-${KFMIN}:6
+ >=kde-frameworks/kirigami-${KFMIN}:6
+ >=kde-frameworks/kitemmodels-${KFMIN}:6
+ >=kde-frameworks/kwindowsystem-${KFMIN}:6
+ >=kde-frameworks/kxmlgui-${KFMIN}:6
"
# qtlocation is needed at runtime only or fails to start
RDEPEND="${DEPEND}
- >=dev-qt/qtgraphicaleffects-${QTMIN}:5
- >=dev-qt/qtlocation-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5
- >=kde-apps/kdepim-runtime-${PVCUT}:5
- >=kde-frameworks/qqc2-desktop-style-${KFMIN}:5
+ >=dev-qt/qt5compat-${QTMIN}:6[qml]
+ >=dev-qt/qtlocation-${QTMIN}:6
+ >=dev-qt/qtwebengine-${QTMIN}:6
+ >=kde-apps/kdepim-runtime-${PVCUT}:6
+ >=kde-frameworks/qqc2-desktop-style-${KFMIN}:6
"
