From 77fd5e9ede0faf4149740bd7d3c64a9a4522a1bbc271a501f32189acb67f73a0 Mon Sep 17 00:00:00 2001 From: Hrvoje Senjan Date: Sun, 12 Apr 2015 09:53:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=71 --- kio.changes | 2 ++ kio.spec | 3 +++ kio_help-fallback-to-kde4-docs.patch | 15 +++++++++++++++ 3 files changed, 20 insertions(+) create mode 100644 kio_help-fallback-to-kde4-docs.patch diff --git a/kio.changes b/kio.changes index 38c0f66..39fd0c9 100644 --- a/kio.changes +++ b/kio.changes @@ -12,6 +12,8 @@ Sat Apr 4 14:40:53 UTC 2015 - hrvoje.senjan@gmail.com - Split the core modules/daemons/libraries into core subpackage; based on upstream KIOCORE_ONLY build option, which only concerns the buildsystem, not the code (i.e. no ifdefs) +- Add kio_help-fallback-to-kde4-docs.patch: allow kio_help to see + into kde4 documentation ------------------------------------------------------------------- Mon Mar 16 11:58:09 UTC 2015 - hrvoje.senjan@gmail.com diff --git a/kio.spec b/kio.spec index 9ea7e23..8069229 100644 --- a/kio.spec +++ b/kio.spec @@ -73,6 +73,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 +Patch0: kio_help-fallback-to-kde4-docs.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -118,6 +120,7 @@ Development files. %lang_package %prep %setup -q +%patch0 -p1 %build %cmake_kf5 -d build diff --git a/kio_help-fallback-to-kde4-docs.patch b/kio_help-fallback-to-kde4-docs.patch new file mode 100644 index 0000000..6aa8887 --- /dev/null +++ b/kio_help-fallback-to-kde4-docs.patch @@ -0,0 +1,15 @@ +diff --git a/src/ioslaves/help/kio_help.cpp b/src/ioslaves/help/kio_help.cpp +index 5abd4c8..5bc692b 100644 +--- a/src/ioslaves/help/kio_help.cpp ++++ b/src/ioslaves/help/kio_help.cpp +@@ -49,7 +49,9 @@ QString HelpProtocol::langLookup(const QString &fname) + 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); ++ QStringList fallbacklocalDoc = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "doc/kde/HTML", QStandardPaths::LocateDirectory); ++ localDoc.append(fallbacklocalDoc); + + QStringList langs = QLocale().uiLanguages(); + langs.append("en");