[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:27 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=390b2da
The following commit has been merged in the master branch:
commit 390b2dae8855b9c6a45176455180e8192bb2e4a4
Author: Aleix Pol <aleixpol at kde.org>
Date: Mon Oct 20 16:06:03 2014 +0200
Adopt newly ported KPeople
It wasn't being built, not it is. It seems to work fine.
---
CMakeLists.txt | 7 +++----
KTp/CMakeLists.txt | 4 ++--
KTp/Logger/plugins/tplogger/CMakeLists.txt | 3 ++-
KTp/Models/CMakeLists.txt | 8 ++------
kpeople/actionsplugin/CMakeLists.txt | 4 ++--
kpeople/actionsplugin/kpeople-actions-plugin.cpp | 6 ++----
kpeople/datasourceplugin/CMakeLists.txt | 18 +++++-------------
kpeople/uiplugins/CMakeLists.txt | 2 +-
kpeople/uiplugins/imdetailswidget.cpp | 1 +
tests/CMakeLists.txt | 6 +++---
tests/kpeople-model-view-main.cpp | 6 +++---
11 files changed, 26 insertions(+), 39 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 923d48a..5610ccc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ find_package (KF5 REQUIRED COMPONENTS
find_package (TelepathyQt5 0.9.2.1 REQUIRED)
find_package (TelepathyLoggerQt5 QUIET)
-find_package (KPeople 0.3 QUIET)
+find_package (KF5People 0.5)
find_package (KAccounts)
find_package(AccountsQt5 1.10 CONFIG)
@@ -45,7 +45,7 @@ include(WriteBasicConfigVersionFile)
include(CheckIncludeFiles)
include(FeatureSummary)
-set_package_properties(KPeople PROPERTIES DESCRIPTION "Support for KDE Contact Aggregation"
+set_package_properties(KF5People PROPERTIES DESCRIPTION "Support for KDE Contact Aggregation"
URL "https://projects.kde.org/libkpeople"
TYPE OPTIONAL
)
@@ -72,8 +72,7 @@ if (TELEPATHY_LOGGER_QT5_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 ()
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index dc4a2ca..828a8d5 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -79,12 +79,12 @@ if (TELEPATHY_LOGGER_QT5_FOUND)
)
endif ()
-if (KPEOPLE_FOUND)
+if (KF5People_FOUND)
include_directories(${KPEOPLE_INCLUDES})
set (ktp_private_LIBS
${ktp_private_LIBS}
- ${KPEOPLE_LIBS}
+ KF5::People
)
endif()
diff --git a/KTp/Logger/plugins/tplogger/CMakeLists.txt b/KTp/Logger/plugins/tplogger/CMakeLists.txt
index 5a36206..ffd06db 100644
--- a/KTp/Logger/plugins/tplogger/CMakeLists.txt
+++ b/KTp/Logger/plugins/tplogger/CMakeLists.txt
@@ -7,13 +7,14 @@ set (ktploggerplugin_tplogger_SRCS
utils.cpp
)
-kde4_add_plugin (ktploggerplugin_tplogger
+add_library (ktploggerplugin_tplogger MODULE
${ktploggerplugin_tplogger_SRCS}
)
target_link_libraries (ktploggerplugin_tplogger
ktpcommoninternalsprivate
ktploggerprivate
+
${QT_LIBRARIES}
${TELEPATHY_QT5_LIBRARIES}
diff --git a/KTp/Models/CMakeLists.txt b/KTp/Models/CMakeLists.txt
index 1b69e6e..3d14aff 100644
--- a/KTp/Models/CMakeLists.txt
+++ b/KTp/Models/CMakeLists.txt
@@ -1,7 +1,3 @@
-include_directories (${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
set (ktp_models_private_SRCS
${KTP_GLOBAL_SOURCES}
abstract-grouping-proxy-model.cpp
@@ -36,7 +32,7 @@ set (ktp_models_private_LIBS
ktpcommoninternalsprivate
)
-if (KPEOPLE_FOUND)
+if (KF5People_FOUND)
add_definitions(-DHAVE_KPEOPLE)
set (ktp_models_private_SRCS
@@ -46,7 +42,7 @@ if (KPEOPLE_FOUND)
set (ktp_models_private_LIBS
${ktp_models_private_LIBS}
- ${KPEOPLE_LIBS}
+ KF5::People
${KDEPIMLIBS_KABC_LIBS}
)
endif ()
diff --git a/kpeople/actionsplugin/CMakeLists.txt b/kpeople/actionsplugin/CMakeLists.txt
index e4d1fee..57ec65f 100644
--- a/kpeople/actionsplugin/CMakeLists.txt
+++ b/kpeople/actionsplugin/CMakeLists.txt
@@ -4,7 +4,7 @@ set (ktp_kpeople_plugin_SRCS
kpeople-actions-plugin.cpp
)
-kde4_add_plugin (ktp_kpeople_plugin
+add_library (ktp_kpeople_plugin MODULE
${ktp_kpeople_plugin_SRCS}
)
@@ -12,7 +12,7 @@ target_link_libraries (ktp_kpeople_plugin
${QT_LIBRARIES}
${TELEPATHY_QT5_LIBRARIES}
${KDE4_KDEUI_LIBS}
- ${KPEOPLE_LIBS}
+ KF5::People
${KDE4_KFILE_LIBS}
ktpcommoninternalsprivate
${KDEPIMLIBS_KABC_LIBS}
diff --git a/kpeople/actionsplugin/kpeople-actions-plugin.cpp b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
index 3d8c366..9fec2d3 100644
--- a/kpeople/actionsplugin/kpeople-actions-plugin.cpp
+++ b/kpeople/actionsplugin/kpeople-actions-plugin.cpp
@@ -236,9 +236,7 @@ void KPeopleActionsPlugin::onActionTriggered()
}
}
-#include "kpeople-actions-plugin.moc"
-#include "moc_kpeople-actions-plugin.cpp"
-
-
K_PLUGIN_FACTORY( KPeopleActionsPluginFactory, registerPlugin<KPeopleActionsPlugin>(); )
K_EXPORT_PLUGIN( KPeopleActionsPluginFactory("ktp_kpeople_plugin", "ktp-common-internals") )
+
+#include "kpeople-actions-plugin.moc"
diff --git a/kpeople/datasourceplugin/CMakeLists.txt b/kpeople/datasourceplugin/CMakeLists.txt
index b3fb61d..ad64d65 100644
--- a/kpeople/datasourceplugin/CMakeLists.txt
+++ b/kpeople/datasourceplugin/CMakeLists.txt
@@ -1,20 +1,12 @@
-include_directories(${KPEOPLE_INCLUDES})
+find_package(Qt5Sql REQUIRED)
-set (im_persons_data_source_SRCS
- im-persons-data-source.cpp
-)
-
-kde4_add_plugin (im_persons_data_source_plugin
- ${im_persons_data_source_SRCS}
-)
+add_library (im_persons_data_source_plugin MODULE im-persons-data-source.cpp)
target_link_libraries (im_persons_data_source_plugin
- ${QT_LIBRARIES}
- ${QT_QTSQL_LIBRARIES}
+ Qt5::Sql
+ KF5::People
+ KF5::Abc
${TELEPATHY_QT5_LIBRARIES}
- ${KDE4_KDEUI_LIBS}
- ${KPEOPLE_LIBS}
- ${KDEPIMLIBS_KABC_LIBS}
ktpcommoninternalsprivate
)
diff --git a/kpeople/uiplugins/CMakeLists.txt b/kpeople/uiplugins/CMakeLists.txt
index fda1f2c..f26e9c9 100644
--- a/kpeople/uiplugins/CMakeLists.txt
+++ b/kpeople/uiplugins/CMakeLists.txt
@@ -6,7 +6,7 @@ target_link_libraries(imdetailswidgetplugin Qt5::Core
${TELEPATHY_QT5_LIBRARIES}
${KDE4_KDECORE_LIBRARY}
${KDE4_KDEUI_LIBRARY}
- ${KPEOPLE_LIBS}
+ KF5::People
${KDEPIMLIBS_KABC_LIBS}
kpeoplewidgets
ktpcommoninternalsprivate
diff --git a/kpeople/uiplugins/imdetailswidget.cpp b/kpeople/uiplugins/imdetailswidget.cpp
index b92cc07..47406db 100644
--- a/kpeople/uiplugins/imdetailswidget.cpp
+++ b/kpeople/uiplugins/imdetailswidget.cpp
@@ -84,3 +84,4 @@ QWidget* ImDetailsWidget::createDetailsWidget(const KABC::Addressee& person, con
}
}
+#include "imdetailswidget.moc"
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 56c67ba..d1ba8cd 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,7 +29,7 @@ target_link_libraries(ktp_contact_list_model_view
ktpmodelsprivate
)
-if (KPEOPLE_FOUND)
+if (KF5People_FOUND)
include_directories(${KPEOPLE_INCLUDES})
@@ -42,9 +42,9 @@ add_executable(ktp_kpeople_list_model_view
target_link_libraries(ktp_kpeople_list_model_view
Qt5::Test
- ${KDE4_KDEUI_LIBS}
+ KF5::KDELibs4Support
${TELEPATHY_QT5_LIBRARIES}
- ${KPEOPLE_LIBS}
+ KF5::People
ktpcommoninternalsprivate
ktpmodelsprivate
)
diff --git a/tests/kpeople-model-view-main.cpp b/tests/kpeople-model-view-main.cpp
index 26f6a0f..377364a 100644
--- a/tests/kpeople-model-view-main.cpp
+++ b/tests/kpeople-model-view-main.cpp
@@ -20,7 +20,7 @@
#include "model-view.h"
-#include <KAboutData>
+#include <K4AboutData>
#include <KCmdLineArgs>
#include <KDebug>
#include <KApplication>
@@ -43,12 +43,12 @@
int main(int argc, char *argv[])
{
- KAboutData aboutData("telepathy-kde-models-test-ui",
+ K4AboutData aboutData("telepathy-kde-models-test-ui",
0,
ki18n("Telepathy KDE Models Test UI"),
"0.1",
ki18n("Telepathy KDE Models Test UI"),
- KAboutData::License_LGPL,
+ K4AboutData::License_LGPL,
ki18n("(C) 2011 Collabora Ltd"));
KCmdLineArgs::init(argc, argv, &aboutData);
--
ktp-common-internals packaging
More information about the pkg-kde-commits
mailing list