diff --git a/kdelibs-4.14.25-plasma_drkonqi.patch b/kdelibs-4.14.25-plasma_drkonqi.patch new file mode 100644 index 0000000..e2e4d7f --- /dev/null +++ b/kdelibs-4.14.25-plasma_drkonqi.patch @@ -0,0 +1,22 @@ +diff -up kdelibs-4.14.25/kdeui/util/kcrash.cpp.plasma_drkonqi kdelibs-4.14.25/kdeui/util/kcrash.cpp +--- kdelibs-4.14.25/kdeui/util/kcrash.cpp.plasma_drkonqi 2016-10-10 01:09:37.000000000 -0500 ++++ kdelibs-4.14.25/kdeui/util/kcrash.cpp 2016-11-10 11:18:40.617754077 -0600 +@@ -205,11 +205,18 @@ void KCrash::setDrKonqiEnabled(bool enab + { + s_launchDrKonqi = enabled; + if (s_launchDrKonqi && !s_drkonqiPath) { ++ ++ s_drkonqiPath = qstrdup(QFile::encodeName(KStandardDirs::findExe("drkonqi", QFile::decodeName("/usr/libexec/drkonqi"))).constData()); ++ ++ if (!s_drkonqiPath) { ++ + s_drkonqiPath = qstrdup(QFile::encodeName(KStandardDirs::findExe("drkonqi")).constData()); + if (!s_drkonqiPath) { + kError() << "Could not find drkonqi"; + s_launchDrKonqi = false; + } ++ ++ } + } + + //we need at least the default crash handler to launch drkonqi diff --git a/kdelibs.spec b/kdelibs.spec index 28a73f6..50ec264 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -51,7 +51,7 @@ Summary: KDE Libraries # shipped with kde applications, version... %global apps_version 16.08.2 Version: 4.14.25 -Release: 1%{?dist} +Release: 2%{?dist} Name: kdelibs Epoch: 6 @@ -117,6 +117,9 @@ Patch1: kdelibs-no_fake_mimetypes.patch # fix http://bugs.kde.org/149705 Patch2: kdelibs-4.10.0-kde149705.patch +# search for plasma5 drkonqi too +Patch3: kdelibs-4.14.25-plasma_drkonqi.patch + # install all .css files and Doxyfile.global in kdelibs-common to build # kdepimlibs-apidocs against Patch8: kdelibs-4.3.90-install_all_css.patch @@ -454,6 +457,7 @@ format for use with the Qt 4 Assistant or KDevelop 4. %patch1 -p1 -b .no_fake_mimetypes %endif %patch2 -p1 -b .kde149705 +%patch3 -p1 -b .plasma_drkonqi %patch8 -p1 -b .install_all_css %patch9 -p1 -b .branding # add release version as part of branding (suggested by cailon) @@ -867,6 +871,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || : %changelog +* Thu Nov 10 2016 Rex Dieter - 6:4.14.25-2 +- support use of plasma-desktop-drkonqi too + * Sun Oct 16 2016 Rex Dieter - 6:4.14.25-1 - 4.14.25 (kde-apps-16.08.2)