[SCM] ktp-auth-handler packaging branch, master, updated. debian/15.12.1-2-282-g080758e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-auth-handler.git;a=commitdiff;h=92ba8d4

The following commit has been merged in the master branch:
commit 92ba8d453796817d0414174908e653187de5bcaa
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Thu Aug 21 16:05:22 2014 +0200

    Port the CMakeLists to Qt5/KF5 stuff
---
 CMakeLists.txt | 80 +++++++++++++++++++++++++++++++---------------------------
 1 file changed, 43 insertions(+), 37 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00e82df..eda1005 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,44 +2,50 @@ project(ktp-auth-handler)
 
 set(KTP_AUTH_HANDLER_VERSION "0.8.1")
 
-set (CMAKE_MODULE_PATH
-     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules"
-     ${CMAKE_MODULE_PATH}
-)
+cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+
+find_package(Qt5 5.3 CONFIG REQUIRED COMPONENTS DBus Gui Core Network) #Network for QSsl
+
+find_package(ECM 0.0.11 REQUIRED NO_MODULE)
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
+
+find_package(KF5 5.0 REQUIRED COMPONENTS Wallet WidgetsAddons I18n KIO WebKit)
+
 cmake_policy(SET CMP0002 OLD)
 
 set(IS_KTP_INTERNAL_MODULE TRUE)
-set(KDE_MIN_VERSION "4.4.75")
-find_package (KDE4 4.4.75 REQUIRED)
-find_package (TelepathyQt4 0.8.9 REQUIRED)
+find_package (TelepathyQt5 0.8.9 REQUIRED)
 find_package (KTp REQUIRED)
-find_package (QJSON REQUIRED)
-find_package (QCA2 REQUIRED)
-find_package (AccountsQt)
-find_package (SignOnQt)
-
-include (KDE4Defaults)
-include (MacroLibrary)
-
-macro_log_feature(ACCOUNTSQT_FOUND "AccountsQt" "Support for Accounts-SSO" "https://code.google.com/p/accounts-sso/source/checkout?repo=libaccounts-qt" FALSE "" "")
-macro_log_feature(SIGNONQT_FOUND "SignonsQt" "Support for Accounts-SSO" "https://code.google.com/p/accounts-sso/source/checkout?repo=signond" FALSE "" "")
-macro_display_feature_log()
+find_package (Qca REQUIRED)
+find_package(AccountsQt5 1.10 REQUIRED CONFIG)
+find_package(SignOnQt5 8.55 REQUIRED CONFIG)
+
+# include (MacroLibrary)
+#
+# macro_log_feature(ACCOUNTSQT_FOUND "AccountsQt" "Support for Accounts-SSO" "https://code.google.com/p/accounts-sso/source/checkout?repo=libaccounts-qt" FALSE "" "")
+# macro_log_feature(SIGNONQT_FOUND "SignonsQt" "Support for Accounts-SSO" "https://code.google.com/p/accounts-sso/source/checkout?repo=signond" FALSE "" "")
+# macro_display_feature_log()
 message("-----------------------------------------------------------------------------")
 message("IMPORTANT: There is a runtime dependency on QCA-OSSL. ")
 message("This project will build, but will fail to run properly. Please ensure it is installed.")
 message("If you are a packager you _must_ mark this as a dependency.")
 message("-----------------------------------------------------------------------------")
 
-add_definitions (${KDE4_DEFINITIONS})
+include(KDEInstallDirs)
+include(KDECMakeSettings)
+include(KDECompilerSettings)
+include(ECMPackageConfigHelpers)
+include(ECMMarkNonGuiExecutable)
+include(CMakePackageConfigHelpers)
+include(FeatureSummary)
 
-include_directories (${KDE4_INCLUDES}
-                     ${TELEPATHY_QT4_INCLUDE_DIR}
+include_directories (${TELEPATHY_QT5_INCLUDE_DIR}
                      ${KTP_INCLUDE_DIR}
-                     ${QJSON_INCLUDE_DIR}
-                     ${QCA2_INCLUDE_DIR}
-                     ${CMAKE_CURRENT_SOURCE_DIR}/kssl
+                     ${QCA_INCLUDE_DIR}
 )
 
+feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES)
+
 set(ktp_auth_handler_SRCS
     main.cpp
     sasl-handler.cpp
@@ -56,18 +62,18 @@ set(ktp_auth_handler_SRCS
 )
 
 set(ktp_auth_handler_LIBS
-    ${QT_QTDBUS_LIBRARY}
-    ${QT_QTGUI_LIBRARY}
-    ${QT_QTXML_LIBRARY}
-    ${QT_QTCORE_LIBRARY}
-    ${QT_QTWEBKIT_LIBRARY}
-    ${TELEPATHY_QT4_LIBRARIES}
+    ${TELEPATHY_QT5_LIBRARIES}
     ${KTP_LIBRARIES}
-    ${KDE4_KDECORE_LIBS}
-    ${KDE4_KDEUI_LIBS}
-    ${KDE4_KDEWEBKIT_LIBS}
-    ${QJSON_LIBRARIES}
-    ${QCA2_LIBRARIES}
+    ${Qca_LIBRARY}
+    KF5::WidgetsAddons
+    KF5::Wallet
+    KF5::I18n
+    KF5::KIOCore
+    KF5::KIOWidgets
+    KF5::WebKit
+    Qt5::Core
+    Qt5::DBus
+    Qt5::Network
 )
 
 #If we find Accounts-SSO frameworks, add support for it
@@ -95,8 +101,8 @@ endif(ACCOUNTSQT_FOUND AND SIGNONQT_FOUND)
 
 configure_file(version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h)
 
-kde4_add_ui_files(ktp_auth_handler_SRCS x-telepathy-password-prompt.ui)
-kde4_add_executable(ktp-auth-handler ${ktp_auth_handler_SRCS})
+ki18n_wrap_ui(ktp_auth_handler_SRCS x-telepathy-password-prompt.ui)
+add_executable(ktp-auth-handler ${ktp_auth_handler_SRCS})
 
 target_link_libraries(ktp-auth-handler
     ${ktp_auth_handler_LIBS}

-- 
ktp-auth-handler packaging