# # SVN commit 948021 by gberg: # # Remove the telepathy protocol plugin. Its broken and deprecated and gone in trunk. # # (Backport of commit 947928) # Index: cmake/modules/FindDecibel.cmake =================================================================== --- cmake/modules/FindDecibel.cmake (revision 948020) +++ cmake/modules/FindDecibel.cmake (revision 948021) @@ -1,45 +0,0 @@ -# - Try to find Decibel packages (QtTapioca, QtTelepathy) -# Once done this will define -# -# DECIBEL_FOUND - Test has found Decibel dependencies -# DECIBEL_INCLUDES - Include needed for Decibel -# DECIBEL_LIBRARIES - Libraries needed for Decibel -# DECIBEL_DEFINITIONS - Compiler swithces required for using Decibel -# -# QT_TELEPATHY_INCLUDE_DIR - Include needed for QtTelepathy -# QT_TELEPATHY_LIBRARY - Library for QtTelepathy -# QT_TAPIOCA_INCLUDE_DIR - Included need for QtTapioca -# QT_TAPIOCA_LIBRARY - Library for QtTapioca -# -# use pkg-config to get the directories and then use these values -# in the FIND_PATH() and FIND_LIBRARY() calls -# -# Copyright (c) 2006, Michaƫl Larouche, <larouche@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 WIN32) -find_package(PkgConfig) -pkg_check_modules(QTTAPIOCA QtTapioca) - -ENDIF(NOT WIN32) - -set(QT_TAPIOCA_INCLUDE_DIR ${QTTAPIOCA_INCLUDE_DIRS}) - -set(DECIBEL_DEFINITIONS ${QTTAPIOCA_CFLAGS}) -set(DECIBEL_INCLUDES ${QT_TAPIOCA_INCLUDE_DIR} ) - -FIND_LIBRARY(QT_TAPIOCA_LIBRARY NAMES QtTapioca - PATHS - ${QTTAPIOCA_LIBRARY_DIRS} - NO_DEFAULT_PATH -) - -set(DECIBEL_LIBRARIES ${QT_TAPIOCA_LIBRARY}) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(Decibel DEFAULT_MSG DECIBEL_INCLUDES DECIBEL_LIBRARIES ) - -MARK_AS_ADVANCED(QT_TAPIOCA_INCLUDE_DIR QT_TAPIOCA_LIBRARY) Index: kopete/protocols/CMakeLists.txt =================================================================== --- kopete/protocols/CMakeLists.txt (revision 948020) +++ kopete/protocols/CMakeLists.txt (revision 948021) @@ -12,7 +12,6 @@ option(WITH_qq "Enable Kopete QQ protocol" ON) option(WITH_sms "Enable Kopete SMS protocol" ON) option(WITH_groupwise "Enable Novell GroupWise Messenger protocol" ON) -option(WITH_telepathy "Enable Telepathy testbed protocol" OFF) option(WITH_winpopup "Enable Kopete winpopup protocol" ON) option(WITH_gadu "Enable Kopete Gadu-Gadu protocol" ON) option(WITH_jabber "Enable Kopete Jabber protocol" ON) @@ -75,10 +74,6 @@ add_subdirectory( testbed ) endif(WITH_testbed) -if(WITH_telepathy AND DECIBEL_FOUND) - add_subdirectory( telepathy ) -endif(WITH_telepathy AND DECIBEL_FOUND) - if(WITH_bonjour) add_subdirectory( bonjour ) endif(WITH_bonjour) Index: CMakeLists.txt =================================================================== --- CMakeLists.txt (revision 948020) +++ CMakeLists.txt (revision 948021) @@ -57,9 +57,6 @@ macro_optional_find_package(QCA2) macro_log_feature(QCA2_FOUND "QCA2" "Qt Cryptographic Architecture" "http://delta.affinix.com/qca" FALSE "2.0.0" "Needed to build Kopete's GroupWise and Jabber protocols.") -macro_optional_find_package(Decibel) -macro_log_feature(DECIBEL_FOUND "Decibel" "KDE framework for real-time communication" "http://decibel.kde.org/" FALSE "" "Used by the Kopete telepathy protocol.") - macro_optional_find_package(IDN) macro_log_feature(IDN_FOUND "IDN" "GNU Libidn Internationalized Domain Name (IDN) implemenation" "http://www.gnu.org/software/libidn/" FALSE "" "Used by the Kopete Jabber plugin.")