diff --git a/kdelibs-3.5.9-drkonqi-kde4.patch b/kdelibs-3.5.10-drkonqi-plasma5.patch similarity index 50% rename from kdelibs-3.5.9-drkonqi-kde4.patch rename to kdelibs-3.5.10-drkonqi-plasma5.patch index 5df229d..10d510b 100644 --- a/kdelibs-3.5.9-drkonqi-kde4.patch +++ b/kdelibs-3.5.10-drkonqi-plasma5.patch @@ -1,12 +1,12 @@ -diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp ---- kdelibs-3.5.9/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 -+++ kdelibs-3.5.9-drkonqi-kde4/kdecore/kcrash.cpp 2008-07-02 08:24:37.000000000 +0200 +diff -ur kdelibs-3.5.10/kdecore/kcrash.cpp kdelibs-3.5.10-drkonqi-plasma5/kdecore/kcrash.cpp +--- kdelibs-3.5.10/kdecore/kcrash.cpp 2007-01-15 12:34:17.000000000 +0100 ++++ kdelibs-3.5.10-drkonqi-plasma5/kdecore/kcrash.cpp 2017-01-22 23:25:21.373378496 +0100 @@ -158,7 +158,7 @@ int i = 0; // argument 0 has to be drkonqi - argv[i++] = "drkonqi"; -+ argv[i++] = "/usr/libexec/kde4/drkonqi"; ++ argv[i++] = "/usr/libexec/drkonqi"; #if defined Q_WS_X11 // start up on the correct display @@ -15,7 +15,7 @@ diff -ur kdelibs-3.5.9/kdecore/kcrash.cpp kdelibs-3.5.9-drkonqi-kde4/kdecore/kcr if(!geteuid() && setuid(getuid()) < 0) _exit(253); - execvp("drkonqi", const_cast< char** >( argv )); -+ execv("/usr/libexec/kde4/drkonqi", const_cast< char** >( argv )); ++ execv("/usr/libexec/drkonqi", const_cast< char** >( argv )); _exit(errno); } else diff --git a/kdelibs3.spec b/kdelibs3.spec index a6fbbda..e1ef259 100644 --- a/kdelibs3.spec +++ b/kdelibs3.spec @@ -18,7 +18,7 @@ Summary: KDE 3 Libraries Name: kdelibs3 Version: 3.5.10 -Release: 78%{?dist} +Release: 79%{?dist} License: LGPLv2 Url: http://www.kde.org/ @@ -54,7 +54,7 @@ Patch51: kdelibs-3.5.9-cupsserverbin.patch # initial support for (Only|Not)ShowIn=KDE3 Patch52: kdelibs-3.5.9-KDE3.patch # use newer/plasma drkonqi in KCrash (#453243) -Patch53: kdelibs-3.5.9-drkonqi-kde4.patch +Patch53: kdelibs-3.5.10-drkonqi-plasma5.patch # use inotify_* functions which are defined in glibc-header Patch54: kdelibs-3.5.10-inotify.patch # update the KatePart latex.xml syntax definition to the version from Kile 2.0.3 @@ -258,7 +258,7 @@ This package includes tools kgrantpty and kpac_dhcp_helper. %patch50 -p1 -b .no-ispell %patch51 -p1 -b .cupsserverbin %patch52 -p1 -b .KDE3 -%patch53 -p1 -b .drkonqi-kde4 +%patch53 -p1 -b .drkonqi-plasma5 %patch54 -p1 -b .inotify %patch55 -p1 -b .latex-syntax %patch56 -p1 -b .qcolor_gcc_ftbfs @@ -619,6 +619,9 @@ touch --no-create %{_datadir}/icons/crystalsvg 2> /dev/null || : %attr(4755,root,root) %{_bindir}/kpac_dhcp_helper %changelog +* Sun Jan 22 2017 Kevin Kofler - 3.5.10-79 +- use DrKonqi from Plasma 5 rather than from kde-runtime 4 + * Sat Dec 03 2016 Rex Dieter - 3.5.10-78 - rebuild (jasper) - drop the extra -Werror= flags for C, they break the configure script