kde-frameworks/kdoctools: Fall back to downstream docbundledir patch

Upstream commit 6607c892c5be91fc8dbe11f52b229c525afb72f0

Closes: https://bugs.gentoo.org/830333
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>

1 files changed, 30 insertions, 0 deletions

diff --git a/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch b/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch
new file mode 100644
index 00000000000..fce8c5de928
--- /dev/null
+++ b/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch
@@ -0,0 +1,30 @@
+Upstream MR was not yet been merged, and needs to be updated for Qt6.
+
+See also: https://phabricator.kde.org/D26306
+
+From 79f31819b95fcb0bd3d30630f769706923d41609 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 28 Jan 2019 22:50:56 +0100
+Subject: [PATCH] xslt.cpp: Add /usr/share/help dir to list of paths containing
+ documentation
+
+---
+ src/xslt.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/xslt.cpp b/src/xslt.cpp
+index 1000e33..a0fbe4c 100644
+--- a/src/xslt.cpp
++++ b/src/xslt.cpp
+@@ -494,5 +494,7 @@ QStringList getKDocToolsCatalogs()
+ QStringList KDocTools::documentationDirs()
+ {
+     /* List of paths containing documentation */
+-    return QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory);
++    QStringList docDirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("help"), QStandardPaths::LocateDirectory);
++    docDirs.append(QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("doc/HTML"), QStandardPaths::LocateDirectory));
++    return docDirs;
+ }
+-- 
+2.20.1
+