diff options
| -rw-r--r-- | kde-apps/khelpcenter/Manifest | 2 | ||||
| -rw-r--r-- | kde-apps/khelpcenter/files/khelpcenter-20.04.0-qt-5.15.patch | 39 | ||||
| -rw-r--r-- | kde-apps/khelpcenter/khelpcenter-20.04.0.ebuild | 2 |
3 files changed, 1 insertions, 42 deletions
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest index da8e9b9d486..6e02d289f1f 100644 --- a/kde-apps/khelpcenter/Manifest +++ b/kde-apps/khelpcenter/Manifest @@ -1,2 +1,2 @@ DIST khelpcenter-20.03.90.tar.xz 3848032 BLAKE2B f5a9bc12f9ce19a96a5eb27ffcdf14bb3e840f44a55d4fd1f7cdad01e41af515fb3793a21c2944fabc7e9d114966e885516a668dd0cd4882d883127884f2d6fc SHA512 fa8b021b9fe4ca0b269ea401764a3e6dc85e10759611eb845440ff5c6886a5532475cfb695c5dfecfc45f7868a1da77cdda30c5ae1d657c0ece071670d1066ed -DIST khelpcenter-20.04.0.tar.xz 3843084 BLAKE2B a512998bd0804f570e1fc68c7d898b200ac1004970f8f3b40f9e30f7b93e8aa56460c3c7cde7ea90f137f9618061727112bfa2b47fd6f8acf7fdea62622d2f87 SHA512 2d82d2c2e19c5eccacc3841d340fc77aa465d8b5ec5ff70cd88f2bae68c82e10151f81549d3d49c9fdd5ce481c8cb21dac32644e29f89734f0c3344b1a115769 +DIST khelpcenter-20.04.0.tar.xz 3842828 BLAKE2B 40b28089546ba90b59399c4be403a472ae1942a0ed656358017655b47414b063b6ff0c81a5d65b4ebf27ac75880518392a3f0d7e5ae20a88cf19e93a215303bb SHA512 9e9233c63638ab604d2ec42f11d90d8f2f8987e4f8ca85308676abe8884926cb4f953c0ab680ecb9e3c7253c0a0e36cbc47933e8c6a44c4779f7c0a8cea8794c 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 51436f39cd8..00000000000 --- 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 <jazeix@gmail.com> -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 <jazeix@gmail.com> -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 a19717ca763..e7fb3790463 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 |