[gentoo-commits] repo/gentoo:master commit in: kde-apps/messagelib/files/, kde-apps/messagelib/

[Sam James]

commit:     fb98b0d3d2e6c14ca718de5a3e13d62a799998bc
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Aug  5 03:39:10 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  5 03:39:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb98b0d3

kde-apps/messagelib: backport cmake 3.24.0 fixes

Noticed because Exherbo had backported these. May impact
reverse dependencies.

(Affects installed cmake config files.)

Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/messagelib-22.04.3-cmake-3.24.0.patch    | 64 ++++++++++++++++++
 kde-apps/messagelib/messagelib-22.04.3-r1.ebuild   | 77 ++++++++++++++++++++++
 2 files changed, 141 insertions(+)

diff --git a/kde-apps/messagelib/files/messagelib-22.04.3-cmake-3.24.0.patch b/kde-apps/messagelib/files/messagelib-22.04.3-cmake-3.24.0.patch
new file mode 100644
index 000000000000..98406d9950c8
--- /dev/null
+++ b/kde-apps/messagelib/files/messagelib-22.04.3-cmake-3.24.0.patch
@@ -0,0 +1,64 @@
+https://invent.kde.org/pim/messagelib/-/commit/6eaef36d42bdb05f3412c178e53077fb6224ff80
+https://invent.kde.org/pim/messagelib/-/commit/3edc93673f94604c203be1c899dffb25575985db
+
+From 6eaef36d42bdb05f3412c178e53077fb6224ff80 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@×××.org>
+Date: Wed, 25 May 2022 08:50:26 +0200
+Subject: [PATCH] Use WebEngineWidgets as WebEngine is not define in qt6
+
+--- a/webengineviewer/KF5WebEngineViewerConfig.cmake.in
++++ b/webengineviewer/KF5WebEngineViewerConfig.cmake.in
+@@ -1,4 +1,4 @@
+ @PACKAGE_INIT@
+ include(CMakeFindDependencyMacro)
+-find_dependency(Qt@QT_MAJOR_VERSION@WebEngine "@QT_REQUIRED_VERSION@")
++find_dependency(Qt@QT_MAJOR_VERSION@WebEngineWidgets "@QT_REQUIRED_VERSION@")
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5WebEngineViewerTargets.cmake")
+GitLab
+From 3edc93673f94604c203be1c899dffb25575985db Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heiko.becker@×××.org>
+Date: Sun, 17 Jul 2022 00:07:56 +0200
+Subject: [PATCH] Add missing find_dependency calls
+
+There are probably more used in the public link interface, but these
+were enough to fix building dependents with cmake 3.24.0-rc3, which
+seems to be stricter than 3.23.x.
+--- a/messagecomposer/KF5MessageComposerConfig.cmake.in
++++ b/messagecomposer/KF5MessageComposerConfig.cmake.in
+@@ -2,6 +2,7 @@
+ include(CMakeFindDependencyMacro)
+ find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
+ find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@")
++find_dependency(KF5TemplateParser "@MESSAGELIB_LIB_VERSION@")
+ find_dependency(KF5PimCommon "@PIMCOMMON_LIB_VERSION@")
+ find_dependency(KF5Akonadi "@AKONADI_VERSION@")
+ find_dependency(KF5IdentityManagement "@IDENTITYMANAGEMENT_LIB_VERSION@")
+--- a/messagecore/KF5MessageCoreConfig.cmake.in
++++ b/messagecore/KF5MessageCoreConfig.cmake.in
+@@ -1,4 +1,5 @@
+ @PACKAGE_INIT@
+ include(CMakeFindDependencyMacro)
+ find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
++find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@")
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5MessageCoreTargets.cmake")
+--- a/messageviewer/KF5MessageViewerConfig.cmake.in
++++ b/messageviewer/KF5MessageViewerConfig.cmake.in
+@@ -3,6 +3,7 @@ include(CMakeFindDependencyMacro)
+ find_dependency(KF5PimCommon "@PIMCOMMON_LIB_VERSION@")
+ find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@")
+ find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@")
++find_dependency(KF5WebEngineViewer "@MESSAGELIB_LIB_VERSION@")
+ find_dependency(KF5Akonadi "@AKONADI_VERSION@")
+ find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
+ find_dependency(KF5Contacts "@KF5_MIN_VERSION@")
+--- a/templateparser/KF5TemplateParserConfig.cmake.in
++++ b/templateparser/KF5TemplateParserConfig.cmake.in
+@@ -1,3 +1,7 @@
+ @PACKAGE_INIT@
+ 
++include(CMakeFindDependencyMacro)
++find_dependency(KF5MimeTreeParser "@MESSAGELIB_LIB_VERSION@")
++find_dependency(KF5MessageCore "@MESSAGELIB_LIB_VERSION@")
++
+ include("${CMAKE_CURRENT_LIST_DIR}/KF5TemplateParserTargets.cmake")
+GitLab

diff --git a/kde-apps/messagelib/messagelib-22.04.3-r1.ebuild b/kde-apps/messagelib/messagelib-22.04.3-r1.ebuild
new file mode 100644
index 000000000000..5c2b480688fc
--- /dev/null
+++ b/kde-apps/messagelib/messagelib-22.04.3-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_QTHELP="true"
+ECM_TEST="forceoptional"
+PVCUT=$(ver_cut 1-3)
+KFMIN=5.92.0
+QTMIN=5.15.4
+VIRTUALX_REQUIRED="test"
+inherit ecm gear.kde.org
+
+DESCRIPTION="Libraries for messaging functions"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="speech"
+
+# bug 579630
+RESTRICT="test"
+
+DEPEND="
+	>=app-crypt/gpgme-1.8.0-r1:=[cxx,qt5]
+	>=app-crypt/qca-2.3.0:2
+	>=dev-libs/grantlee-5.2.0:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-search-${PVCUT}:5
+	>=kde-apps/grantleetheme-${PVCUT}:5
+	>=kde-apps/incidenceeditor-${PVCUT}:5
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmbox-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/kpimtextedit-${PVCUT}:5[speech=]
+	>=kde-apps/libgravatar-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
+	>=kde-apps/libkleo-${PVCUT}:5
+	>=kde-frameworks/karchive-${KFMIN}:5
+	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcodecs-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcontacts-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${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/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/sonnet-${KFMIN}:5
+	>=kde-frameworks/syntax-highlighting-${KFMIN}:5
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-3.24.0.patch
+)