From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2B3B51581D3 for ; Sat, 18 May 2024 18:16:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D25ECE2A2E; Sat, 18 May 2024 18:16:46 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B2DB6E2A2E for ; Sat, 18 May 2024 18:16:46 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AC5FE33BEBB for ; Sat, 18 May 2024 18:16:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 228AF1ADC for ; Sat, 18 May 2024 18:16:44 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1716056094.cbc6ba105966f3f894dd30a3bff23ff28e78b782.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: app-office/merkuro/ X-VCS-Repository: proj/kde X-VCS-Files: app-office/merkuro/merkuro-24.05.49.9999.ebuild app-office/merkuro/merkuro-9999.ebuild X-VCS-Directories: app-office/merkuro/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: cbc6ba105966f3f894dd30a3bff23ff28e78b782 X-VCS-Branch: master Date: Sat, 18 May 2024 18:16:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: af15ef8c-2356-4c18-b214-f2a8a16d40bd X-Archives-Hash: a6aa00fa8c9af7d15b640eb8faea2308 commit: cbc6ba105966f3f894dd30a3bff23ff28e78b782 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat May 18 17:47:05 2024 +0000 Commit: Andreas Sturmlechner gentoo 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 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]