From f60c5127226422724ea94fe1e1f9d2413f0b3171 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 06 2019 10:04:33 +0000
Subject: import kdelibs-4.14.8-10.el7


---

diff --git a/SOURCES/kdelibs-4.13.2-invokeTerminal.patch b/SOURCES/kdelibs-4.13.2-invokeTerminal.patch
index 9e73826..33141c5 100644
--- a/SOURCES/kdelibs-4.13.2-invokeTerminal.patch
+++ b/SOURCES/kdelibs-4.13.2-invokeTerminal.patch
@@ -1,8 +1,25 @@
-diff -up kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp.orig kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp
---- kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp.orig	2014-07-11 16:54:51.000000000 +0200
-+++ kdelibs-4.13.2/kdecore/kernel/ktoolinvocation_x11.cpp	2014-07-11 16:57:31.000000000 +0200
-@@ -412,11 +412,9 @@ void KToolInvocation::invokeTerminal(con
-         // directory before launching them, see below.
+diff --git a/kdecore/kernel/ktoolinvocation_x11.cpp b/kdecore/kernel/ktoolinvocation_x11.cpp
+index 5168f2f..ed2a9ab 100644
+--- a/kdecore/kernel/ktoolinvocation_x11.cpp
++++ b/kdecore/kernel/ktoolinvocation_x11.cpp
+@@ -405,18 +405,20 @@ void KToolInvocation::invokeTerminal(const QString &command,
+     QStringList cmdTokens = KShell::splitArgs(exec);
+     QString cmd = cmdTokens.takeFirst();
+ 
+-    if (exec == QLatin1String("konsole") && !workdir.isEmpty()) {
+-        cmdTokens << QString::fromLatin1("--workdir");
+-        cmdTokens << workdir;
+-        // For other terminals like xterm, we'll simply change the working
+-        // directory before launching them, see below.
++    if (exec == QLatin1String("konsole")) {
++        cmdTokens += QString::fromLatin1("--nofork");
++
++        if (!workdir.isEmpty()) {
++            cmdTokens << QString::fromLatin1("--workdir");
++            cmdTokens << workdir;
++            // For other terminals like xterm, we'll simply change the working
++            // directory before launching them, see below.
++        }
      }
  
 -    QString error;
diff --git a/SOURCES/kdelibs-handle-case-sensitive-mime-types.patch b/SOURCES/kdelibs-handle-case-sensitive-mime-types.patch
new file mode 100644
index 0000000..f3db08e
--- /dev/null
+++ b/SOURCES/kdelibs-handle-case-sensitive-mime-types.patch
@@ -0,0 +1,13 @@
+diff --git a/kdecore/services/kmimetyperepository.cpp b/kdecore/services/kmimetyperepository.cpp
+index f56f48e..65860f7 100644
+--- a/kdecore/services/kmimetyperepository.cpp
++++ b/kdecore/services/kmimetyperepository.cpp
+@@ -58,7 +58,7 @@ KMimeTypeRepository::~KMimeTypeRepository()
+ 
+ KMimeType::Ptr KMimeTypeRepository::findMimeTypeByName(const QString &_name, KMimeType::FindByNameOption options)
+ {
+-    QString name = _name;
++    QString name = _name.toLower();
+     if (options & KMimeType::ResolveAliases) {
+         name = canonicalName(name);
+     }
diff --git a/SPECS/kdelibs.spec b/SPECS/kdelibs.spec
index 314627f..e96b809 100644
--- a/SPECS/kdelibs.spec
+++ b/SPECS/kdelibs.spec
@@ -36,11 +36,13 @@
 # trim changelog included in binary rpms
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
+%define __jar_repack %{nil}
+
 Summary: KDE Libraries
 # shipped with kde applications, version...
 %global apps_version 15.04.1
 Version: 4.14.8
-Release: 6%{?dist}
+Release: 10%{?dist}
 
 Name: kdelibs
 Epoch: 6
@@ -182,6 +184,9 @@ Patch66: kdelibs-4.11.3-klauncher-no-glib.patch
 # opening a terminal in Konqueror / Dolphin does not inherit environment variables
 Patch67: kdelibs-4.13.2-invokeTerminal.patch
 
+# *.macroEnabled mime types wrongly case-sensitively mismatched against /usr/share/mime/application/*.macroenabled.*.xml
+Patch68: kdelibs-handle-case-sensitive-mime-types.patch
+
 ## upstream
 # 4.14 branch
 
@@ -432,6 +437,7 @@ sed -i -e "s|@@VERSION_RELEASE@@|%{version}-%{release}|" kio/kio/kprotocolmanage
 %patch65 -p1 -b .arm-plasma
 %patch66 -p1 -b .klauncher-no-glib
 %patch67 -p1 -b .invokeTerminal
+%patch68 -p1 -b .handle-case-sensitive-mime-types
 
 # upstream patches
 %patch090 -p1 -R -b .return-not-break.-copy-paste-error
@@ -796,6 +802,22 @@ update-mime-database %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Thu Jun 06 2019 Jan Grulich <jgrulich@redhat.com> - 6:4.14.8-10
+- Do not fork konsole process when opening terminal from apps using dolphin-part
+  Resolves: bz#1710362
+
+* Wed Jun 05 2019 Jan Grulich <jgrulich@redhat.com> - 6:4.14.8-9
+- Do not fork konsole process when opening terminal from apps using dolphin-part
+  Resolves: bz#1710362
+
+* Mon Apr 29 2019 Jan Grulich <jgrulich@redhat.com> - 6:4.14.8-8
+- Disable JAR repack script to avoid multilib regression
+  Resolves: bz#1542864
+
+* Mon Feb 11 2019 Jan Grulich <jgrulich@redhat.com> - 6:4.14.8-7
+- Handle case-sensitive mime types
+  Resolves: bz#1542864
+
 * Thu May 18 2017 Jan Grulich <jgrulich@redhat.com> - 6:4.14.8-6
 - KAuth: verify that whoever is calling us is actually who he says he is (CVE-2017-8422)
   Resolves: CVE-2017-8422