diff options
| -rw-r--r-- | kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch | 30 | ||||
| -rw-r--r-- | kde-frameworks/kdoctools/kdoctools-9999.ebuild | 4 |
2 files changed, 32 insertions, 2 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 + diff --git a/kde-frameworks/kdoctools/kdoctools-9999.ebuild b/kde-frameworks/kdoctools/kdoctools-9999.ebuild index e9ac82abb54..e879ec1c942 100644 --- a/kde-frameworks/kdoctools/kdoctools-9999.ebuild +++ b/kde-frameworks/kdoctools/kdoctools-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -28,7 +28,7 @@ DEPEND=" " RDEPEND="${DEPEND}" -PATCHES=( "${FILESDIR}/${PN}-5.66.0-docbundledir.patch" ) +PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" ) src_configure() { local mycmakeargs=( |
