File 0001-Install-klauncher-with-5-postfix-to-avoid-... of Package mingw32-kinit

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Install-klauncher-with-5-postfix-to-avoid-conflicts-.patch of Package mingw32-kinit (Revision 61a5de8ed171cd8936168e07a23108bd)

Currently displaying revision 61a5de8ed171cd8936168e07a23108bd , Show latest

From de8b8441d7253a7d399dc0bae313594d2aefaffb 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] 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 3635bb1..f222022 100644
--- a/src/kdeinit/kinit_win.cpp
+++ b/src/kdeinit/kinit_win.cpp
@@ -630,8 +630,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 7144c80..33896a0 100644
--- a/src/klauncher/CMakeLists.txt
+++ b/src/klauncher/CMakeLists.txt
@@ -23,6 +23,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.12.3

Places

File 0001-Install-klauncher-with-5-postfix-to-avoid-conflicts-.patch of Package mingw32-kinit (Revision 61a5de8ed171cd8936168e07a23108bd)

Places