[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=9d11edb

The following commit has been merged in the master branch:
commit 9d11edbdec9e92ba19fb41f9c6db12821f377caf
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Nov 12 16:21:46 2014 +0100

    Fix build
---
 CMakeLists.txt                              |  7 ++---
 cmake/modules/FindKAccounts.cmake           |  2 +-
 cmake/modules/FindKTp.cmake                 | 40 -----------------------------
 plugins/kaccounts/CMakeLists.txt            |  3 +--
 plugins/kaccounts/kaccounts-ui-provider.cpp |  2 --
 5 files changed, 4 insertions(+), 50 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d2f53f9..8794f3b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,7 +14,6 @@ set(KTP_ACCOUNTS_KCM_VERSION "0.9.99")
 set(IS_KTP_INTERNAL_MODULE TRUE)
 
 find_package (TelepathyQt5 REQUIRED)
-find_package (KTp REQUIRED)
 find_package (KAccounts REQUIRED)
 find_package (AccountsFileDir REQUIRED)
 find_package (Intltool REQUIRED) #needed to generate service and provider files
@@ -34,10 +33,8 @@ add_definitions (
                  -DQT_NO_KEYWORDS
 )
 
-include_directories (${TELEPATHY_QT5_INCLUDE_DIR}
-#                      ${KTP_INCLUDE_DIR}
-                     ${CMAKE_CURRENT_SOURCE_DIR}/src
-)
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src
+                     ${TELEPATHY_QT5_INCLUDE_DIR})
 
 add_subdirectory (src)
 add_subdirectory (data)
diff --git a/cmake/modules/FindKAccounts.cmake b/cmake/modules/FindKAccounts.cmake
index ab28b52..effead6 100644
--- a/cmake/modules/FindKAccounts.cmake
+++ b/cmake/modules/FindKAccounts.cmake
@@ -14,7 +14,7 @@ endif (KACCOUNTS_INCLUDE_DIRS AND KACCOUNTS_LIBRARIES)
 
 find_path(KACCOUNTS_INCLUDE_DIR
   NAMES KAccounts/kaccountsuiplugin.h
-  PATHS ${KF5_INCLUDE_DIR}
+  PATHS ${CMAKE_INSTALL_FULL_INCLUDEDIR}
 )
 
 find_library(KACCOUNTS_LIBRARIES NAMES kaccounts)
diff --git a/cmake/modules/FindKTp.cmake b/cmake/modules/FindKTp.cmake
deleted file mode 100644
index 4c6f7a6..0000000
--- a/cmake/modules/FindKTp.cmake
+++ /dev/null
@@ -1,40 +0,0 @@
-# Try to find the KTp library
-# KTP_FOUND
-# KTP_INCLUDE_DIR
-# KTP_LIBRARIES
-# KTP_MODELS_LIBRARIES
-# KTP_WIDGETS_LIBRARIES
-# KTP_LOGGER_LIBRARIES
-
-# Copyright (c) 2011, Dario Freddi <drf at kde.org>
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-if (NOT IS_KTP_INTERNAL_MODULE)
-   message (FATAL_ERROR "KTp can be used just from internal components at this time")
-endif (NOT IS_KTP_INTERNAL_MODULE)
-
-SET (KTP_FIND_REQUIRED ${KTp_FIND_REQUIRED})
-if (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-  # Already in cache, be silent
-  set(KTP_FIND_QUIETLY TRUE)
-endif (KTP_INCLUDE_DIRS AND KTP_LIBRARIES)
-
-find_path(KTP_INCLUDE_DIR
-  NAMES KTp/presence.h
-  PATHS ${KDE4_INCLUDE_DIR}
-)
-
-find_library(KTP_LIBRARIES NAMES ktpcommoninternalsprivate )
-find_library(KTP_MODELS_LIBRARIES NAMES ktpmodelsprivate )
-find_library(KTP_WIDGETS_LIBRARIES NAMES ktpwidgetsprivate )
-find_library(KTP_LOGGER_LIBRARIES NAMES ktploggerprivate )
-
-include(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTp DEFAULT_MSG
-                                  KTP_LIBRARIES
-                                  KTP_MODELS_LIBRARIES
-                                  KTP_INCLUDE_DIR)
-
-mark_as_advanced(KTP_INCLUDE_DIRS KTP_LIBRARIES)
diff --git a/plugins/kaccounts/CMakeLists.txt b/plugins/kaccounts/CMakeLists.txt
index 36be1a9..6c8d935 100644
--- a/plugins/kaccounts/CMakeLists.txt
+++ b/plugins/kaccounts/CMakeLists.txt
@@ -2,7 +2,7 @@ project (ktpaccountskcm-plugin-kaccounts)
 
 include_directories (${CMAKE_CURRENT_BINARY_DIR}
                      ${CMAKE_CURRENT_SOURCE_DIR}
-                     ${KTP_INCLUDE_DIR}
+                     ${KACCOUNTS_INCLUDE_DIR}
 )
 
 set (ktpaccountskcm_plugin_kaccounts_SRCS
@@ -19,7 +19,6 @@ target_link_libraries (ktpaccountskcm_plugin_kaccounts
                        Qt5::Widgets
                        KF5::TextWidgets
                        ${TELEPATHY_QT5_LIBRARIES}
-                       ${KTP_LIBRARIES}
                        ${KACCOUNTS_LIBRARIES}
 )
 
diff --git a/plugins/kaccounts/kaccounts-ui-provider.cpp b/plugins/kaccounts/kaccounts-ui-provider.cpp
index 1ca9ad9..cf79d6c 100644
--- a/plugins/kaccounts/kaccounts-ui-provider.cpp
+++ b/plugins/kaccounts/kaccounts-ui-provider.cpp
@@ -31,8 +31,6 @@
 #include <TelepathyQt/PendingAccount>
 #include <TelepathyQt/ProfileManager>
 
-#include <KTp/wallet-utils.h>
-
 #include <KLocalizedString>
 
 #include <QDBusConnection>

-- 
ktp-accounts-kcm packaging