[SCM] ktp-common-internals packaging branch, master, updated. debian/15.12.1-2-1839-gf0635e9
Maximiliano Curia
maxy at moszumanska.debian.org
Mon May 9 09:08:33 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=8f285ab
The following commit has been merged in the master branch:
commit 8f285ab340ef8e514a3e1f27bd147452b87935e8
Author: Aleix Pol <aleixpol at kde.org>
Date: Fri Dec 12 20:42:30 2014 +0100
Fix compilation against TelepathyLoggerQt
---
CMakeLists.txt | 7 +++----
KTp/CMakeLists.txt | 4 ++--
KTp/Logger/CMakeLists.txt | 2 +-
KTp/Logger/plugins/CMakeLists.txt | 2 +-
KTp/Logger/plugins/tplogger/CMakeLists.txt | 3 +++
KTp/Logger/plugins/tplogger/pending-tp-logger-dates.cpp | 6 +++---
KTp/Logger/plugins/tplogger/pending-tp-logger-entities.cpp | 6 +++---
KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp | 8 ++++----
KTp/Logger/plugins/tplogger/pending-tp-logger-search.cpp | 8 ++++----
KTp/Logger/plugins/tplogger/tp-logger-plugin.cpp | 12 +++++++-----
KTp/Logger/plugins/tplogger/utils.h | 2 +-
11 files changed, 32 insertions(+), 28 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11efb82..987d0e4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ set(REQUIRED_TPQT_VERSION 0.9.2.1)
find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} REQUIRED)
find_package (TelepathyQt5Service ${REQUIRED_TPQT_VERSION} REQUIRED) #used for the otr-proxy
-find_package (TelepathyLoggerQt5 QUIET)
+find_package (TelepathyLoggerQt QUIET)
find_package (KF5People 0.5)
find_package (KAccounts)
@@ -57,7 +57,7 @@ set_package_properties(KF5People PROPERTIES DESCRIPTION "Support for KDE Contact
URL "https://projects.kde.org/libkpeople"
TYPE OPTIONAL
)
-set_package_properties(TelepathyLoggerQt5 PROPERTIES DESCRIPTION "Qt bindings for TelepathyLogger. This is needed to provide access to chat logs. HIGHLY recommended"
+set_package_properties(TelepathyLoggerQt PROPERTIES DESCRIPTION "Qt bindings for TelepathyLogger. This is needed to provide access to chat logs. HIGHLY recommended"
URL "http://projects.kde.org/telepathy-logger-qt"
TYPE OPTIONAL
)
@@ -82,10 +82,9 @@ include_directories (
${CMAKE_CURRENT_SOURCE_DIR}
)
-if (TELEPATHY_LOGGER_QT5_FOUND)
+if (TelepathyLoggerQt_FOUND)
add_definitions(${TELEPATHY_LOGGER_QT5_DEFINITIONS}
-DHAVE_TPLOGGERQT)
- include_directories(${TELEPATHY_LOGGER_QT5_INCLUDE_DIRS})
endif ()
if (KF5People_FOUND)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 5461dd0..d5ca6bd 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -61,10 +61,10 @@ set (ktp_common_internals_private_HDRS
${CMAKE_CURRENT_BINARY_DIR}/ktpcommoninternals_export.h
)
-if (TELEPATHY_LOGGER_QT5_FOUND)
+if (TelepathyLoggerQt_FOUND)
set (ktp_private_LIBS
${ktp_private_LIBS}
- ${TELEPATHY_LOGGER_QT5_LIBRARIES}
+ ${TELEPATHY_LOGGER_LIBRARIES}
)
endif ()
diff --git a/KTp/Logger/CMakeLists.txt b/KTp/Logger/CMakeLists.txt
index afeca6f..78a8da0 100644
--- a/KTp/Logger/CMakeLists.txt
+++ b/KTp/Logger/CMakeLists.txt
@@ -49,7 +49,7 @@ target_include_directories(KTpLogger PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_BI
target_link_libraries (KTpLogger
PUBLIC
KTp::CommonInternals
- ${TELEPATHY_LOGGER_QT5_LIBRARIES}
+ ${TELEPATHY_LOGGER_LIBRARIES}
PRIVATE
KF5::KDELibs4Support
)
diff --git a/KTp/Logger/plugins/CMakeLists.txt b/KTp/Logger/plugins/CMakeLists.txt
index bd15c96..e83652a 100644
--- a/KTp/Logger/plugins/CMakeLists.txt
+++ b/KTp/Logger/plugins/CMakeLists.txt
@@ -1,3 +1,3 @@
-if (TELEPATHY_LOGGER_QT5_FOUND)
+if (TelepathyLoggerQt_FOUND)
add_subdirectory(tplogger)
endif()
diff --git a/KTp/Logger/plugins/tplogger/CMakeLists.txt b/KTp/Logger/plugins/tplogger/CMakeLists.txt
index 1598b16..123a4e6 100644
--- a/KTp/Logger/plugins/tplogger/CMakeLists.txt
+++ b/KTp/Logger/plugins/tplogger/CMakeLists.txt
@@ -10,7 +10,10 @@ add_library (ktploggerplugin_tplogger MODULE
target_link_libraries (ktploggerplugin_tplogger
KTp::CommonInternals
KTp::Logger
+ KF5::Service
+ KF5::KDELibs4Support
)
+kde_target_enable_exceptions(ktploggerplugin_tplogger PRIVATE)
# Install:
install (TARGETS ktploggerplugin_tplogger
diff --git a/KTp/Logger/plugins/tplogger/pending-tp-logger-dates.cpp b/KTp/Logger/plugins/tplogger/pending-tp-logger-dates.cpp
index f50f6d0..417e0e0 100644
--- a/KTp/Logger/plugins/tplogger/pending-tp-logger-dates.cpp
+++ b/KTp/Logger/plugins/tplogger/pending-tp-logger-dates.cpp
@@ -21,9 +21,9 @@
#include "log-entity.h"
#include "utils.h"
-#include <TelepathyLoggerQt4/LogManager>
-#include <TelepathyLoggerQt4/Entity>
-#include <TelepathyLoggerQt4/PendingDates>
+#include <TelepathyLoggerQt/LogManager>
+#include <TelepathyLoggerQt/Entity>
+#include <TelepathyLoggerQt/PendingDates>
#include <TelepathyQt/Contact>
PendingTpLoggerDates::PendingTpLoggerDates(const Tp::AccountPtr &account,
diff --git a/KTp/Logger/plugins/tplogger/pending-tp-logger-entities.cpp b/KTp/Logger/plugins/tplogger/pending-tp-logger-entities.cpp
index c7986d6..12bf519 100644
--- a/KTp/Logger/plugins/tplogger/pending-tp-logger-entities.cpp
+++ b/KTp/Logger/plugins/tplogger/pending-tp-logger-entities.cpp
@@ -20,9 +20,9 @@
#include "pending-tp-logger-entities.h"
#include "utils.h"
-#include <TelepathyLoggerQt4/LogManager>
-#include <TelepathyLoggerQt4/Entity>
-#include <TelepathyLoggerQt4/PendingEntities>
+#include <TelepathyLoggerQt/LogManager>
+#include <TelepathyLoggerQt/Entity>
+#include <TelepathyLoggerQt/PendingEntities>
#include <TelepathyQt/Account>
PendingTpLoggerEntities::PendingTpLoggerEntities(const Tp::AccountPtr &account,
diff --git a/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp b/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
index 0222564..71c345d 100644
--- a/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
+++ b/KTp/Logger/plugins/tplogger/pending-tp-logger-logs.cpp
@@ -21,10 +21,10 @@
#include "utils.h"
#include <TelepathyQt/Contact>
-#include <TelepathyLoggerQt4/LogManager>
-#include <TelepathyLoggerQt4/Entity>
-#include <TelepathyLoggerQt4/TextEvent>
-#include <TelepathyLoggerQt4/PendingEvents>
+#include <TelepathyLoggerQt/LogManager>
+#include <TelepathyLoggerQt/Entity>
+#include <TelepathyLoggerQt/TextEvent>
+#include <TelepathyLoggerQt/PendingEvents>
#include <KTp/message-processor.h>
diff --git a/KTp/Logger/plugins/tplogger/pending-tp-logger-search.cpp b/KTp/Logger/plugins/tplogger/pending-tp-logger-search.cpp
index 4c1090b..fc8807c 100644
--- a/KTp/Logger/plugins/tplogger/pending-tp-logger-search.cpp
+++ b/KTp/Logger/plugins/tplogger/pending-tp-logger-search.cpp
@@ -19,10 +19,10 @@
#include "pending-tp-logger-search.h"
-#include <TelepathyLoggerQt4/LogManager>
-#include <TelepathyLoggerQt4/PendingSearch>
-#include <TelepathyLoggerQt4/SearchHit>
-#include <TelepathyLoggerQt4/Entity>
+#include <TelepathyLoggerQt/LogManager>
+#include <TelepathyLoggerQt/PendingSearch>
+#include <TelepathyLoggerQt/SearchHit>
+#include <TelepathyLoggerQt/Entity>
#include <TelepathyQt/Account>
diff --git a/KTp/Logger/plugins/tplogger/tp-logger-plugin.cpp b/KTp/Logger/plugins/tplogger/tp-logger-plugin.cpp
index 8c0cb16..24ed7ee 100644
--- a/KTp/Logger/plugins/tplogger/tp-logger-plugin.cpp
+++ b/KTp/Logger/plugins/tplogger/tp-logger-plugin.cpp
@@ -24,11 +24,10 @@
#include "utils.h"
#include "pending-tp-logger-search.h"
-#include <TelepathyLoggerQt4/LogManager>
-#include <TelepathyLoggerQt4/Init>
-#include <TelepathyLoggerQt4/PendingOperation>
+#include <TelepathyLoggerQt/LogManager>
+#include <TelepathyLoggerQt/Init>
+#include <TelepathyLoggerQt/PendingOperation>
-#include <KDebug>
#include <KPluginFactory>
TpLoggerPlugin::TpLoggerPlugin(QObject *parent, const QVariantList &):
@@ -85,7 +84,7 @@ void TpLoggerPlugin::clearContactLogs(const Tp::AccountPtr &account,
void TpLoggerPlugin::genericOperationFinished(Tpl::PendingOperation *operation)
{
if (operation->isError()) {
- kWarning() << operation->errorName() << ":" << operation->errorMessage();
+ qWarning() << operation->errorName() << ":" << operation->errorMessage();
}
}
@@ -103,3 +102,6 @@ bool TpLoggerPlugin::logsExist(const Tp::AccountPtr &account, const KTp::LogEnti
K_PLUGIN_FACTORY(TpLoggerPluginFactory, registerPlugin<TpLoggerPlugin>();)
K_EXPORT_PLUGIN(TpLoggerPluginFactory("ktp_logger_plugin_tpLogger"))
+
+#include "tp-logger-plugin.moc"
+#include "moc_tp-logger-plugin.cpp"
diff --git a/KTp/Logger/plugins/tplogger/utils.h b/KTp/Logger/plugins/tplogger/utils.h
index 4e25b6e..455aaf0 100644
--- a/KTp/Logger/plugins/tplogger/utils.h
+++ b/KTp/Logger/plugins/tplogger/utils.h
@@ -20,7 +20,7 @@
#ifndef UTILS_H
#define UTILS_H
-#include <TelepathyLoggerQt4/Entity>
+#include <TelepathyLoggerQt/Entity>
#include <KTp/Logger/log-entity.h>
namespace Utils
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list