File 0001-Use-runtime-install-prefix-instead-of-comp... of Package mingw64-kinit

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Use-runtime-install-prefix-instead-of-compile-time-i.patch of Package mingw64-kinit (Revision 04a4ac97f2e2bd2b443991e2b8a3395b)

Currently displaying revision 04a4ac97f2e2bd2b443991e2b8a3395b , Show latest

From ebe9179b932dffac5c006bfbb6355e5c9f50d7f9 Mon Sep 17 00:00:00 2001
From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Sat, 24 Jan 2015 18:33:42 +0100
Subject: [PATCH 01/18] Use runtime install prefix instead of compile time
 install prefix.

---
 src/kdeinit/kinit_win.cpp | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/kdeinit/kinit_win.cpp b/src/kdeinit/kinit_win.cpp
index 20c4fb2..e2f6ee2 100644
--- a/src/kdeinit/kinit_win.cpp
+++ b/src/kdeinit/kinit_win.cpp
@@ -27,6 +27,7 @@
 #include <QProcess>
 #include <QFileInfo>
 #include <QDebug>
+#include <QLibraryInfo>
 
 // Under wince interface is defined, so undef it otherwise it breaks it
 #undef interface
@@ -189,6 +190,11 @@ static PSID getCurrentProcessOwner()
     return getProcessOwner(GetCurrentProcess());
 }
 
+static QString installRoot()
+{
+    return QLibraryInfo::location(QLibraryInfo::PrefixPath);
+}
+
 /**
  holds single process
  */
@@ -329,6 +335,7 @@ void ProcessList::init()
 
 ProcessListEntry *ProcessList::find(const QString &name)
 {
+    QString installPrefix = installRoot();
     for (ProcessListEntry *ple : qAsConst(m_processes)) {
         if (ple->pid < 0) {
             qDebug() << "negative pid!";
@@ -339,9 +346,9 @@ ProcessListEntry *ProcessList::find(const QString &name)
             continue;
         }
 
-        if (!ple->path.isEmpty() && !ple->path.toLower().startsWith(QString(QStringLiteral(CMAKE_INSTALL_PREFIX)).toLower())) {
+        if (!ple->path.isEmpty() && !ple->path.toLower().startsWith(installPrefix.toLower())) {
             // process is outside of installation directory
-            qDebug() << "path of the process" << name << "seems to be outside of the installPath:" << ple->path << QStringLiteral(CMAKE_INSTALL_PREFIX);
+            qDebug() << "path of the process" << name << "seems to be outside of the installPath:" << ple->path << installPrefix;
             continue;
         }
         return ple;
@@ -421,7 +428,7 @@ bool checkIfRegisteredInDBus(const QString &name, int _timeout = 10)
 
 void listAllRunningKDEProcesses(ProcessList &processList)
 {
-    QString installPrefix = QStringLiteral(CMAKE_INSTALL_PREFIX);
+    QString installPrefix = installRoot();
 
     const auto list = processList.list();
     for (const ProcessListEntry *ple : list) {
@@ -433,7 +440,7 @@ void listAllRunningKDEProcesses(ProcessList &processList)
 
 void terminateAllRunningKDEProcesses(ProcessList &processList)
 {
-    QString installPrefix = QStringLiteral(CMAKE_INSTALL_PREFIX);
+    QString installPrefix = installRoot();
 
     const auto list = processList.list();
     for (const ProcessListEntry *ple : list) {
-- 
2.26.2

Places

File 0001-Use-runtime-install-prefix-instead-of-compile-time-i.patch of Package mingw64-kinit (Revision 04a4ac97f2e2bd2b443991e2b8a3395b)

Places