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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9EB9C138350 for ; Wed, 22 Apr 2020 20:34:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D6CE0E0D6A; Wed, 22 Apr 2020 20:34:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B470FE0D45 for ; Wed, 22 Apr 2020 20:34:20 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 37E3E34F0A5 for ; Wed, 22 Apr 2020 20:34:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B01501ED for ; Wed, 22 Apr 2020 20:34:16 +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: <1587564809.1c3977e3635d8d3900194c62c8fbc65855f1c092.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-apps/khelpcenter/files/, kde-apps/khelpcenter/ X-VCS-Repository: proj/kde X-VCS-Files: kde-apps/khelpcenter/files/khelpcenter-20.04.0-qt-5.15.patch kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild X-VCS-Directories: kde-apps/khelpcenter/ kde-apps/khelpcenter/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 1c3977e3635d8d3900194c62c8fbc65855f1c092 X-VCS-Branch: master Date: Wed, 22 Apr 2020 20:34:16 +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: 63069840-218b-4acc-a651-27399fdc609a X-Archives-Hash: 81f3e1946980a8c0df6e8d32b851d2c4 commit: 1c3977e3635d8d3900194c62c8fbc65855f1c092 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Apr 22 14:13:29 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Apr 22 14:13:29 2020 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=1c3977e3 kde-apps/khelpcenter: Tarball respun See also: https://mail.kde.org/pipermail/release-team/2020-April/011840.html Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner 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 deletions(-) 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 deleted file mode 100644 index 51436f39cd..0000000000 --- a/kde-apps/khelpcenter/files/khelpcenter-20.04.0-qt-5.15.patch +++ /dev/null @@ -1,39 +0,0 @@ -From af7c68f76b3bc0835660cf661d30b60a42251218 Mon Sep 17 00:00:00 2001 -From: Johnny Jazeix -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 -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 CacheReader::documents() const - { -- return QSet::fromList( mRanges.uniqueKeys() ); -+#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0) -+ return QSet::fromList( mRanges.uniqueKeys() ); -+#else -+ return QSet( 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 a19717ca76..e7fb379046 100644 --- a/kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild +++ b/kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild @@ -48,8 +48,6 @@ 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