[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=4dbfe9e

The following commit has been merged in the master branch:
commit 4dbfe9e1f7d5fe6507d51edf9f14dd9319b5e012
Author: David Edmundson <kde at davidedmundson.co.uk>
Date:   Thu Jun 27 13:47:58 2013 +0100

    Fix compile with newly added kpeople plugins
---
 KTp/CMakeLists.txt                     | 8 ++++++--
 KTp/Models/kpeopletranslationproxy.cpp | 6 +++---
 KTp/im-persons-data-source.cpp         | 1 +
 kpeople/actionsplugin/CMakeLists.txt   | 1 -
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index a360037..d718873 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -71,14 +71,18 @@ set (ktp_private_LIBS
 )
 
 if (KPEOPLE_FOUND)
-        set (ktp_common_internals_private_SRCS
+    #this is temporary whilst im-persons-data-source still has it's own query
+    find_package (NepomukCore REQUIRED)
+
+    set (ktp_common_internals_private_SRCS
          ${ktp_common_internals_private_SRCS}
          im-persons-data-source.cpp
          )
 
     set (ktp_private_LIBS
          ${ktp_private_LIBS}
-         kpeople
+         ${NEPOMUK_CORE_LIBRARY}
+         ${KPEOPLE_LIBS}
          )
 endif(KPEOPLE_FOUND)
 
diff --git a/KTp/Models/kpeopletranslationproxy.cpp b/KTp/Models/kpeopletranslationproxy.cpp
index bdf9723..4f204ef 100644
--- a/KTp/Models/kpeopletranslationproxy.cpp
+++ b/KTp/Models/kpeopletranslationproxy.cpp
@@ -21,11 +21,11 @@
 
 #include <KPeople/PersonsModel>
 
-//temporary hack until IM data source moves to KTp where it belongs
 #include <kpeople/personpluginmanager.h>
-#include <kpeople/impersonsdatasource.h>
 
-#include <KTp/types.h>
+#include "KTp/im-persons-data-source.h"
+#include "KTp/types.h"
+
 #include <KDebug>
 #include <KIconLoader>
 
diff --git a/KTp/im-persons-data-source.cpp b/KTp/im-persons-data-source.cpp
index bc98ccb..2ea1d85 100644
--- a/KTp/im-persons-data-source.cpp
+++ b/KTp/im-persons-data-source.cpp
@@ -250,3 +250,4 @@ Tp::AccountManagerPtr IMPersonsDataSource::accountManager() const
     return d->accountManager;
 }
 
+#include "im-persons-data-source.moc"
diff --git a/kpeople/actionsplugin/CMakeLists.txt b/kpeople/actionsplugin/CMakeLists.txt
index f5203d5..350181b 100644
--- a/kpeople/actionsplugin/CMakeLists.txt
+++ b/kpeople/actionsplugin/CMakeLists.txt
@@ -10,7 +10,6 @@ target_link_libraries (ktp_kpeople_plugin
     ${QT_LIBRARIES}
     ${TELEPATHY_QT4_LIBRARIES}
     ${KDE4_KDEUI_LIBS}
-    ${NEPOMUK_CORE_LIBRARY}
     ${KPEOPLE_LIBS}
     ktpcommoninternalsprivate
 )

-- 
ktp-common-internals packaging