diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-28 23:25:48 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2019-01-28 23:41:16 +0100 |
| commit | 41f803a7f62ba178bff82b78e4455e271587a243 (patch) | |
| tree | 2fee090427714a9fce697f4019bfc5ead22c9775 | |
| parent | kde5.eclass: Relocate KDE_INSTALL_DOCBUNDLEDIR to /usr/share/help (diff) | |
| download | kde-41f803a7f62ba178bff82b78e4455e271587a243.tar.gz kde-41f803a7f62ba178bff82b78e4455e271587a243.tar.bz2 kde-41f803a7f62ba178bff82b78e4455e271587a243.zip | |
kde-frameworks/kdoctools: Add /usr/share/help dir to list of doc dirs
This is fed to kio_help from kde-frameworks/kio to populate
kde-apps/khelpcenter runtime content.
Bug: https://bugs.gentoo.org/667138
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
| -rw-r--r-- | kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch | 26 | ||||
| -rw-r--r-- | kde-frameworks/kdoctools/kdoctools-9999.ebuild | 2 |
2 files changed, 28 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 0000000000..cb6c35f19f --- /dev/null +++ b/kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch @@ -0,0 +1,26 @@ +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 619b8603f2..fda9897211 100644 --- a/kde-frameworks/kdoctools/kdoctools-9999.ebuild +++ b/kde-frameworks/kdoctools/kdoctools-9999.ebuild @@ -26,6 +26,8 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${PN}-5.54.0-gentoo-docbundledir.patch" ) + src_configure() { local mycmakeargs=( $(cmake-utils_use_find_package nls KF5I18n) |