commit: e44e1a86f64f29e2e933a71a0a9e59a516d61245 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Apr 18 12:54:04 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Apr 18 12:54:15 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e44e1a86
kde-apps/khelpcenter: Fix build with Qt 5.15 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../files/khelpcenter-20.04.0-qt-5.15.patch | 39 ++++++++++++++++++++++ kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild | 2 ++ 2 files changed, 41 insertions(+) diff --git a/kde-apps/khelpcenter/files/khelpcenter-20.04.0-qt-5.15.patch b/kde-apps/khelpcenter/files/khelpcenter-20.04.0-qt-5.15.patch new file mode 100644 index 0000000000..51436f39cd --- /dev/null +++ b/kde-apps/khelpcenter/files/khelpcenter-20.04.0-qt-5.15.patch @@ -0,0 +1,39 @@ +From af7c68f76b3bc0835660cf661d30b60a42251218 Mon Sep 17 00:00:00 2001 +From: Johnny Jazeix <[email protected]> +Date: Sat, 18 Apr 2020 11:13:32 +0200 +Subject: fix compilation for Qt > 5.14: QSet::fromList(QList) deprecated + +--- + searchhandlers/cachereader.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + + +From b261bf9113e39bf46a393b2bfdfcb26fdf3ed8a2 Mon Sep 17 00:00:00 2001 +From: Johnny Jazeix <[email protected]> +Date: Sat, 18 Apr 2020 12:31:48 +0200 +Subject: avoid intermediate list and cleaner way to convert to QSet + +--- + searchhandlers/cachereader.cpp | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/searchhandlers/cachereader.cpp b/searchhandlers/cachereader.cpp +index 5f160c8..560e43a 100644 +--- a/searchhandlers/cachereader.cpp ++++ b/searchhandlers/cachereader.cpp +@@ -105,7 +105,11 @@ bool CacheReader::parse( const QString& file ) + + QSet<QString> CacheReader::documents() const + { +- return QSet<QString>::fromList( mRanges.uniqueKeys() ); ++#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) ++ return QSet<QString>::fromList( mRanges.uniqueKeys() ); ++#else ++ return QSet<QString>( mRanges.keyBegin(), mRanges.keyEnd() ); ++#endif + } + + QByteArray CacheReader::document( const QString& id ) const +-- +cgit v1.1 + diff --git a/kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild b/kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild index 2dc7eced0e..cd7228b9c5 100644 --- a/kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild +++ b/kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild @@ -48,6 +48,8 @@ RDEPEND="${DEPEND} >=kde-plasma/kde-cli-tools-${PLASMA_MINIMAL}:5 " +PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" ) + src_prepare() { ecm_src_prepare sed -e "/^install.*kde4\/services/s/^/#DONT/" -i CMakeLists.txt || die
