From a1704fc888ce729b0a45cc10a5852a3301e5c488 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= <dvratil@kde.org>
Date: Tue, 10 Oct 2017 18:51:43 +0200
Subject: [PATCH] Add kconf_update script to adapt to .desktop name change in
 17.08

org.kde.kmail.desktop has been renamed to org.kde.kmail2.desktop so we need
to adjust kickoff again and we also need to adjust mimeapps.list so that using
"xdg-open mailto:..." keeps working.
---
 src/kconf_update/CMakeLists.txt |  4 ++--
 src/kconf_update/kmail2.sh      | 11 +++++++++++
 src/kconf_update/kmail2.upd     |  5 +++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 src/kconf_update/kmail2.sh
 create mode 100644 src/kconf_update/kmail2.upd

diff --git a/src/kconf_update/CMakeLists.txt b/src/kconf_update/CMakeLists.txt
index 6bb0547cd..6ef3daf5d 100644
--- a/src/kconf_update/CMakeLists.txt
+++ b/src/kconf_update/CMakeLists.txt
@@ -1,6 +1,6 @@
-install(FILES kmail.upd
+install(FILES kmail.upd kmail2.upd
         DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
 )
-install(PROGRAMS kmail-15.08-kickoff.sh
+install(PROGRAMS kmail-15.08-kickoff.sh kmail2.sh
         DESTINATION ${KDE_INSTALL_KCONFUPDATEDIR}
 )
diff --git a/src/kconf_update/kmail2.sh b/src/kconf_update/kmail2.sh
new file mode 100644
index 000000000..4d9ab9717
--- /dev/null
+++ b/src/kconf_update/kmail2.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+kickoffrcname=`qtpaths --locate-file  GenericConfigLocation kickoffrc`
+if [ -f "$kickoffrcname" ]; then
+   sed -i "s/\/org.kde.kmail.desktop/\/org.kde.kmail2.desktop/" $kickoffrcname
+fi
+
+mimeappsname=`qtpaths --locate-file GenericConfigLocation mimeapps.list`
+if [ -f "$mimeappsname" ]; then
+    sed -i "s/org.kde.kmail.desktop/org.kde.kmail2.desktop/" $mimeappsname
+fi
diff --git a/src/kconf_update/kmail2.upd b/src/kconf_update/kmail2.upd
new file mode 100644
index 000000000..68231f511
--- /dev/null
+++ b/src/kconf_update/kmail2.upd
@@ -0,0 +1,5 @@
+Version=5
+
+# Update ~/.config/mimeapps.list and kickoff to match the new .desktop file name in 17.08
+Id=kmail2
+Script=kmail2.sh,sh