summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kde/patch/kio.patch4
-rw-r--r--kde/patch/kio/kio_kdelibs4_docpatch.patch22
2 files changed, 26 insertions, 0 deletions
diff --git a/kde/patch/kio.patch b/kde/patch/kio.patch
new file mode 100644
index 0000000..a2e20dc
--- /dev/null
+++ b/kde/patch/kio.patch
@@ -0,0 +1,4 @@
+# Add search paths for kdelibs4 documentation to khelpcenter.
+# Patch taken from kubuntu:
+cat $CWD/patch/kio/kio_kdelibs4_docpatch.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/kio/kio_kdelibs4_docpatch.patch b/kde/patch/kio/kio_kdelibs4_docpatch.patch
new file mode 100644
index 0000000..9549d31
--- /dev/null
+++ b/kde/patch/kio/kio_kdelibs4_docpatch.patch
@@ -0,0 +1,22 @@
+Description: add search paths for kdelibs4 docs
+Author: Jonathan Riddell
+Origin: me
+Forwarded: no, kdelibs4 path was set in debian/kubuntu packages
+Applied-Upstream: nope
+Reviewed-by: Jonathan Riddell
+Last-Update: 2015-03-01
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- kio/src/ioslaves/help/kio_help.cpp 2015-03-07 15:45:21.000000000 +0100
++++ kio/src/ioslaves/help/kio_help.cpp 2015-04-02 17:15:39.687828131 +0200
+@@ -49,7 +49,8 @@
+ QStringList search;
+
+ // assemble the local search paths
+- const QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory);
++ QStringList localDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/HTML", QStandardPaths::LocateDirectory);
++ localDoc << QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/kde/HTML", QStandardPaths::LocateDirectory);
+
+ QStringList langs = QLocale().uiLanguages();
+ langs.append("en");
+