Hrvoje Senjan 2015-04-12 09:53:55 +00:00 committed by Git OBS Bridge
parent 1949a54ee9
commit 77fd5e9ede
3 changed files with 20 additions and 0 deletions

View File

@ -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; - Split the core modules/daemons/libraries into core subpackage;
based on upstream KIOCORE_ONLY build option, which only concerns based on upstream KIOCORE_ONLY build option, which only concerns
the buildsystem, not the code (i.e. no ifdefs) 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 Mon Mar 16 11:58:09 UTC 2015 - hrvoje.senjan@gmail.com

View File

@ -73,6 +73,8 @@ Group: System/GUI/KDE
Url: http://www.kde.org Url: http://www.kde.org
Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz
Source1: baselibs.conf 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 BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
@ -118,6 +120,7 @@ Development files.
%lang_package %lang_package
%prep %prep
%setup -q %setup -q
%patch0 -p1
%build %build
%cmake_kf5 -d build %cmake_kf5 -d build

View File

@ -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");