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 86AB0138334 for ; Tue, 29 Jan 2019 17:22:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37A7AE0CAC; Tue, 29 Jan 2019 17:22:55 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 E80C8E0CAC for ; Tue, 29 Jan 2019 17:22:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 56FA1335DA9 for ; Tue, 29 Jan 2019 17:22:53 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A07D3522 for ; Tue, 29 Jan 2019 17:22:51 +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: <1548715276.41f803a7f62ba178bff82b78e4455e271587a243.asturm@gentoo> Subject: [gentoo-commits] proj/kde:master commit in: kde-frameworks/kdoctools/files/, kde-frameworks/kdoctools/ X-VCS-Repository: proj/kde X-VCS-Files: kde-frameworks/kdoctools/files/kdoctools-5.54.0-gentoo-docbundledir.patch kde-frameworks/kdoctools/kdoctools-9999.ebuild X-VCS-Directories: kde-frameworks/kdoctools/ kde-frameworks/kdoctools/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 41f803a7f62ba178bff82b78e4455e271587a243 X-VCS-Branch: master Date: Tue, 29 Jan 2019 17:22:51 +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: 012fcfa7-b46c-4123-8430-0fc99b2ef8a6 X-Archives-Hash: 52130dc009e15d27dba3f32d6d7205a6 commit: 41f803a7f62ba178bff82b78e4455e271587a243 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 28 22:25:48 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 28 22:41:16 2019 +0000 URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=41f803a7 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 gentoo.org> .../kdoctools-5.54.0-gentoo-docbundledir.patch | 26 ++++++++++++++++++++++ kde-frameworks/kdoctools/kdoctools-9999.ebuild | 2 ++ 2 files changed, 28 insertions(+) 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 +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)