File 0003-Install-klauncher-with-5-postfix-to-avoid-conflicts-.patch of Package mingw32-kinit
From 7d59575ab02841a116c19d3e9c428f06d50b5334 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 23 Dec 2017 18:39:41 +0100
Subject: [PATCH 03/18] Install klauncher with '5' postfix to avoid conflicts
with related KDE4 process
---
src/kdeinit/kinit_win.cpp | 4 ++--
src/klauncher/CMakeLists.txt | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/kdeinit/kinit_win.cpp b/src/kdeinit/kinit_win.cpp
index e2f6ee2..79e620b 100644
--- a/src/kdeinit/kinit_win.cpp
+++ b/src/kdeinit/kinit_win.cpp
@@ -626,8 +626,8 @@ int main(int argc, char **argv, char **envp)
}
}
- if (launch_klauncher && !processList.find("klauncher")) {
- pid = launch("klauncher");
+ if (launch_klauncher && !processList.find("klauncher5")) {
+ pid = launch("klauncher5");
if (!pid || !checkIfRegisteredInDBus("org.kde.klauncher5", 10)) {
exit(1);
}
diff --git a/src/klauncher/CMakeLists.txt b/src/klauncher/CMakeLists.txt
index 12cc728..7c39179 100644
--- a/src/klauncher/CMakeLists.txt
+++ b/src/klauncher/CMakeLists.txt
@@ -32,6 +32,10 @@ target_link_libraries(kdeinit_klauncher
KF5::I18n # i18n()
Qt5::DBus
)
+if(WIN32)
+ set_target_properties(klauncher PROPERTIES OUTPUT_NAME klauncher5)
+endif()
+
if (APPLE)
target_link_libraries(kdeinit_klauncher "-framework CoreFoundation")
endif()
--
2.26.2