[SCM] kdeconnect packaging branch, master, updated. debian/0.9g-1-1183-g9d69498

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kdeconnect.git;a=commitdiff;h=685e821

The following commit has been merged in the master branch:
commit 685e821d0a821e25e2fe6b57d23ec0dd2df68561
Author: Martin Gräßlin <mgraesslin at kde.org>
Date:   Sat Jul 5 13:28:42 2014 +0200

    Set path to kdeconnectd executable through cmake
    
    Libexec binaries need to be hardcoded, otherwise they are not found.
    This commit creates a config file and sets the path there.
    
    REVIEW: 119148
---
 kded/CMakeLists.txt      | 2 ++
 kded/config-kded.h.cmake | 1 +
 kded/kded.cpp            | 3 ++-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
index dd2c941..3f15693 100644
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
@@ -1,5 +1,7 @@
 include_directories(${CMAKE_SOURCE_DIR})
 
+configure_file(config-kded.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kded.h)
+
 add_executable(kdeconnectd kdeconnectd.cpp)
 target_link_libraries(kdeconnectd kdeconnectcore KF5::ConfigWidgets)
 
diff --git a/kded/config-kded.h.cmake b/kded/config-kded.h.cmake
new file mode 100644
index 0000000..10882b7
--- /dev/null
+++ b/kded/config-kded.h.cmake
@@ -0,0 +1 @@
+#define KDECONNECTD_BIN "${CMAKE_INSTALL_PREFIX}/${LIBEXEC_INSTALL_DIR}/kdeconnectd"
diff --git a/kded/kded.cpp b/kded/kded.cpp
index a7c5c75..8e3e06c 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -26,6 +26,7 @@
 #include <KStandardDirs>
 
 #include "core/kdebugnamespace.h"
+#include "config-kded.h"
 
 K_PLUGIN_FACTORY(KdeConnectFactory, registerPlugin<Kded>();)
 K_EXPORT_PLUGIN(KdeConnectFactory("kdeconnect", "kdeconnect-kded"))
@@ -50,7 +51,7 @@ void Kded::start()
         return;
     }
     
-    const QString daemon = KStandardDirs::locate("exe", "kdeconnectd");
+    const QString daemon = QStringLiteral(KDECONNECTD_BIN);
     kDebug(debugArea()) << "Starting daemon " << daemon;
     m_daemon = new KProcess(this);
     connect(m_daemon, SIGNAL(started()), SLOT(daemonStarted()));

-- 
kdeconnect packaging