[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:25:00 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=4b2e10f
The following commit has been merged in the master branch:
commit 4b2e10f2202ca8ecb91bcb93fb7f5ffe57b44675
Merge: 14272a3e5efddd3c56911e449a3ae6f3635fceb3 02c533fbf96904f3aa2c14e2442df250268e048e
Author: Aleix Pol <aleixpol at kde.org>
Date: Thu Nov 13 13:45:56 2014 +0100
Merge branch 'frameworks'
CMakeLists.txt | 58 +++++--------
adiumxtra-protocol-handler/CMakeLists.txt | 12 ++-
.../adiumxtra-protocol-handler.cpp | 11 ++-
.../chat-style-installer.cpp | 9 +-
.../emoticon-set-installer.cpp | 11 +--
adiumxtra-protocol-handler/main.cpp | 10 +--
app/CMakeLists.txt | 39 ++++-----
app/chat-tab.cpp | 4 +-
app/chat-tab.h | 3 +-
app/chat-window.cpp | 96 +++++++++++-----------
app/chat-window.h | 9 +-
app/emoticon-text-edit-action.cpp | 3 +-
app/emoticon-text-edit-selector.cpp | 2 +-
app/invite-contact-dialog.cpp | 10 +--
app/main.cpp | 19 +++--
...edesktop.Telepathy.Client.KTp.TextUi.service.in | 2 +-
app/telepathy-chat-ui.cpp | 4 +-
app/telepathy-chat-ui.h | 2 +-
cmake/modules/COPYING-CMAKE-SCRIPTS | 22 -----
cmake/modules/FindKTp.cmake | 42 ----------
cmake/modules/FindQJSON.cmake | 48 -----------
config/CMakeLists.txt | 44 +++++-----
config/appearance-config-tab.cpp | 6 +-
config/appearance-config.cpp | 10 ++-
config/behavior-config.cpp | 5 +-
config/messages-config.cpp | 8 +-
config/otr-config.cpp | 4 +-
filters/CMakeLists.txt | 13 ++-
filters/bugzilla/CMakeLists.txt | 15 +---
filters/bugzilla/bugzilla-filter.cpp | 2 +
filters/emoticons/CMakeLists.txt | 18 +---
filters/emoticons/emoticon-filter.cpp | 2 +-
filters/formatting/CMakeLists.txt | 18 +---
filters/formatting/format-filter.cpp | 3 +-
filters/highlight/CMakeLists.txt | 14 +---
filters/highlight/highlight-filter.cpp | 2 +
filters/images/CMakeLists.txt | 19 ++---
filters/images/images-filter.cpp | 4 +-
filters/latex/CMakeLists.txt | 29 ++-----
filters/latex/latex-config.cpp | 4 +-
filters/latex/latex-filter.cpp | 11 +--
filters/otr/CMakeLists.txt | 16 ++--
filters/otr/otr-filter.cpp | 5 +-
filters/searchexpansion/CMakeLists.txt | 17 +---
filters/searchexpansion/searchexpansion-filter.cpp | 2 +
filters/texttospeech/CMakeLists.txt | 18 +---
filters/urlexpansion/CMakeLists.txt | 20 +----
filters/urlexpansion/urlexpansion-filter.cpp | 16 ++--
filters/youtube/CMakeLists.txt | 14 +---
filters/youtube/youtube-filter.cpp | 2 +
image-sharer/CMakeLists.txt | 26 +++---
image-sharer/imgursharer.cpp | 23 +++---
lib/CMakeLists.txt | 25 +++---
lib/adium-theme-view.cpp | 17 ++--
lib/adium-theme-view.h | 4 +-
lib/channel-contact-model.cpp | 3 +-
lib/chat-search-bar.cpp | 8 +-
lib/chat-search-bar.h | 4 +-
lib/chat-text-edit.cpp | 16 ++--
lib/chat-text-edit.h | 8 +-
lib/chat-widget.cpp | 38 ++++-----
lib/chat-widget.h | 15 ++--
lib/chat-window-style-manager.cpp | 14 ++--
lib/chat-window-style.cpp | 17 ++--
lib/chat-window-style.h | 1 +
lib/contact-delegate.cpp | 21 ++---
lib/notify-filter.cpp | 8 +-
lib/otr-notifications.cpp | 4 +-
lib/proxy-service.cpp | 2 +-
lib/text-chat-config.cpp | 2 +
lib/text-chat-config.h | 1 +
logviewer/CMakeLists.txt | 21 ++---
logviewer/config/CMakeLists.txt | 8 +-
logviewer/config/behavior-config.cpp | 11 ++-
logviewer/config/behavior-config.h | 2 +-
logviewer/dates-model.cpp | 4 +-
logviewer/dates-view-delegate.cpp | 17 ++--
logviewer/dates-view-delegate.h | 2 +-
logviewer/entity-filter-model.cpp | 2 +-
logviewer/entity-view-delegate.cpp | 20 ++---
logviewer/entity-view-delegate.h | 2 +-
logviewer/log-viewer.cpp | 24 +++---
logviewer/logs-import-dialog.cpp | 6 +-
logviewer/main.cpp | 10 +--
logviewer/message-view.cpp | 2 +
logviewer/person-entity-merge-model.cpp | 8 +-
86 files changed, 466 insertions(+), 687 deletions(-)
diff --cc lib/CMakeLists.txt
index be5632b,b1464c0..5a46677
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@@ -28,22 -27,22 +27,24 @@@ set(ktpchat_U
keygendialog.ui
)
- kde4_add_ui_files(ktpchat_SRCS ${ktpchat_UI})
+ qt5_wrap_ui(ktpchat_SRCS ${ktpchat_UI})
- kde4_add_library(ktpchat SHARED ${ktpchat_SRCS})
+ add_library(ktpchat SHARED ${ktpchat_SRCS})
+set_target_properties(ktpchat PROPERTIES SOVERSION ${KTP_TEXT_UI_VERSION} VERSION ${KTP_TEXT_UI_VERSION})
+
target_link_libraries(ktpchat
- ${KDE4_KDECORE_LIBS}
- ${KDE4_KIO_LIBS}
- ${KDE4_KDEUI_LIBS}
- ${TELEPATHY_QT4_LIBRARIES}
- ${KDE4_KDEWEBKIT_LIBRARY}
- ${KDE4_KEMOTICONS_LIBS}
- ${KTP_LIBRARIES}
- ${KTP_LOGGER_LIBRARIES}
- ${KTP_OTR_LIBRARIES}
+ KF5::KIOWidgets
+ KF5::WebKit
+ KF5::Emoticons
+ KF5::IconThemes
+ KF5::Archive
+ KF5::SonnetCore
+ KF5::KDELibs4Support
+ KTp::CommonInternals
+ KTp::Logger
+ KTp::OTR
+ Qt5::WebKitWidgets
ktpimagesharer
)
install(TARGETS ktpchat ${INSTALL_TARGETS_DEFAULT_ARGS})
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list