[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:29 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=361769e
The following commit has been merged in the master branch:
commit 361769efed82e83e89cfb72d5aad1c3f5e7bbed9
Author: Aleix Pol <aleixpol at kde.org>
Date: Fri Oct 24 18:45:40 2014 +0200
Port KTpOTR to Qt5+KF5
---
KTp/CMakeLists.txt | 2 +-
KTp/Models/presence-model.cpp | 2 +-
KTp/OTR/CMakeLists.txt | 41 +++++++++++++----------------
KTp/Widgets/contact-view-widget.cpp | 4 +--
KTp/message-escape-filter.cpp | 2 +-
cmake/modules/FindLibOTR.cmake | 11 +++++---
kpeople/uiplugins/chatplugin/CMakeLists.txt | 17 ++++--------
otr-proxy/KTpProxy/main.cpp | 2 +-
8 files changed, 37 insertions(+), 44 deletions(-)
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index ecd1b4e..cd94aef 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -100,7 +100,7 @@ target_link_libraries (KTpCommonInternals
KF5::KIOWidgets
KF5::KDELibs4Support
)
-target_include_directories(KTpCommonInternals PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # Remove when TelepathyQt exports include paths properly
+target_include_directories(KTpCommonInternals PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # TODO: Remove when TelepathyQt exports include paths properly
install (TARGETS KTpCommonInternals
EXPORT KTpTargets
diff --git a/KTp/Models/presence-model.cpp b/KTp/Models/presence-model.cpp
index 11014dc..b916ca5 100644
--- a/KTp/Models/presence-model.cpp
+++ b/KTp/Models/presence-model.cpp
@@ -21,7 +21,7 @@
#include "presence-model.h"
#include <QString>
-#include <QtGui/QFont>
+#include <QFont>
#include <QtDBus/QtDBus>
#include <KDE/KIcon>
diff --git a/KTp/OTR/CMakeLists.txt b/KTp/OTR/CMakeLists.txt
index 2a927e6..c85d626 100644
--- a/KTp/OTR/CMakeLists.txt
+++ b/KTp/OTR/CMakeLists.txt
@@ -1,16 +1,3 @@
-include_directories (${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-set (ktp_otr_private_SRCS
- ${KTP_GLOBAL_SOURCES}
- channel-adapter.cpp
- channel-proxy-interface.cpp
- proxy-service-interface.cpp
- types.cpp
- utils.cpp
-)
-
set (ktp_otr_private_HDRS
channel-adapter.h
channel-proxy-interface.h
@@ -20,22 +7,32 @@ set (ktp_otr_private_HDRS
utils.h
)
-kde4_add_library (ktpotrprivate SHARED
- ${ktp_otr_private_SRCS}
-)
+add_library (KTpOTR SHARED
+ channel-adapter.cpp
+ channel-proxy-interface.cpp
+ proxy-service-interface.cpp
+ types.cpp
+ utils.cpp)
+add_library(KTp::OTR ALIAS KTpOTR)
-set_target_properties(ktpotrprivate PROPERTIES
+set_target_properties(KTpOTR PROPERTIES
VERSION ${KTP_VERSION}
SOVERSION ${KTP_SONUMBER}
+ EXPORT_NAME OTR
DEFINE_SYMBOL MAKE_KTP_LIB)
-target_link_libraries (ktpotrprivate
- ${KDE4_KDECORE_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
+target_link_libraries (KTpOTR
+ PUBLIC
+ ${TELEPATHY_QT5_LIBRARIES}
+ PRIVATE
+ KF5::KDELibs4Support
+ KF5::I18n
)
+target_include_directories(KTpOTR PUBLIC ${TELEPATHY_QT5_INCLUDE_DIR}) # TODO: Remove when TelepathyQt exports include paths properly
-install (TARGETS ktpotrprivate
- DESTINATION ${LIB_INSTALL_DIR}
+install (TARGETS KTpOTR
+ EXPORT KTpTargets
+ ${INSTALL_TARGETS_DEFAULT_ARGS}
)
install (FILES ${ktp_otr_private_HDRS}
diff --git a/KTp/Widgets/contact-view-widget.cpp b/KTp/Widgets/contact-view-widget.cpp
index 9fa7d06..df2d014 100644
--- a/KTp/Widgets/contact-view-widget.cpp
+++ b/KTp/Widgets/contact-view-widget.cpp
@@ -24,8 +24,8 @@
#include <KDE/KLineEdit>
#include <KDE/KDebug>
-#include <QtGui/QTextOption>
-#include <QtGui/QPainter>
+#include <QTextOption>
+#include <QPainter>
#include <QtWidgets/QApplication>
#include <QtWidgets/QVBoxLayout>
diff --git a/KTp/message-escape-filter.cpp b/KTp/message-escape-filter.cpp
index 93513f2..d22a7ff 100644
--- a/KTp/message-escape-filter.cpp
+++ b/KTp/message-escape-filter.cpp
@@ -18,7 +18,7 @@
#include "message-filters-private.h"
-#include <QtGui/QTextDocument> //needed for Qt::escape
+#include <QTextDocument> //needed for Qt::escape
#include <KTp/text-parser.h>
#include <KUrl>
diff --git a/cmake/modules/FindLibOTR.cmake b/cmake/modules/FindLibOTR.cmake
index 9c771d2..25075ca 100644
--- a/cmake/modules/FindLibOTR.cmake
+++ b/cmake/modules/FindLibOTR.cmake
@@ -5,13 +5,12 @@
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-INCLUDE(MacroEnsureVersion)
INCLUDE(FindPackageHandleStandardArgs)
IF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
# Already in cache, be silent
SET(LIBOTR_FIND_QUIETLY TRUE)
-ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
+ENDIF ()
FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
@@ -23,7 +22,11 @@ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\.[0-9]+\.[0-9]+" LIBOTR_VERSION "${output}")
STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
# Check if version is at least 4.0.0
- MACRO_ENSURE_VERSION("4.0.0" ${LIBOTR_VERSION} LIBOTR_FOUND)
+ if(PACKAGE_FIND_VERSION VERSION_LESS ${LIBOTR_VERSION})
+ set(LIBOTR_FOUND FALSE)
+ else()
+ set(LIBOTR_FOUND TRUE)
+ endif()
IF( LIBOTR_FOUND )
IF( NOT LIBOTR_FIND_QUIETLY )
@@ -33,4 +36,4 @@ IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
MESSAGE(STATUS "libotr version 4.0.0 or greater required but found ${LIBOTR_VERSION}.")
ENDIF( LIBOTR_FOUND )
-ENDIF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
+ENDIF()
diff --git a/kpeople/uiplugins/chatplugin/CMakeLists.txt b/kpeople/uiplugins/chatplugin/CMakeLists.txt
index 14bffc9..04da1c8 100644
--- a/kpeople/uiplugins/chatplugin/CMakeLists.txt
+++ b/kpeople/uiplugins/chatplugin/CMakeLists.txt
@@ -1,16 +1,9 @@
-include_directories(${KPEOPLE_INCLUDES})
-
-kde4_add_plugin(kpeople_chat_plugin chatlistviewdelegate.cpp kpeople_chat_plugin.cpp)
+add_library(kpeople_chat_plugin MODULE chatlistviewdelegate.cpp kpeople_chat_plugin.cpp)
target_link_libraries(kpeople_chat_plugin ${QT_QTCORE_LIBRARY}
- ${QT_QTGUI_LIBRARY}
- ${TELEPATHY_QT4_LIBRARIES}
- ${KDE4_KDECORE_LIBRARY}
- ${KDE4_KDEUI_LIBRARY}
- ${KPEOPLE_LIBS}
- ${KDEPIMLIBS_KABC_LIBS}
- kpeoplewidgets
- ktploggerprivate
- ktpcommoninternalsprivate
+ KF5::PeopleWidgets
+ KTp::Logger
+ KTp::CommonInternals
+ KF5::KDELibs4Support
)
install(TARGETS kpeople_chat_plugin DESTINATION ${PLUGIN_INSTALL_DIR})
diff --git a/otr-proxy/KTpProxy/main.cpp b/otr-proxy/KTpProxy/main.cpp
index 9b80fec..5690863 100644
--- a/otr-proxy/KTpProxy/main.cpp
+++ b/otr-proxy/KTpProxy/main.cpp
@@ -19,7 +19,7 @@
#include "proxy-service.h"
#include "otr-config.h"
-#include "version.h"
+#include "../ktptextui_version.h"
#include <KTp/OTR/types.h>
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list