[SCM] ktp-contact-applet packaging branch, master, updated. debian/15.12.1-1-966-gde83ac5
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:11:52 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-desktop-applets.git;a=commitdiff;h=6ed1d27
The following commit has been merged in the master branch:
commit 6ed1d27903370857ab7a8da91620603a86fa54fb
Author: Dario Freddi <dario.freddi at collabora.com>
Date: Thu Nov 24 20:26:17 2011 +0100
Port to new KTelepathy internal library
---
CMakeLists.txt | 24 +++++-------------------
cmake/modules/FindKTelepathy.cmake | 37 +++++++++++++++++++++++++++++++++++++
src/abstract-contact-delegate.cpp | 9 +++++----
src/config.cpp | 9 +++++----
src/contact-delegate.cpp | 10 +++++-----
5 files changed, 57 insertions(+), 32 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c5d3771..a41a3a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,9 +9,11 @@ set(CMAKE_MODULE_PATH
set(KDE_MIN_VERSION "4.6.0")
+set(IS_TELEPATHY_KDE_INTERNAL_MODULE TRUE)
find_package(KDE4 ${KDE_MIN_VERSION} REQUIRED)
#find_package(KDE4Workspace REQUIRED)
find_package(TelepathyQt4 0.7.1 REQUIRED)
+find_package(KTelepathy REQUIRED)
include(KDE4Defaults)
@@ -23,18 +25,9 @@ include_directories(${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
${KDE4_INCLUDES}
${TELEPATHY_QT4_INCLUDE_DIR}
+ ${KTELEPATHY_INCLUDE_DIR}
)
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-execute_process(COMMAND git submodule init
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-execute_process(COMMAND git submodule update
- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.gitmodules)
-
set(telepathy_contact_applet_SRCS
src/abstract-contact-delegate.cpp
@@ -42,15 +35,6 @@ set(telepathy_contact_applet_SRCS
src/contact-delegate.cpp
src/contact-wrapper.cpp
src/telepathy-contact.cpp
- src/common/models/accounts-filter-model.cpp
- src/common/models/accounts-model-item.cpp
- src/common/models/accounts-model.cpp
- src/common/models/contact-model-item.cpp
- src/common/models/groups-model-item.cpp
- src/common/models/groups-model.cpp
- src/common/models/proxy-tree-node.cpp
- src/common/models/tree-node.cpp
- src/common/service-availability-checker.cpp
)
kde4_add_ui_files(telepathy_contact_applet_SRCS
@@ -62,6 +46,8 @@ target_link_libraries(plasma_applet_telepathy_contact
${KDE4_PLASMA_LIBS}
${KDE4_KDEUI_LIBS}
${TELEPATHY_QT4_LIBRARIES}
+ ${KTELEPATHY_LIBRARIES}
+ ${KTELEPATHY_MODELS_LIBRARIES}
${QT_QTDECLARATIVE_LIBRARY})
install(DIRECTORY src/declarative/ DESTINATION ${DATA_INSTALL_DIR}/plasma/plasmoids/org.kde.telepathy-contact)
diff --git a/cmake/modules/FindKTelepathy.cmake b/cmake/modules/FindKTelepathy.cmake
new file mode 100644
index 0000000..4a0e704
--- /dev/null
+++ b/cmake/modules/FindKTelepathy.cmake
@@ -0,0 +1,37 @@
+# Try to find the KTelepathy library
+# KTELEPATHY_FOUND
+# KTELEPATHY_INCLUDE_DIR
+# KTELEPATHY_LIBRARIES
+# KTELEPATHY_MODELS_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_TELEPATHY_KDE_INTERNAL_MODULE)
+ message (FATAL_ERROR "KTelepathy can be used just from internal components at this time")
+endif (NOT IS_TELEPATHY_KDE_INTERNAL_MODULE)
+
+SET (KTELEPATHY_FIND_REQUIRED ${KTelepathy_FIND_REQUIRED})
+if (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
+ # Already in cache, be silent
+ set(KTELEPATHY_FIND_QUIETLY TRUE)
+endif (KTELEPATHY_INCLUDE_DIRS AND KTELEPATHY_LIBRARIES)
+
+find_path(KTELEPATHY_INCLUDE_DIR
+ NAMES KTelepathy/presence.h
+ PATHS ${KDE4_INCLUDE_DIR}
+ PATH_SUFFIXES telepathy-1.0
+)
+
+find_library(KTELEPATHY_LIBRARIES NAMES telepathykdecommoninternalsprivate )
+find_library(KTELEPATHY_MODELS_LIBRARIES NAMES telepathykdemodelsprivate )
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(KTelepathy DEFAULT_MSG
+ KTELEPATHY_LIBRARIES
+ KTELEPATHY_MODELS_LIBRARIES
+ KTELEPATHY_INCLUDE_DIR)
+
+mark_as_advanced(KTELEPATHY_INCLUDE_DIRS KTELEPATHY_LIBRARIES)
diff --git a/src/abstract-contact-delegate.cpp b/src/abstract-contact-delegate.cpp
index 5069783..7291a7a 100644
--- a/src/abstract-contact-delegate.cpp
+++ b/src/abstract-contact-delegate.cpp
@@ -32,9 +32,10 @@
#include <KDE/KIconLoader>
#include <KDE/KIcon>
-#include "common/models/accounts-model.h"
-#include "common/models/groups-model.h"
-#include "common/models/contact-model-item.h"
+#include <KTelepathy/Models/accounts-model.h>
+#include <KTelepathy/Models/accounts-model-item.h>
+#include <KTelepathy/Models/groups-model.h>
+#include <KTelepathy/Models/contact-model-item.h>
const int SPACING = 2;
const int ACCOUNT_ICON_SIZE = 13;
@@ -217,4 +218,4 @@ bool AbstractContactDelegate::helpEvent(QHelpEvent *event, QAbstractItemView *vi
QToolTip::showText(QCursor::pos(), table, view);
return true;
-}
\ No newline at end of file
+}
diff --git a/src/config.cpp b/src/config.cpp
index c1f6894..92f1844 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -19,10 +19,11 @@
#include "config.h"
#include "contact-delegate.h"
-#include "common/models/accounts-model.h"
-#include "common/models/contact-model-item.h"
-#include "common/models/groups-model.h"
-#include "common/models/accounts-filter-model.h"
+
+#include <KTelepathy/Models/accounts-model.h>
+#include <KTelepathy/Models/contact-model-item.h>
+#include <KTelepathy/Models/groups-model.h>
+#include <KTelepathy/Models/accounts-filter-model.h>
#include <KDebug>
#include <KPushButton>
diff --git a/src/contact-delegate.cpp b/src/contact-delegate.cpp
index cd33d19..52d6f5a 100644
--- a/src/contact-delegate.cpp
+++ b/src/contact-delegate.cpp
@@ -33,11 +33,11 @@
#include <KGlobalSettings>
#include <KDE/KLocale>
-#include "common/models/accounts-model.h"
-#include "common/models/contact-model-item.h"
-#include "common/models/proxy-tree-node.h"
-#include "common/models/groups-model-item.h"
-#include "common/models/groups-model.h"
+#include <KTelepathy/Models/accounts-model.h>
+#include <KTelepathy/Models/contact-model-item.h>
+#include <KTelepathy/Models/proxy-tree-node.h>
+#include <KTelepathy/Models/groups-model-item.h>
+#include <KTelepathy/Models/groups-model.h>
const int SPACING = 4;
const int AVATAR_SIZE = 22;
--
ktp-contact-applet packaging
More information about the pkg-kde-commits
mailing list