[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:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=b26ffce
The following commit has been merged in the master branch:
commit b26ffce5003613cf18ed0799ae8f004996cf7e24
Merge: 9523cbb4876a2a962b859763283bf1bdb4d84213 6273c1d411f0be668ea9d8f9b0ead2ad1df38dfc
Author: Aleix Pol <aleixpol at kde.org>
Date: Fri Oct 24 16:14:38 2014 +0200
Merge branch 'master' into frameworks
Introduces all the OTR stuff
Conflicts:
CMakeLists.txt
CMakeLists.txt | 20 +-
KTp/CMakeLists.txt | 1 +
KTp/Logger/ktp_logger_plugin.desktop | 1 +
.../ktploggerplugin_tplogger.desktop.cmake | 2 +
KTp/OTR/CMakeLists.txt | 43 +
KTp/OTR/channel-adapter.cpp | 454 ++++++++++
KTp/OTR/channel-adapter.h | 116 +++
KTp/OTR/channel-proxy-interface.cpp | 52 ++
KTp/OTR/channel-proxy-interface.h | 691 +++++++++++++++
KTp/OTR/constants.h | 121 +++
KTp/OTR/proxy-service-interface.cpp | 45 +
KTp/OTR/proxy-service-interface.h | 354 ++++++++
KTp/OTR/types.cpp | 67 ++
KTp/OTR/types.h | 82 ++
KTp/OTR/utils.cpp | 92 ++
KTp/OTR/utils.h | 51 ++
KTp/presence.cpp | 2 +-
KTp/types.h | 6 +-
cmake/modules/FindLibOTR.cmake | 36 +
cmake/modules/FindLibgcrypt.cmake | 21 +
data/ktelepathy.notifyrc | 58 ++
kpeople/CMakeLists.txt | 2 +-
kpeople/uiplugins/CMakeLists.txt | 2 +
kpeople/uiplugins/chatplugin/CMakeLists.txt | 17 +
.../uiplugins/chatplugin/chatlistviewdelegate.cpp | 60 ++
.../chatlistviewdelegate.h} | 33 +-
.../uiplugins/chatplugin/kpeople_chat_plugin.cpp | 166 ++++
.../chatplugin/kpeople_chat_plugin.desktop} | 8 +-
.../kpeople_chat_plugin.h} | 36 +-
otr-proxy/CMakeLists.txt | 8 +
otr-proxy/KTpProxy/CMakeLists.txt | 39 +
otr-proxy/KTpProxy/ktp-proxy-config.kcfg | 25 +
otr-proxy/KTpProxy/ktp-proxy-config.kcfgc | 7 +
otr-proxy/KTpProxy/main.cpp | 94 ++
otr-proxy/KTpProxy/otr-config.cpp | 76 ++
otr-proxy/KTpProxy/otr-config.h | 46 +
otr-proxy/KTpProxy/otr-constants.h | 61 ++
otr-proxy/KTpProxy/otr-manager.cpp | 623 ++++++++++++++
otr-proxy/KTpProxy/otr-manager.h | 121 +++
otr-proxy/KTpProxy/otr-message.cpp | 196 +++++
otr-proxy/KTpProxy/otr-message.h | 84 ++
otr-proxy/KTpProxy/otr-proxy-channel-adaptee.cpp | 526 ++++++++++++
otr-proxy/KTpProxy/otr-proxy-channel-adaptee.h | 126 +++
otr-proxy/KTpProxy/otr-proxy-channel.cpp | 78 ++
otr-proxy/KTpProxy/otr-proxy-channel.h | 76 ++
otr-proxy/KTpProxy/otr-session.cpp | 420 +++++++++
otr-proxy/KTpProxy/otr-session.h | 152 ++++
otr-proxy/KTpProxy/otr-utils.cpp | 96 +++
otr-proxy/KTpProxy/otr-utils.h | 97 +++
otr-proxy/KTpProxy/pending-curry-operation.cpp | 38 +
otr-proxy/KTpProxy/pending-curry-operation.h | 40 +
otr-proxy/KTpProxy/proxy-observer.cpp | 66 ++
otr-proxy/KTpProxy/proxy-observer.h | 49 ++
otr-proxy/KTpProxy/proxy-service-adaptee.cpp | 156 ++++
otr-proxy/KTpProxy/proxy-service-adaptee.h | 79 ++
otr-proxy/KTpProxy/proxy-service.cpp | 206 +++++
otr-proxy/KTpProxy/proxy-service.h | 87 ++
otr-proxy/KTpProxy/svc-channel-proxy.cpp | 198 +++++
otr-proxy/KTpProxy/svc-channel-proxy.h | 528 ++++++++++++
otr-proxy/KTpProxy/svc-proxy-service.cpp | 107 +++
otr-proxy/KTpProxy/svc-proxy-service.h | 280 ++++++
otr-proxy/KTpProxy/types.h | 34 +
otr-proxy/data/CMakeLists.txt | 7 +
otr-proxy/data/KTp.Proxy.client | 12 +
...eedesktop.Telepathy.Client.KTp.Proxy.service.in | 3 +
otr-proxy/spec/ChannelProxy_Interface_OTR.xml | 509 +++++++++++
otr-proxy/spec/ProxyService.xml | 258 ++++++
otr-proxy/test/CMakeLists.txt | 40 +
otr-proxy/test/lib/CMakeLists.txt | 7 +
otr-proxy/test/lib/test-config.cpp | 51 ++
otr-proxy/test/lib/test-config.h | 45 +
otr-proxy/test/lib/test-session.cpp | 49 ++
otr-proxy/test/lib/test-session.h | 45 +
otr-proxy/test/otr-test.cpp | 956 +++++++++++++++++++++
otr-proxy/test/resources/alice_id.instags | 2 +
otr-proxy/test/resources/alice_id.privkeys | 15 +
otr-proxy/test/resources/bob_id.instags | 2 +
otr-proxy/test/resources/bob_id.privkeys | 15 +
otr-proxy/test/resources/john_id.instags | 2 +
otr-proxy/test/resources/john_id.privkeys | 15 +
otr-proxy/test/utils-test.cpp | 76 ++
81 files changed, 9531 insertions(+), 36 deletions(-)
diff --cc CMakeLists.txt
index 0547b86,c98ca62..8644b5b
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -9,106 -8,77 +9,124 @@@ set (CMAKE_MODULE_PAT
)
cmake_policy(SET CMP0002 OLD)
-set (KTP_VERSION "0.8.80")
-# Bump for every 0.x release, or whenever BC changes
-set (KTP_SONUMBER 8) # Bumped for 0.9
-set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "4")
-
-find_package (KDE4 REQUIRED)
-find_package (TelepathyQt4 0.9.5 REQUIRED)
-find_package (TelepathyQt4Service 0.9.5 REQUIRED)
-find_package (TelepathyLoggerQt4)
-find_package (KPeople 0.2.1)
-find_package (KdepimLibs)
+find_package (Qt5 REQUIRED CONFIG COMPONENTS
+ Qml
+ Test)
+
+find_package (KF5 REQUIRED COMPONENTS
+ KCMUtils
+ NotifyConfig
+ TextEditor
+ Wallet
+ Config
+ KDELibs4Support)
+
+set(REQUIRED_TPQT_VERSION 0.9.2.1)
+
+find_package (TelepathyQt5 ${REQUIRED_TPQT_VERSION} REQUIRED)
+find_package (TelepathyLoggerQt5 QUIET)
+find_package (KF5People 0.5)
+
+find_package (KAccounts)
- find_package(AccountsQt5 1.10 CONFIG)
++find_package (AccountsQt5 1.10 CONFIG)
+ find_package (LibOTR 4.0.0)
+ find_package (Libgcrypt)
+
+ if (LIBOTR_FOUND AND LIBGCRYPT_FOUND)
+ set(OTR_LIBS_FOUND TRUE)
+ endif (LIBOTR_FOUND AND LIBGCRYPT_FOUND)
-# set some default settings
-include (KDE4Defaults)
-
-# make some more macros available
-include (MacroLibrary)
-
-macro_log_feature(TELEPATHY_LOGGER_QT4_FOUND "TelepatyLoggerQt4" "Qt bindings for TelepathyLogger. This is needed to provide access to chat logs. HIGHLY recommended" "http://projects.kde.org/telepathy-logger-qt" FALSE "" "")
-macro_log_feature(KPEOPLE_FOUND "KPeople" "Support for KDE Contact Aggregation" "https://projects.kde.org/libkpeople" FALSE "" "")
-macro_log_feature(KDEPIMLIBS_FOUND "KDE-PIM Libraries" "Support for Contact Aggregation" "https://projects.kde.org/kdepimlibs" FALSE "" "")
-macro_log_feature(LIBOTR_FOUND "LibOtr" "Required for OTR support" "" FALSE "" "")
-macro_log_feature(LIBGCRYPT_FOUND "LibGCrypt" "Required for OTR support" "" FALSE "" "")
-macro_display_feature_log()
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+include(ECMPackageConfigHelpers)
+include(ECMMarkNonGuiExecutable)
+include(ECMPackageConfigHelpers)
+include(ECMInstallIcons)
+include(ECMSetupVersion)
+include(CMakePackageConfigHelpers)
+include(WriteBasicConfigVersionFile)
+include(CheckIncludeFiles)
+include(FeatureSummary)
+
+set_package_properties(KF5People PROPERTIES DESCRIPTION "Support for KDE Contact Aggregation"
+ 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"
+ URL "http://projects.kde.org/telepathy-logger-qt"
+ TYPE OPTIONAL
+ )
++set_package_properties(LibOTR PROPERTIES DESCRIPTION "Required for OTR support" TYPE OPTIONAL)
++set_package_properties(Libgcrypt PROPERTIES DESCRIPTION "Required for OTR support" TYPE OPTIONAL)
+# Bump for every 0.x release, or whenever BC changes
+set (KTP_SONUMBER 9)
+set (KTP_VERSION "0.${KTP_SONUMBER}.0")
+set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
-add_definitions (${KDE4_DEFINITIONS}
+add_definitions(-DKTP_MESSAGE_FILTER_FRAMEWORK_VERSION=\"${KTP_MESSAGE_FILTER_FRAMEWORK_VERSION}\")
+add_definitions(-DTRANSLATION_DOMAIN=\"ktp-common-internals\")
+add_definitions (
-DQT_NO_CAST_FROM_ASCII
-DQT_NO_KEYWORDS
+ -std=c++11
)
-include_directories (${KDE4_INCLUDES}
+include_directories (
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
- ${TELEPATHY_QT4_INCLUDE_DIR}
)
-if (TELEPATHY_LOGGER_QT4_FOUND)
- add_definitions(${TELEPATHY_LOGGER_QT4_DEFINITIONS}
+if (TELEPATHY_LOGGER_QT5_FOUND)
+ add_definitions(${TELEPATHY_LOGGER_QT5_DEFINITIONS}
-DHAVE_TPLOGGERQT)
- include_directories(${TELEPATHY_LOGGER_QT4_INCLUDE_DIRS})
-endif (TELEPATHY_LOGGER_QT4_FOUND)
+ include_directories(${TELEPATHY_LOGGER_QT5_INCLUDE_DIRS})
+endif ()
-if (KPEOPLE_FOUND AND KDEPIMLIBS_FOUND)
- include_directories (${KDEPIMLIBS_INCLUDE_DIRS})
+if (KF5People_FOUND)
add_definitions(-DHAVE_KPEOPLE)
add_subdirectory(kpeople)
-endif (KPEOPLE_FOUND AND KDEPIMLIBS_FOUND)
+endif ()
-configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
+#If we find KAccounts library, build the plugin for it
+if (KACCOUNTS_FOUND AND AccountsQt5_FOUND)
+ include_directories(${KACCOUNTS_INCLUDE_DIRS} ${ACCOUNTSQT_INCLUDE_DIRS})
+ add_subdirectory(kaccounts)
+endif ()
-set(KTP_GLOBAL_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/global.cpp)
+ecm_setup_version(${KTP_VERSION} VARIABLE_PREFIX KTP
+ VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/ktp_version.h"
+ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KTpConfigVersion.cmake"
+ SOVERSION ${KTP_SONUMBER})
add_subdirectory(KTp)
add_subdirectory(tools)
add_subdirectory(data)
+ if (KDE4_BUILD_TESTS)
add_subdirectory(tests)
+ endif ()
+
+ if (OTR_LIBS_FOUND)
+ include_directories (${LIBOTR_INCLUDE_DIR}
+ ${LIBGCRYPT_INCLUDE_DIR}
+ )
-
+ add_subdirectory(otr-proxy)
+ endif (OTR_LIBS_FOUND)
+
+set(CMAKECONFIG_INSTALL_DIR "${CMAKECONFIG_INSTALL_PREFIX}/KTp")
+
+ecm_configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KTpConfig.cmake.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/KTpConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR}
+ )
+
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KTpConfig.cmake"
+ "${CMAKE_CURRENT_BINARY_DIR}/KTpConfigVersion.cmake"
+ DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+ COMPONENT Devel )
+
+install(EXPORT KTpTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+ FILE KTpTargets.cmake NAMESPACE KTp:: COMPONENT Devel)
+
+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list