Hello community, here is the log from the commit of package telepathy-qt5 for openSUSE:Factory checked in at 2014-04-14 20:50:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt5 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "telepathy-qt5" Changes: -------- New Changes file: --- /dev/null 2014-02-13 01:09:38.344032506 +0100 +++ /work/SRC/openSUSE:Factory/.telepathy-qt5.new/telepathy-qt5.changes 2014-04-14 20:50:11.000000000 +0200 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Sun Apr 13 23:18:25 UTC 2014 - hrvoje.senjan@gmail.com + +- Activate telepathy-qt5 package + New: ---- 0005-Start-0.9.4-development.patch 0006-farsight-Fix-linking.patch 0007-Link-telepathy-qt4-farsight-against-gobject.patch 0009-glib-Disable-tp_tests_connection_run_until_contact_b.patch 0010-cmake-Require-tp-glib-0.18.patch 0012-Fix-warning-in-DBusTubeChannel.patch 0013-Fix-storing-avatars-so-that-they-are-not-stored-mill.patch 0015-Fix-stack-overflow-in-SimpleObserver-create.patch 0017-Remove-references-to-deprecated-tp_channel_borrow_im.patch 0018-tests-sync-simple-channel-dispatch-operation.c-from-.patch 0019-Removing-old-Farsight-files.patch 0021-account-add-method-Account-createDbusTubeRoom.patch 0023-Kill-the-last-bits-of-Farsight.patch 0024-Fix-compilation-on-new-versions-of-cmake.patch 0025-Fix-build-for-Qt5-release.patch 0026-Fix-tests-build-for-Qt5-release.patch 0027-Fix-TestKeyFile-sort-list-before-comparing.patch 0028-Fix-TestAccountSet-testFilters.patch 0029-Fix-TestDBusProxyFactory-testDropRefs.patch 0030-Fix-HandledChannelNotifier-for-Qt5.patch 0031-Update-to-spec-0.27.3.patch 0032-Update-changes-from-Channel_Dispatcher_Future.patch 0033-Update-test-library-to-match-spec-changes.patch 0034-Add-Room-Subject-RoomConfig-interfaces-to-generation.patch 0035-Fix-ChannelDispatcher.Messages-test.patch 0036-Fix-moc-command-for-Qt5.2.patch 0037-Simplify-FindQt5.cmake.patch 0038-Allow-compilation-when-only-qmake-qt4-is-in-the-path.patch 0039-Add-Q_UNUSED-as-Q_ASSERT-is-a-no-op-in-release-mode.patch 0040-Add-5-to-pkg-config-package-names-for-Qt5.patch search-for-farstream0.2.diff search-for-gstreamer1.0.diff search-for-telepathy-farstream-0.4.diff telepathy-qt-0.9.3.tar.gz telepathy-qt5.changes telepathy-qt5.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt5.spec ++++++ # # spec file for package telepathy-qt5 # # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # %define libname libtelepathy-qt5 %define major 0 # farstream and gstreamer are disabled at the moment - until we get qtgstreamer with gst1.0 API support %define farstream 0 %define gstreamer1 0 Name: telepathy-qt5 Version: 0.9.3 Release: 0 Summary: Qt4 bindings for the Telepathy Library License: LGPL-2.1+ Group: Development/Tools/Other Url: http://telepathy.freedesktop.org/ Source: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{version}.tar.gz # PATCH-FIX-UPSTREAM search-for-farstream0.2.diff -- searches for farstream0.2, instead of deprecated 0.1 Patch1: search-for-farstream0.2.diff # PATCH-FIX-UPSTREAM search-for-gstreamer1.0.diff -- searches for gstreamer1.0, which is only required for includes Patch2: search-for-gstreamer1.0.diff # PATCH-FIX-UPSTREAM search-for-telepathy-farstream-0.4.diff -- searches for telepathy-farstream-0.4 Patch3: search-for-telepathy-farstream-0.4.diff # PATCHES 4- 33 are from upstream git Patch4: 0005-Start-0.9.4-development.patch Patch5: 0006-farsight-Fix-linking.patch Patch6: 0007-Link-telepathy-qt4-farsight-against-gobject.patch Patch7: 0009-glib-Disable-tp_tests_connection_run_until_contact_b.patch Patch8: 0010-cmake-Require-tp-glib-0.18.patch Patch9: 0012-Fix-warning-in-DBusTubeChannel.patch Patch10: 0013-Fix-storing-avatars-so-that-they-are-not-stored-mill.patch Patch11: 0015-Fix-stack-overflow-in-SimpleObserver-create.patch Patch12: 0017-Remove-references-to-deprecated-tp_channel_borrow_im.patch Patch13: 0018-tests-sync-simple-channel-dispatch-operation.c-from-.patch Patch14: 0019-Removing-old-Farsight-files.patch Patch15: 0021-account-add-method-Account-createDbusTubeRoom.patch Patch16: 0023-Kill-the-last-bits-of-Farsight.patch Patch17: 0024-Fix-compilation-on-new-versions-of-cmake.patch Patch18: 0025-Fix-build-for-Qt5-release.patch Patch19: 0026-Fix-tests-build-for-Qt5-release.patch Patch20: 0027-Fix-TestKeyFile-sort-list-before-comparing.patch Patch21: 0028-Fix-TestAccountSet-testFilters.patch Patch22: 0029-Fix-TestDBusProxyFactory-testDropRefs.patch Patch23: 0030-Fix-HandledChannelNotifier-for-Qt5.patch Patch24: 0031-Update-to-spec-0.27.3.patch Patch25: 0032-Update-changes-from-Channel_Dispatcher_Future.patch Patch26: 0033-Update-test-library-to-match-spec-changes.patch Patch27: 0034-Add-Room-Subject-RoomConfig-interfaces-to-generation.patch Patch28: 0035-Fix-ChannelDispatcher.Messages-test.patch Patch29: 0036-Fix-moc-command-for-Qt5.2.patch Patch30: 0037-Simplify-FindQt5.cmake.patch Patch31: 0038-Allow-compilation-when-only-qmake-qt4-is-in-the-path.patch Patch32: 0039-Add-Q_UNUSED-as-Q_ASSERT-is-a-no-op-in-release-mode.patch Patch33: 0040-Add-5-to-pkg-config-package-names-for-Qt5.patch BuildRequires: cmake BuildRequires: dbus-1-python BuildRequires: fdupes # FIXME patch, or make upstream look for qhelpgenerator-qt5 first #BuildRequires: libqt5-qttools-devel #BuildRequires: doxygen BuildRequires: libxml2-devel BuildRequires: python-xml BuildRequires: pkgconfig(Qt5Core) BuildRequires: pkgconfig(Qt5DBus) BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5Network) BuildRequires: pkgconfig(Qt5Test) BuildRequires: pkgconfig(Qt5Widgets) BuildRequires: pkgconfig(Qt5Xml) BuildRequires: pkgconfig(telepathy-glib) %if %farstream %if %gstreamer1 BuildRequires: pkgconfig(farstream-0.2) BuildRequires: pkgconfig(gstreamer-1.0) BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) BuildRequires: pkgconfig(telepathy-farstream) %else BuildRequires: pkgconfig(farstream-0.1) BuildRequires: pkgconfig(gstreamer-0.10) BuildRequires: pkgconfig(gstreamer-plugins-base-0.10) BuildRequires: pkgconfig(telepathy-farstream-0.4) %endif %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Telepathy-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib but for Qt 4. %package -n %{libname}-%{major} Summary: Library for performing syntax highlighting in Qt documents Group: Development/Tools/Other %description -n %{libname}-%{major} Telepathy-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib but for Qt 4. %if %farstream %package -n %{libname}-farstream%{major} Summary: Library for performing syntax highlighting in Qt documents Group: Development/Tools/Other Obsoletes: %{libname}-farsight%{major} %description -n %{libname}-farstream%{major} Telepathy-farstream-Qt4 is a high-level binding for Telepathy, similar to telepathy-glib but for Qt 4. %endif %package devel Summary: Header files, libraries and development documentation for %{name} Group: Development/Libraries/C and C++ Requires: %{libname}-%{major} = %{version} %if %farstream Requires: %{libname}-farstream%{major} = %{version} %if %gstreamer1 Requires: pkgconfig(gstreamer-1.0) Requires: pkgconfig(gstreamer-plugins-base-1.0) %else Requires: pkgconfig(gstreamer-0.10) Requires: pkgconfig(gstreamer-plugins-base-0.10) %endif %endif %description devel This package contains the header files, static libraries and development documentation for %{name}. If you like to develop programs using %{name}, you will need to install %{name}-devel. %prep %setup -q -n telepathy-qt-%{version} %if %farstream %if %gstreamer1 %patch0 -p1 %patch1 -p1 %else %patch2 -p1 %endif %endif %patch3 -p1 %patch4 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch11 -p1 %patch12 -p1 %patch13 -p1 %patch14 -p1 %patch15 -p1 %patch16 -p1 %patch17 -p1 %patch18 -p1 %patch19 -p1 %patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 %patch24 -p1 %patch25 -p1 %patch26 -p1 %patch27 -p1 %patch28 -p1 %patch29 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 %patch33 -p1 %build export CXXFLAGS="%{optflags}" export CFLAGS="%{optflags}" if [ %{_lib} = lib64 ]; then EXTRA_FLAGS="$EXTRA_FLAGS -DLIB_SUFFIX=64" fi mkdir build cd build cmake .. -DCMAKE_CXXFLAGS="%{optflags}" -DCMAKE_CFLAGS="%{optflags}" $EXTRA_FLAGS -DCMAKE_INSTALL_PREFIX=/usr \ -DENABLE_TESTS=FALSE -DENABLE_EXAMPLES=FALSE -DENABLE_FARSIGHT=FALSE -DENABLE_FARSTREAM=TRUE -DDISABLE_WERROR=TRUE -DDESIRED_QT_VERSION=5 make %{?_smp_mflags} %install cd build %make_install cd .. %fdupes %{buildroot} %post -n %{libname}-%{major} -p /sbin/ldconfig %postun -n %{libname}-%{major} -p /sbin/ldconfig %if %farstream %post -n %{libname}-farstream%{major} -p /sbin/ldconfig %postun -n %{libname}-farstream%{major} -p /sbin/ldconfig %endif %files -n %{libname}-%{major} %defattr(-,root,root) %{_libdir}/libtelepathy-qt5.so.* %if %farstream %files -n %{libname}-farstream%{major} %defattr(-,root,root) %{_libdir}/libtelepathy-qt5-farstream.so.* %endif %files devel %defattr(-,root,root) %doc AUTHORS ChangeLog README COPYING HACKING NEWS %{_includedir}/telepathy-qt5/ %{_libdir}/libtelepathy-qt5*.so %{_libdir}/pkgconfig/TelepathyQt5*.pc %{_libdir}/cmake/TelepathyQt5*/ %changelog ++++++ 0005-Start-0.9.4-development.patch ++++++

From 1fbca358bfb4627697429d0429f2d0fb8073b7bb Mon Sep 17 00:00:00 2001 From: George Kiagiadakis <george.kiagiadakis@collabora.com> Date: Fri, 13 Jul 2012 21:40:33 +0300 Subject: [PATCH 05/40] Start 0.9.4 development

--- CMakeLists.txt | 2 +- NEWS | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 998a19e..574cb60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -41,7 +41,7 @@ endif(POLICY CMP0011) set(TP_QT_MAJOR_VERSION 0) set(TP_QT_MINOR_VERSION 9) set(TP_QT_MICRO_VERSION 3) -set(TP_QT_NANO_VERSION 0) +set(TP_QT_NANO_VERSION 1) set(PACKAGE_NAME telepathy-qt) diff --git a/NEWS b/NEWS index 0bd1966..0d8365d 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +telepathy-qt 0.9.4 (UNRELEASED) +================================= + +The "..." release. + +Enhancements: + * ... + +Fixes: + * ... + telepathy-qt 0.9.3 (2012-07-13) ================================= -- 1.9.1 ++++++ 0006-farsight-Fix-linking.patch ++++++

From d309812522dd3f2988d99d8f66570f0aa053bc83 Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi@collabora.com> Date: Mon, 27 Aug 2012 18:55:44 +0200 Subject: [PATCH 06/40] farsight: Fix linking

Thanks to shadeslayer for the patch Reviewed-by: Dario Freddi <dario.freddi@collabora.com> --- TelepathyQt/Farsight/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/TelepathyQt/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLists.txt index 4cc660c..b234703 100644 --- a/TelepathyQt/Farsight/CMakeLists.txt +++ b/TelepathyQt/Farsight/CMakeLists.txt @@ -28,6 +28,8 @@ if(FARSIGHT_COMPONENTS_FOUND) target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farsight ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} + ${GOBJECT_LIBRARIES} + ${TELEPATHY_GLIB_LIBRARIES} ${TELEPATHY_FARSIGHT_LIBRARIES} ${GSTREAMER_INTERFACE_LIBRARY} telepathy-qt${QT_VERSION_MAJOR} -- 1.9.1 ++++++ 0007-Link-telepathy-qt4-farsight-against-gobject.patch ++++++

From 2414ecb2482a80a805d824ddf0258cb120fd9d9b Mon Sep 17 00:00:00 2001 From: Ken VanDine <ken.vandine@canonical.com> Date: Mon, 27 Aug 2012 19:00:42 +0200 Subject: [PATCH 07/40] Link telepathy-qt4-farsight against gobject

Reviewed-by: Dario Freddi <dario.freddi@collabora.com> --- TelepathyQt/Farstream/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/TelepathyQt/Farstream/CMakeLists.txt b/TelepathyQt/Farstream/CMakeLists.txt index 3ea6cec..250bfdb 100644 --- a/TelepathyQt/Farstream/CMakeLists.txt +++ b/TelepathyQt/Farstream/CMakeLists.txt @@ -41,6 +41,7 @@ if(FARSTREAM_COMPONENTS_FOUND) target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farstream ${QT_QTDBUS_LIBRARY} ${QT_QTCORE_LIBRARY} + ${GOBJECT_LIBRARIES} ${TELEPATHY_FARSTREAM_LIBRARIES} ${TELEPATHY_GLIB_LIBRARIES} telepathy-qt${QT_VERSION_MAJOR} -- 1.9.1 ++++++ 0009-glib-Disable-tp_tests_connection_run_until_contact_b.patch ++++++

From 6c05efa268c80947060929dc8fe6f2d4cd7d5a15 Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi@collabora.com> Date: Mon, 27 Aug 2012 19:28:24 +0200 Subject: [PATCH 09/40] glib: Disable tp_tests_connection_run_until_contact_by_id to avoid requiring 0.19.x

--- tests/lib/glib/util.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/lib/glib/util.c b/tests/lib/glib/util.c index 21d3855..f0bcd96 100644 --- a/tests/lib/glib/util.c +++ b/tests/lib/glib/util.c @@ -431,6 +431,9 @@ tp_tests_connection_assert_disconnect_succeeds (TpConnection *connection) g_object_unref (result); } +/* The following blocks require tp-glib 0.19 to compile. However, tp_tests_connection_run_until_contact_by_id + is never used in our code, so we simply disable its compilation. */ +#if 0 static void one_contact_cb (GObject *object, GAsyncResult *result, @@ -463,3 +466,4 @@ tp_tests_connection_run_until_contact_by_id (TpConnection *connection, return contact; } +#endif -- 1.9.1 ++++++ 0010-cmake-Require-tp-glib-0.18.patch ++++++

From 4f562709551fdfad6587a14332466937061b8beb Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi@collabora.com> Date: Mon, 27 Aug 2012 19:28:49 +0200 Subject: [PATCH 10/40] cmake: Require tp-glib 0.18

--- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 574cb60..2e52f27 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -185,7 +185,7 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python" if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT) # Find telepathy-glib - set(TELEPATHY_GLIB_MIN_VERSION 0.17.5) + set(TELEPATHY_GLIB_MIN_VERSION 0.18.0) find_package(TelepathyGlib) macro_log_feature(TELEPATHYGLIB_FOUND "Telepathy-glib" "Glib bindings for Telepathy" -- 1.9.1 ++++++ 0012-Fix-warning-in-DBusTubeChannel.patch ++++++

From 3f82f8b0c1e87718cf390f9388f177e5b0ce9f39 Mon Sep 17 00:00:00 2001 From: "Daniele E. Domenichelli" <daniele.domenichelli@gmail.com> Date: Fri, 1 Feb 2013 19:10:28 +0100 Subject: [PATCH 12/40] Fix warning in DBusTubeChannel

Reviewed-by: Dario Freddi <drf@kde.org> --- TelepathyQt/dbus-tube-channel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TelepathyQt/dbus-tube-channel.cpp b/TelepathyQt/dbus-tube-channel.cpp index 001139e..a492270 100644 --- a/TelepathyQt/dbus-tube-channel.cpp +++ b/TelepathyQt/dbus-tube-channel.cpp @@ -245,7 +245,7 @@ DBusTubeChannel::~DBusTubeChannel() QString DBusTubeChannel::serviceName() const { if (!isReady(FeatureCore)) { - warning() << "DBusTubeChannel::service() used with " + warning() << "DBusTubeChannel::serviceName() used with " "FeatureCore not ready"; return QString(); } -- 1.9.1 ++++++ 0013-Fix-storing-avatars-so-that-they-are-not-stored-mill.patch ++++++

From 8da9f7069929893bcee64dab22101134752fe618 Mon Sep 17 00:00:00 2001 From: George Kiagiadakis <george.kiagiadakis@collabora.com> Date: Thu, 7 Feb 2013 14:37:49 +0200 Subject: [PATCH 13/40] Fix storing avatars, so that they are not stored millions of times each

The original problem lies in the fact that QFile::rename() does not overwrite existing files. Therefore it fails and the temporary file stays on the filesystem together with the already existing avatar file. Checking if the file exists before renaming solves this partially, but the problem is that this operation is not atomic. There can be many processes using tp-qt, fetching avatars at the same time from the server, and in this case we can still have a problem there. The final solution is to ignore a new avatar that has the same token as an avatar that is already on the filesystem. According to the spec, different avatars have different tokens, so if an avatar changes, the token changes as well. https://bugs.freedesktop.org/show_bug.cgi?id=47647 Reviewed-by: David Edmundson <kde@davidedmundson.co.uk> --- TelepathyQt/contact-manager.cpp | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/TelepathyQt/contact-manager.cpp b/TelepathyQt/contact-manager.cpp index a67e736..dfa28bc 100644 --- a/TelepathyQt/contact-manager.cpp +++ b/TelepathyQt/contact-manager.cpp @@ -1341,17 +1341,27 @@ void ContactManager::onAvatarRetrieved(uint handle, const QString &token, debug() << "Filename:" << avatarFileName; debug() << "MimeType:" << mimeType; - QTemporaryFile mimeTypeFile(mimeTypeFileName); - mimeTypeFile.open(); - mimeTypeFile.write(mimeType.toLatin1()); - mimeTypeFile.setAutoRemove(false); - mimeTypeFile.rename(mimeTypeFileName); - - QTemporaryFile avatarFile(avatarFileName); - avatarFile.open(); - avatarFile.write(data); - avatarFile.setAutoRemove(false); - avatarFile.rename(avatarFileName); + if (!QFile::exists(mimeTypeFileName)) { + QTemporaryFile mimeTypeFile(mimeTypeFileName); + if (mimeTypeFile.open()) { + mimeTypeFile.write(mimeType.toLatin1()); + mimeTypeFile.setAutoRemove(false); + if (!mimeTypeFile.rename(mimeTypeFileName)) { + mimeTypeFile.remove(); + } + } + } + + if (!QFile::exists(avatarFileName)) { + QTemporaryFile avatarFile(avatarFileName); + if (avatarFile.open()) { + avatarFile.write(data); + avatarFile.setAutoRemove(false); + if (!avatarFile.rename(avatarFileName)) { + avatarFile.remove(); + } + } + } } ContactPtr contact = lookupContactByHandle(handle); -- 1.9.1 ++++++ 0015-Fix-stack-overflow-in-SimpleObserver-create.patch ++++++

From 819e00afb6814b58670edc15ff21ccf43e45c958 Mon Sep 17 00:00:00 2001 From: Matthias Gehre <gehre.matthias@gmail.com> Date: Mon, 25 Mar 2013 15:21:20 +0200 Subject: [PATCH 15/40] Fix stack overflow in SimpleObserver::create

Reviewed-by: George Kiagiadakis <george.kiagiadakis@collabora.com> --- TelepathyQt/simple-observer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/TelepathyQt/simple-observer.cpp b/TelepathyQt/simple-observer.cpp index 5985a71..e34f31c 100644 --- a/TelepathyQt/simple-observer.cpp +++ b/TelepathyQt/simple-observer.cpp @@ -379,7 +379,7 @@ SimpleObserverPtr SimpleObserver::create( const ChannelClassSpecList &channelFilter, const QList<ChannelClassFeatures> &extraChannelFeatures) { - return create(account, channelFilter, extraChannelFeatures); + return create(account, channelFilter, QString(), false, extraChannelFeatures); } /** -- 1.9.1 ++++++ 0017-Remove-references-to-deprecated-tp_channel_borrow_im.patch ++++++

From 3de4dea2ca0338f7fa89b8c8f4f46c9547c89e3c Mon Sep 17 00:00:00 2001 From: David Edmundson <kde@davidedmundson.co.uk> Date: Fri, 15 Feb 2013 22:41:25 +0000 Subject: [PATCH 17/40] Remove references to deprecated tp_channel_borrow_immutable_properties

and replace with tp_channel_dup_immutable_properties this allows tests to compile against newer versions of Telepathy glib Reviewed-by: Martin Klapetek <mklapetek@kde.org> --- tests/lib/glib/simple-channel-dispatch-operation.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lib/glib/simple-channel-dispatch-operation.c b/tests/lib/glib/simple-channel-dispatch-operation.c index 9adc9b0..cd727de 100644 --- a/tests/lib/glib/simple-channel-dispatch-operation.c +++ b/tests/lib/glib/simple-channel-dispatch-operation.c @@ -150,7 +150,7 @@ tp_tests_simple_channel_dispatch_operation_get_property (GObject *object, tp_value_array_build (2, DBUS_TYPE_G_OBJECT_PATH, tp_proxy_get_object_path (channel), TP_HASH_TYPE_STRING_VARIANT_MAP, - tp_channel_borrow_immutable_properties (channel), + tp_channel_dup_immutable_properties (channel), G_TYPE_INVALID)); } -- 1.9.1 ++++++ 0018-tests-sync-simple-channel-dispatch-operation.c-from-.patch ++++++

From aa8c33371e1d16267d302ddbb0f52abad7686472 Mon Sep 17 00:00:00 2001 From: David Edmundson <kde@davidedmundson.co.uk> Date: Mon, 17 Jun 2013 21:21:11 +0100 Subject: [PATCH 18/40] tests: sync simple-channel-dispatch-operation.c from telepahty-glib

This fixed a memory leak introduced in the last commit Reviewed-by: Martin Klapetek <mklapetek@kde.org> --- tests/lib/glib/simple-channel-dispatch-operation.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/lib/glib/simple-channel-dispatch-operation.c b/tests/lib/glib/simple-channel-dispatch-operation.c index cd727de..542b036 100644 --- a/tests/lib/glib/simple-channel-dispatch-operation.c +++ b/tests/lib/glib/simple-channel-dispatch-operation.c @@ -145,13 +145,22 @@ tp_tests_simple_channel_dispatch_operation_get_property (GObject *object, for (i = 0; i < self->priv->channels->len; i++) { TpChannel *channel = g_ptr_array_index (self->priv->channels, i); + GValue props_value = G_VALUE_INIT; + GVariant *props_variant; + + /* Yay, double conversion! But this is for tests corner case */ + props_variant = tp_channel_dup_immutable_properties (channel); + dbus_g_value_parse_g_variant (props_variant, &props_value); g_ptr_array_add (arr, tp_value_array_build (2, DBUS_TYPE_G_OBJECT_PATH, tp_proxy_get_object_path (channel), TP_HASH_TYPE_STRING_VARIANT_MAP, - tp_channel_dup_immutable_properties (channel), + g_value_get_boxed (&props_value), G_TYPE_INVALID)); + + g_variant_unref (props_variant); + g_value_unset (&props_value); } g_value_take_boxed (value, arr); -- 1.9.1 ++++++ 0019-Removing-old-Farsight-files.patch ++++++

From 375691fb7b1d53943c0ec4f0b15dc07f0db702c9 Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi@ispirata.com> Date: Mon, 15 Jul 2013 00:24:25 +0200 Subject: [PATCH 19/40] Removing old Farsight files.

Actually, the directory was already deprecated and never triggered. This change simply cleans up the tree. Signed-off-by: Dario Freddi <dario.freddi@ispirata.com> Reviewed-by: David Edmundson <davidedmundson@kde.org> --- TelepathyQt/CMakeLists.txt | 1 - TelepathyQt/Farsight/CMakeLists.txt | 85 ------------------- TelepathyQt/Farsight/Channel | 13 --- .../Farsight/TelepathyQtFarsight-uninstalled.pc.in | 11 --- TelepathyQt/Farsight/TelepathyQtFarsight.pc.in | 11 --- .../Farsight/TelepathyQtFarsightConfig.cmake.in | 24 ------ TelepathyQt/Farsight/channel.cpp | 98 ---------------------- TelepathyQt/Farsight/channel.h | 43 ---------- TelepathyQt/Farsight/global.h | 58 ------------- 9 files changed, 344 deletions(-) delete mode 100644 TelepathyQt/Farsight/CMakeLists.txt delete mode 100644 TelepathyQt/Farsight/Channel delete mode 100644 TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in delete mode 100644 TelepathyQt/Farsight/TelepathyQtFarsight.pc.in delete mode 100644 TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in delete mode 100644 TelepathyQt/Farsight/channel.cpp delete mode 100644 TelepathyQt/Farsight/channel.h delete mode 100644 TelepathyQt/Farsight/global.h diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 7577be9..06aaad7 100644 --- a/TelepathyQt/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -845,7 +845,6 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}ConfigVe DESTINATION ${_TelepathyQtConfig_INSTALL_DIR} COMPONENT headers) -add_subdirectory(Farsight) add_subdirectory(Farstream) if(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT) diff --git a/TelepathyQt/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLists.txt deleted file mode 100644 index b234703..0000000 --- a/TelepathyQt/Farsight/CMakeLists.txt +++ /dev/null @@ -1,85 +0,0 @@ -if(FARSIGHT_COMPONENTS_FOUND) - include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR} - ${GSTREAMER_INCLUDE_DIR} - ${GLIB2_INCLUDE_DIR} - ${LIBXML2_INCLUDE_DIR} - ${DBUS_INCLUDE_DIR}) - - # It gets inherited from the previous directory, hence it has to be removed explicitely - remove_definitions(-DBUILDING_TP_QT) - # We are building Telepathy-Qt-Farsight - add_definitions(-DBUILDING_TP_QT_FARSIGHT -DQT_NO_KEYWORDS) - - set(telepathy_qt_farsight_SRCS - channel.cpp) - - set(telepathy_qt_farsight_HEADERS - Channel - channel.h - global.h) - - # Create the library - if (ENABLE_COMPILER_COVERAGE) - add_library(telepathy-qt${QT_VERSION_MAJOR}-farsight STATIC ${telepathy_qt_farsight_SRCS}) - else (ENABLE_COMPILER_COVERAGE) - add_library(telepathy-qt${QT_VERSION_MAJOR}-farsight SHARED ${telepathy_qt_farsight_SRCS}) - endif (ENABLE_COMPILER_COVERAGE) - # Link - target_link_libraries(telepathy-qt${QT_VERSION_MAJOR}-farsight - ${QT_QTDBUS_LIBRARY} - ${QT_QTCORE_LIBRARY} - ${GOBJECT_LIBRARIES} - ${TELEPATHY_GLIB_LIBRARIES} - ${TELEPATHY_FARSIGHT_LIBRARIES} - ${GSTREAMER_INTERFACE_LIBRARY} - telepathy-qt${QT_VERSION_MAJOR} - ${TP_QT_LIBRARY_LINKER_FLAGS}) - - # Set the correct version number - set_target_properties(telepathy-qt${QT_VERSION_MAJOR}-farsight PROPERTIES - SOVERSION ${TP_QT_ABI_VERSION} - VERSION ${TP_QT_LIBRARY_VERSION}) - - # Install the library - watch out for the correct components - if (WIN32) - install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farsight - EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets - RUNTIME DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight_libs) - else (WIN32) - install(TARGETS telepathy-qt${QT_VERSION_MAJOR}-farsight - EXPORT TelepathyQt${QT_VERSION_MAJOR}Targets - LIBRARY DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight - ARCHIVE DESTINATION ${LIB_INSTALL_DIR} COMPONENT farsight_libs) - endif (WIN32) - - # Install headers - install(FILES ${telepathy_qt_farsight_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/TelepathyQt/Farsight - COMPONENT farsight_headers) - - # pkg-config files, only if not on windows - if (NOT WIN32) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarsight.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight.pc) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/TelepathyQtFarsight-uninstalled.pc.in ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight-uninstalled.pc) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig COMPONENT pkgconfig) - endif (NOT WIN32) - - # Configure the actual Config file - configure_file(TelepathyQtFarsightConfig.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfig.cmake" @ONLY) - - # this file is used by to check if the installed version can be used. - macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfigVersion.cmake - ${PACKAGE_VERSION}) - - if(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_TelepathyQtFarsightConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/cmake/TelepathyQt${QT_VERSION_MAJOR}Farsight) - else(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - set(_TelepathyQtFarsightConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/TelepathyQt${QT_VERSION_MAJOR}Farsight/cmake) - endif(USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfigVersion.cmake - ${CMAKE_CURRENT_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}FarsightConfig.cmake - DESTINATION ${_TelepathyQtFarsightConfig_INSTALL_DIR} - COMPONENT headers) - -endif(FARSIGHT_COMPONENTS_FOUND) diff --git a/TelepathyQt/Farsight/Channel b/TelepathyQt/Farsight/Channel deleted file mode 100644 index ea05f89..0000000 --- a/TelepathyQt/Farsight/Channel +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef _TelepathyQt_Farsight_Channel_HEADER_GUARD_ -#define _TelepathyQt_Farsight_Channel_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#define IN_TP_QT_HEADER -#endif - -#include <TelepathyQt/Farsight/channel.h> - -#undef IN_TP_QT_HEADER - -#endif -// vim:set ft=cpp: diff --git a/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in b/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in deleted file mode 100644 index 255cc0d..0000000 --- a/TelepathyQt/Farsight/TelepathyQtFarsight-uninstalled.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=/nonexistent -exec_prefix=/nonexistent -abs_top_builddir=${CMAKE_BINARY_DIR} -abs_top_srcdir=${CMAKE_SOURCE_DIR} - -Name: TelepathyQt${QT_VERSION_MAJOR}Farsight (uninstalled copy) -Description: Qt Telepathy Farsight utility library for the Telepathy framework -Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farsight >= ${TELEPATHY_FARSIGHT_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} -Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/Farsight/libtelepathy-qt${QT_VERSION_MAJOR}-farsight.so -Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in b/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in deleted file mode 100644 index 4a0243a..0000000 --- a/TelepathyQt/Farsight/TelepathyQtFarsight.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=${CMAKE_INSTALL_PREFIX} -exec_prefix=${CMAKE_INSTALL_PREFIX} -libdir=${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} - -Name: TelepathyQt${QT_VERSION_MAJOR}Farsight -Description: Qt Telepathy Farsight utility library for the Telepathy framework -Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farsight >= ${TELEPATHY_FARSIGHT_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} -Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farsight -Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} diff --git a/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in b/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in deleted file mode 100644 index 4ca27a6..0000000 --- a/TelepathyQt/Farsight/TelepathyQtFarsightConfig.cmake.in +++ /dev/null @@ -1,24 +0,0 @@ -# TelepathyQt@QT_VERSION_MAJOR@FarsightConfig.cmake is generated by CMake from TelepathyQt/TelepathyQtFarsightConfig.cmake.in. -# Any changed value in this file will be overwritten by CMake. - -if(NOT TelepathyQt@QT_VERSION_MAJOR@Farsight_FOUND) - # set the version number - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MAJOR @TP_QT_MAJOR_VERSION@) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MINOR @TP_QT_MINOR_VERSION@) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_MICRO @TP_QT_MICRO_VERSION@) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION_NANO @TP_QT_NANO_VERSION@) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_VERSION @PACKAGE_VERSION@) - - # set the directories - if(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR) - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR "@CMAKE_INSTALL_PREFIX@") - endif(NOT TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INSTALL_DIR) - - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_INCLUDE_DIR "@TELEPATHY_QT_INCLUDE_DIR@") - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_LIB_DIR "@TELEPATHY_QT_LIB_DIR@") - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_SHARE_DIR "@TELEPATHY_QT_DATA_DIR@") - - find_package(TelepathyQt@QT_VERSION_MAJOR@ REQUIRED) - - set(TELEPATHY_QT@QT_VERSION_MAJOR@_FARSIGHT_LIBRARIES telepathy-qt@QT_VERSION_MAJOR@-farsight) -endif(NOT TelepathyQt@QT_VERSION_MAJOR@Farsight_FOUND) diff --git a/TelepathyQt/Farsight/channel.cpp b/TelepathyQt/Farsight/channel.cpp deleted file mode 100644 index 9929363..0000000 --- a/TelepathyQt/Farsight/channel.cpp +++ /dev/null @@ -1,98 +0,0 @@ -/** - * This file is part of TelepathyQt - * - * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/> - * @copyright Copyright (C) 2009 Nokia Corporation - * @license LGPL 2.1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include <TelepathyQt/Farsight/Channel> - -#include "TelepathyQt/debug-internal.h" - -#include <TelepathyQt/Channel> -#include <TelepathyQt/Connection> -#include <TelepathyQt/StreamedMediaChannel> - -#include <telepathy-glib/automatic-client-factory.h> -#include <telepathy-glib/channel.h> -#include <telepathy-glib/connection.h> -#include <telepathy-glib/dbus.h> - -#include <telepathy-farsight/channel.h> - -namespace Tp -{ - -TfChannel *createFarsightChannel(const StreamedMediaChannelPtr &channel) -{ - if (!channel->handlerStreamingRequired()) { - warning() << "Handler streaming not required"; - return 0; - } - - TpDBusDaemon *dbus = tp_dbus_daemon_dup(0); - - if (!dbus) { - warning() << "Unable to connect to D-Bus"; - return 0; - } - - ConnectionPtr connection = channel->connection(); - - TpSimpleClientFactory *factory = (TpSimpleClientFactory *) - tp_automatic_client_factory_new (dbus); - if (!factory) { - warning() << "Unable to construct TpAutomaticClientFactory"; - g_object_unref(dbus); - return 0; - } - - TpConnection *gconnection = tp_simple_client_factory_ensure_connection (factory, - connection->objectPath().toAscii(), NULL, 0); - g_object_unref(factory); - factory = 0; - g_object_unref(dbus); - dbus = 0; - - if (!gconnection) { - warning() << "Unable to construct TpConnection"; - return 0; - } - - TpChannel *gchannel = tp_channel_new(gconnection, - channel->objectPath().toAscii(), - TP_QT_IFACE_CHANNEL_TYPE_STREAMED_MEDIA.latin1(), - (TpHandleType) channel->targetHandleType(), - channel->targetHandle(), - 0); - g_object_unref(gconnection); - gconnection = 0; - - if (!gchannel) { - warning() << "Unable to construct TpChannel"; - return 0; - } - - TfChannel *ret = tf_channel_new(gchannel); - g_object_unref(gchannel); - gchannel = 0; - - return ret; -} - -} // Tp diff --git a/TelepathyQt/Farsight/channel.h b/TelepathyQt/Farsight/channel.h deleted file mode 100644 index 97119bf..0000000 --- a/TelepathyQt/Farsight/channel.h +++ /dev/null @@ -1,43 +0,0 @@ -/** - * This file is part of TelepathyQt - * - * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/> - * @copyright Copyright (C) 2009 Nokia Corporation - * @license LGPL 2.1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _TelepathyQt_Farsight_channel_h_HEADER_GUARD_ -#define _TelepathyQt_Farsight_channel_h_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#error IN_TP_QT_HEADER -#endif - -#include <TelepathyQt/Farsight/global.h> - -#include <TelepathyQt/Types> - -typedef struct _TfChannel TfChannel; - -namespace Tp -{ - -TP_QT_FS_DEPRECATED TP_QT_FS_EXPORT TfChannel *createFarsightChannel(const StreamedMediaChannelPtr &channel); - -} // Tp - -#endif diff --git a/TelepathyQt/Farsight/global.h b/TelepathyQt/Farsight/global.h deleted file mode 100644 index 9a38238..0000000 --- a/TelepathyQt/Farsight/global.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * This file is part of TelepathyQt - * - * @copyright Copyright (C) 2009 Collabora Ltd. <http://www.collabora.co.uk/> - * @copyright Copyright (C) 2009 Nokia Corporation - * @license LGPL 2.1 - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _TelepathyQt_Farsight_global_h_HEADER_GUARD_ -#define _TelepathyQt_Farsight_global_h_HEADER_GUARD_ - -#ifndef IN_TP_QT_HEADER -#error IN_TP_QT_HEADER -#endif - -#include <QtGlobal> - -#ifdef BUILDING_TP_QT_FARSIGHT -# define TP_QT_FS_EXPORT Q_DECL_EXPORT -#else -# define TP_QT_FS_EXPORT Q_DECL_IMPORT -#endif - -#if !defined(Q_OS_WIN) && defined(QT_VISIBILITY_AVAILABLE) -# define TP_QT_FS_NO_EXPORT __attribute__((visibility("hidden"))) -#endif - -#ifndef TP_QT_FS_NO_EXPORT -# define TP_QT_FS_NO_EXPORT -#endif - -#ifndef TP_QT_FS_DEPRECATED -# ifdef TP_QT_DEPRECATED_WARNINGS -# ifdef BUILDING_TP_QT_FARSIGHT -# define TP_QT_FS_DEPRECATED -# else -# define TP_QT_FS_DEPRECATED Q_DECL_DEPRECATED -# endif -# else -# define TP_QT_FS_DEPRECATED -# endif -#endif - -#endif -- 1.9.1 ++++++ 0021-account-add-method-Account-createDbusTubeRoom.patch ++++++

From d007ff722c77618cbbfbdbc5c495e5b263e14f80 Mon Sep 17 00:00:00 2001 From: David Edmundson <kde@davidedmundson.co.uk> Date: Wed, 3 Apr 2013 23:24:34 +0200 Subject: [PATCH 21/40] account: add method Account::createDbusTubeRoom

fixes fd.o #63089 Reviewed-by: Dario Freddi <dario.freddi@ispirata.com> --- TelepathyQt/account.cpp | 27 +++++++++++++++++++++++++++ TelepathyQt/account.h | 6 ++++++ 2 files changed, 33 insertions(+) diff --git a/TelepathyQt/account.cpp b/TelepathyQt/account.cpp index c35759a..c2ad581 100644 --- a/TelepathyQt/account.cpp +++ b/TelepathyQt/account.cpp @@ -418,6 +418,20 @@ QVariantMap dbusTubeRequest(const Tp::ContactPtr &contact, const QString &servic return request; } +QVariantMap dbusTubeRoomRequest(const QString &roomName, const QString &serviceName) +{ + QVariantMap request; + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".ChannelType"), + TP_QT_IFACE_CHANNEL_TYPE_DBUS_TUBE); + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetHandleType"), + (uint) Tp::HandleTypeRoom); + request.insert(TP_QT_IFACE_CHANNEL_TYPE_DBUS_TUBE + QLatin1String(".ServiceName"), + serviceName); + request.insert(TP_QT_IFACE_CHANNEL + QLatin1String(".TargetID"), + roomName); + return request; +} + QVariantMap conferenceCommonRequest(const QString &channelType, Tp::HandleType targetHandleType, const QList<Tp::ChannelPtr> &channels) { @@ -2892,6 +2906,19 @@ PendingChannelRequest* Account::createDBusTube( preferredHandler, true, hints); } +PendingChannelRequest* Account::createDBusTubeRoom( + const QString &room, + const QString &serviceName, + const QDateTime &userActionTime, + const QString &preferredHandler, + const ChannelRequestHints &hints) +{ + QVariantMap request = dbusTubeRoomRequest(room, serviceName); + + return new PendingChannelRequest(AccountPtr(this), request, userActionTime, + preferredHandler, true, hints); +} + /** * Start a request to create a conference media call with the given * channels \a channels. diff --git a/TelepathyQt/account.h b/TelepathyQt/account.h index e1e00c3..72f858f 100644 --- a/TelepathyQt/account.h +++ b/TelepathyQt/account.h @@ -330,6 +330,12 @@ public: const QDateTime &userActionTime = QDateTime::currentDateTime(), const QString &preferredHandler = QString(), const ChannelRequestHints &hints = ChannelRequestHints()); + PendingChannelRequest *createDBusTubeRoom( + const QString &room, + const QString &serviceName, + const QDateTime &userActionTime = QDateTime::currentDateTime(), + const QString &preferredHandler = QString(), + const ChannelRequestHints &hints = ChannelRequestHints()); TP_QT_DEPRECATED PendingChannelRequest *createConferenceStreamedMediaCall( const QList<ChannelPtr> &channels, -- 1.9.1 ++++++ 0023-Kill-the-last-bits-of-Farsight.patch ++++++

From 0f20582acc1dd952cde1bff9a1a2c093c1da9f2a Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi@ispirata.com> Date: Mon, 15 Jul 2013 01:24:44 +0200 Subject: [PATCH 23/40] Kill the last bits of Farsight

--- CMakeLists.txt | 25 ++-------------- TelepathyQt/main.dox | 4 +-- cmake/modules/FindTelepathyFarsight.cmake | 49 ------------------------------- cmake/modules/TelepathyDist.cmake | 20 ++++++------- 4 files changed, 15 insertions(+), 83 deletions(-) delete mode 100644 cmake/modules/FindTelepathyFarsight.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e52f27..e72f559 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,8 +110,6 @@ endif (${TP_QT_NANO_VERSION} EQUAL 0) option(ENABLE_EXPERIMENTAL_SERVICE_SUPPORT "Enable compilation of experimental and unstable service side bindings for Telepathy-Qt" FALSE) # Add an option for compiling examples option(ENABLE_EXAMPLES "Enable compilation of examples for Telepathy-Qt" TRUE) -# Add an option for compiling Farsight (disabled by default) -option(ENABLE_FARSIGHT "Enable compilation of Farsight bindings (deprecated)" FALSE) # Add an option for compiling Farstream option(ENABLE_FARSTREAM "Enable compilation of Farstream bindings" TRUE) # Add an option for building tests @@ -183,7 +181,7 @@ macro_log_feature(HAVE_TEST_PYTHON "dbus-python" "http://www.python.org/" FALSE "" "Needed to build some additional unit tests") -if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT) +if(ENABLE_TESTS OR ENABLE_FARSTREAM) # Find telepathy-glib set(TELEPATHY_GLIB_MIN_VERSION 0.18.0) find_package(TelepathyGlib) @@ -205,16 +203,6 @@ if(ENABLE_TESTS OR ENABLE_FARSTREAM OR ENABLE_FARSIGHT) find_package(LibXml2) endif() -if(ENABLE_FARSIGHT) - # Find tp-farsight - set(TELEPATHY_FARSIGHT_MIN_VERSION "0.0.4") - find_package(TelepathyFarsight) - macro_log_feature(TELEPATHYFARSIGHT_FOUND "Telepathy-Farsight" - "A Framework for dealing with audio/video conferencing protocols" - "http://farsight.freedesktop.org/wiki/" FALSE "${TELEPATHY_FARSIGHT_MIN_VERSION}" - "Needed, together with GStreamer, to build telepathy-qt-farsight and some additional examples") -endif() - if(ENABLE_FARSTREAM) # Find tp-farstream set(FARSTREAM_MIN_VERSION "0.1.0") @@ -233,22 +221,15 @@ if(ENABLE_FARSTREAM) "Needed, together with GStreamer and Farstream, to build telepathy-qt-farstream") endif() -if(ENABLE_FARSTREAM OR ENABLE_FARSIGHT) +if(ENABLE_FARSTREAM) # Find GStreamer find_package(GStreamer) macro_log_feature(GSTREAMER_FOUND "GStreamer" "An open source multimedia framework" - "Needed, together with Tp-Farsight, to build telepathy-qt-farsight and some additional examples" + "Needed, together with Tp-Farstream, to build telepathy-qt-farstream and some additional examples" "http://www.gstreamer.net/" FALSE) endif() -# Build TelepathyQt-Farsight only if GStreamer, TelepathyFarsight and all of their dependencies were found -if (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT) - set (FARSIGHT_COMPONENTS_FOUND 1) -else (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT) - set (FARSIGHT_COMPONENTS_FOUND 0) -endif (TELEPATHYFARSIGHT_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSIGHT) - # Build TelepathyQt-Farstream only if GStreamer, TelepathyFarstream and all of their dependencies were found if (TELEPATHYFARSTREAM_FOUND AND FARSTREAM_FOUND AND GSTREAMER_FOUND AND GLIB2_FOUND AND GOBJECT_FOUND AND DBUS_FOUND AND LIBXML2_FOUND AND TELEPATHYGLIB_FOUND AND ENABLE_FARSTREAM) set (FARSTREAM_COMPONENTS_FOUND 1) diff --git a/TelepathyQt/main.dox b/TelepathyQt/main.dox index 3d5e0aa..faf4a9e 100644 --- a/TelepathyQt/main.dox +++ b/TelepathyQt/main.dox @@ -80,8 +80,8 @@ * * and to build the example VoIP call UI (examples/call), you'll need: * \li telepathy-glib <http://telepathy.freedesktop.org/releases/telepathy-glib/> - * \li telepathy-farsight - * <http://telepathy.freedesktop.org/releases/telepathy-farsight/> + * \li telepathy-farstream + * <http://telepathy.freedesktop.org/releases/telepathy-farstream/> * \li GStreamer <http://gstreamer.freedesktop.org/>\n * * Building also requires the cmake build system. diff --git a/cmake/modules/FindTelepathyFarsight.cmake b/cmake/modules/FindTelepathyFarsight.cmake deleted file mode 100644 index 65215d6..0000000 --- a/cmake/modules/FindTelepathyFarsight.cmake +++ /dev/null @@ -1,49 +0,0 @@ -# - Try to find Telepathy-Farsight -# Once done this will define -# -# TELEPATHY_FARSIGHT_FOUND - system has TelepathyFarsight -# TELEPATHY_FARSIGHT_INCLUDE_DIR - the TelepathyFarsight include directory -# TELEPATHY_FARSIGHT_LIBRARIES - the libraries needed to use TelepathyFarsight -# TELEPATHY_FARSIGHT_DEFINITIONS - Compiler switches required for using TelepathyFarsight - -# Copyright (c) 2010, Dario Freddi <dario.freddi@collabora.co.uk> -# -# Redistribution and use is allowed according to the terms of the BSD license. - -if (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES) - # in cache already - set(TelepathyFarsight_FIND_QUIETLY TRUE) -else (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES) - set(TelepathyFarsight_FIND_QUIETLY FALSE) -endif (TELEPATHY_FARSIGHT_INCLUDE_DIR AND TELEPATHY_FARSIGHT_LIBRARIES) - -if (NOT WIN32) - # use pkg-config to get the directories and then use these values - # in the find_path() and find_library() calls - find_package(PkgConfig) - if (TELEPATHY_FARSIGHT_MIN_VERSION) - PKG_CHECK_MODULES(PC_TELEPATHY_FARSIGHT telepathy-farsight>=${TELEPATHY_FARSIGHT_MIN_VERSION}) - else (TELEPATHY_FARSIGHT_MIN_VERSION) - PKG_CHECK_MODULES(PC_TELEPATHY_FARSIGHT telepathy-farsight) - endif (TELEPATHY_FARSIGHT_MIN_VERSION) - set(TELEPATHY_FARSIGHT_DEFINITIONS ${PC_TELEPATHY_FARSIGHT_CFLAGS_OTHER}) -endif (NOT WIN32) - -find_path(TELEPATHY_FARSIGHT_INCLUDE_DIR telepathy-farsight/channel.h - PATHS - ${PC_TELEPATHY_FARSIGHT_INCLUDEDIR} - ${PC_TELEPATHY_FARSIGHT_INCLUDE_DIRS} - PATH_SUFFIXES telepathy-1.0 - ) - -find_library(TELEPATHY_FARSIGHT_LIBRARIES NAMES telepathy-farsight - PATHS - ${PC_TELEPATHY_FARSIGHT_LIBDIR} - ${PC_TELEPATHY_FARSIGHT_LIBRARY_DIRS} - ) - -include(FindPackageHandleStandardArgs) -find_package_handle_standard_args(TelepathyFarsight DEFAULT_MSG TELEPATHY_FARSIGHT_LIBRARIES - TELEPATHY_FARSIGHT_INCLUDE_DIR) - -mark_as_advanced(TELEPATHY_FARSIGHT_INCLUDE_DIR TELEPATHY_FARSIGHT_LIBRARIES) diff --git a/cmake/modules/TelepathyDist.cmake b/cmake/modules/TelepathyDist.cmake index 89d7071..7c179fd 100644 --- a/cmake/modules/TelepathyDist.cmake +++ b/cmake/modules/TelepathyDist.cmake @@ -78,31 +78,31 @@ if (ENABLE_CPACK) #name components set(CPACK_COMPONENT_MAINLIBRARY_DISPLAY_NAME "TelepathyQt main components") - set(CPACK_COMPONENT_FARSIGHT_DISPLAY_NAME "TelepathyQt Farsight support") + set(CPACK_COMPONENT_FARSTREAM_DISPLAY_NAME "TelepathyQt Farstream support") set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt") - set(CPACK_COMPONENT_FARSIGHT_HEADERS_DISPLAY_NAME "Development files for TelepathyQt-Farsight") + set(CPACK_COMPONENT_FARSTREAM_HEADERS_DISPLAY_NAME "Development files for TelepathyQt-Farstream") #components description set(CPACK_COMPONENT_MAINLIBRARY_DESCRIPTION "The main TelepathyQt library") - set(CPACK_COMPONENT_FARSIGHT_DESCRIPTION - "The TelepathyQt-Farsight library") + set(CPACK_COMPONENT_FARSTREAM_DESCRIPTION + "The TelepathyQt-Farstream library") set(CPACK_COMPONENT_HEADERS_DESCRIPTION "Development files for TelepathyQt") - set(CPACK_COMPONENT_FARSIGHT_HEADERS_DESCRIPTION - "Development files for TelepathyQt-Farsight") + set(CPACK_COMPONENT_FARSTREAM_HEADERS_DESCRIPTION + "Development files for TelepathyQt-Farstream") set(CPACK_COMPONENT_HEADERS_DEPENDS mainlibrary) - set(CPACK_COMPONENT_FARSIGHT_DEPENDS mainlibrary) - set(CPACK_COMPONENT_FARSIGHT_HEADERS_DEPENDS mainlibrary farsight) + set(CPACK_COMPONENT_FARSTREAM_DEPENDS mainlibrary) + set(CPACK_COMPONENT_FARSTREAM_HEADERS_DEPENDS mainlibrary farstream) #installation types set(CPACK_ALL_INSTALL_TYPES User Developer Minimal) set(CPACK_COMPONENT_MAINLIBRARY_INSTALL_TYPES User Developer Minimal) - set(CPACK_COMPONENT_FARSIGHT_INSTALL_TYPES User Developer) + set(CPACK_COMPONENT_FARSTREAM_INSTALL_TYPES User Developer) set(CPACK_COMPONENT_HEADERS_INSTALL_TYPES Developer) - set(CPACK_COMPONENT_FARSIGHT_HEADERS_INSTALL_TYPES Developer) + set(CPACK_COMPONENT_FARSTREAM_HEADERS_INSTALL_TYPES Developer) # Leave this as the last declaration, always!!! include(CPack) -- 1.9.1 ++++++ 0024-Fix-compilation-on-new-versions-of-cmake.patch ++++++

From 05fe3f4980bbc6b016e25dcf07e44afe29e377c0 Mon Sep 17 00:00:00 2001 From: David Edmundson <kde@davidedmundson.co.uk> Date: Sun, 29 Sep 2013 22:19:27 +0000 Subject: [PATCH 24/40] Fix compilation on new versions of cmake

Recent cmake has changed the argument count to qt4_create_moc_command, we need to adjust accordingly Reviewed-by: Dario Freddi <dario.freddi@ispirata.com> --- cmake/modules/FindQt.cmake | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake index c2eac76..b3131f0 100644 --- a/cmake/modules/FindQt.cmake +++ b/cmake/modules/FindQt.cmake @@ -74,10 +74,18 @@ ENDMACRO(QT_GET_MOC_FLAGS) MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) IF(QT_VERSION_MAJOR MATCHES 4) - QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") + ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT4_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ELSE(QT_VERSION_MAJOR MATCHES 4) IF(QT_VERSION_MAJOR MATCHES 5) - QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") + ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") + ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ENDIF(QT_VERSION_MAJOR MATCHES 5) ENDIF(QT_VERSION_MAJOR MATCHES 4) ENDMACRO(QT_CREATE_MOC_COMMAND) -- 1.9.1 ++++++ 0025-Fix-build-for-Qt5-release.patch ++++++

From a074b02f8c1c6ee2fb8f15091812f0f8d9370cb5 Mon Sep 17 00:00:00 2001 From: David Edmundson <david@davidedmundson.co.uk> Date: Wed, 22 Jan 2014 13:03:16 -0700 Subject: [PATCH 25/40] Fix build for Qt5 release

Reviewed-by: John Brooks <john.brooks@jolla.com> --- TelepathyQt/Farstream/channel.cpp | 6 ++-- TelepathyQt/account.cpp | 4 +-- TelepathyQt/utils.cpp | 2 +- cmake/modules/FindQt5.cmake | 68 +++++++++------------------------------ 4 files changed, 21 insertions(+), 59 deletions(-) diff --git a/TelepathyQt/Farstream/channel.cpp b/TelepathyQt/Farstream/channel.cpp index 20acee3..0cd54f9 100644 --- a/TelepathyQt/Farstream/channel.cpp +++ b/TelepathyQt/Farstream/channel.cpp @@ -90,7 +90,7 @@ PendingChannel::PendingChannel(const CallChannelPtr &channel) } TpConnection *gconnection = tp_simple_client_factory_ensure_connection (factory, - connection->objectPath().toAscii(), NULL, 0); + connection->objectPath().toLatin1(), NULL, 0); if (!gconnection) { warning() << "Unable to construct TpConnection"; setFinishedWithError(TP_QT_ERROR_NOT_AVAILABLE, @@ -101,10 +101,10 @@ PendingChannel::PendingChannel(const CallChannelPtr &channel) } TpChannel *gchannel = (TpChannel*) g_object_new(TP_TYPE_CALL_CHANNEL, - "bus-name", connection->busName().toAscii().constData(), + "bus-name", connection->busName().toLatin1().constData(), "connection", gconnection, "dbus-daemon", dbus, - "object-path", channel->objectPath().toAscii().constData(), + "object-path", channel->objectPath().toLatin1().constData(), NULL); g_object_unref(factory); factory = 0; diff --git a/TelepathyQt/account.cpp b/TelepathyQt/account.cpp index c2ad581..52025a4 100644 --- a/TelepathyQt/account.cpp +++ b/TelepathyQt/account.cpp @@ -52,7 +52,7 @@ #include <QRegExp> #include <QSharedPointer> #include <QTimer> -#include <QWeakPointer> +#include <QPointer> #include <string.h> @@ -648,7 +648,7 @@ struct Account::Private::DispatcherContext Client::ChannelDispatcherInterface *iface; bool introspected, supportsHints; - QWeakPointer<PendingVariant> introspectOp; + QPointer<PendingVariant> introspectOp; private: DispatcherContext(const DispatcherContext &); diff --git a/TelepathyQt/utils.cpp b/TelepathyQt/utils.cpp index 5b922d9..e4614c2 100644 --- a/TelepathyQt/utils.cpp +++ b/TelepathyQt/utils.cpp @@ -204,7 +204,7 @@ QVariant parseValueWithDBusSignature(const QString &value, case QVariant::StringList: { QStringList list; - QByteArray rawValue = value.toAscii(); + QByteArray rawValue = value.toLatin1(); if (KeyFile::unescapeStringList(rawValue, 0, rawValue.size(), list)) { return QVariant(list); } else { diff --git a/cmake/modules/FindQt5.cmake b/cmake/modules/FindQt5.cmake index fb30054..922ebc1 100644 --- a/cmake/modules/FindQt5.cmake +++ b/cmake/modules/FindQt5.cmake @@ -12,29 +12,12 @@ # QT_VERSION_MINOR The minor version of Qt found. # QT_VERSION_PATCH The patch version of Qt found. # -# QT_BINARY_DIR Path to "bin" of Qt4 -# QT_DOC_DIR Path to "doc" of Qt4 -# -# QT_QTCORE_FOUND True if QtCore was found. -# QT_QTGUI_FOUND True if QtGui was found. -# QT_QTDBUS_FOUND True if QtDBus was found. -# QT_QTNETWORK_FOUND True if QtNetwork was found. -# QT_QTTEST_FOUND True if QtTest was found. -# QT_QTWIDGETS_FOUND True if QtWidgets was found. -# QT_QTXML_FOUND True if QtXml was found. +# QT_BINARY_DIR Path to "bin" of Qt5 +# QT_DOC_DIR Path to "doc" of Qt5 # # QT_INCLUDES List of paths to all include directories of Qt5. -# QT_INCLUDE_DIR Path to "include" of Qt4 -# QT_QTCORE_INCLUDE_DIR Path to "include/QtCore" -# QT_QTDBUS_INCLUDE_DIR Path to "include/QtDBus" -# QT_QTGUI_INCLUDE_DIR Path to "include/QtGui" -# QT_QTNETWORK_INCLUDE_DIR Path to "include/QtNetwork" -# QT_QTTEST_INCLUDE_DIR Path to "include/QtTest" -# QT_QTWIDGETS_INCLUDE_DIR Path to "include/QtWidgets" -# QT_QTXML_INCLUDE_DIR Path to "include/QtXml" # # QT_LIBRARIES List of paths to all libraries of Qt5. -# QT_LIBRARY_DIR Path to "lib" of Qt4 # QT_QTCORE_LIBRARY The QtCore library # QT_QTDBUS_LIBRARY The QtDBus library # QT_QTGUI_LIBRARY The QtGui library @@ -79,43 +62,20 @@ ENDIF(NOT QTVERSION MATCHES "5.*") FIND_PACKAGE(PkgConfig REQUIRED) -IF(NOT Qt5_FIND_COMPONENTS) - SET(_COMPONENTS QtCore QtDBus QtGui QtNetwork QtTest QtWidgets QtXml) -ELSE(NOT Qt5_FIND_COMPONENTS) - SET(_COMPONENTS ${Qt5_FIND_COMPONENTS}) -ENDIF(NOT Qt5_FIND_COMPONENTS) - -FOREACH(_COMPONENT ${_COMPONENTS}) - STRING(TOUPPER ${_COMPONENT} _COMPONENT_UPPER) - IF(NOT QT_${_COMPONENT_UPPER}_FOUND) - IF(Qt5_FIND_REQUIRED) - PKG_CHECK_MODULES(PC_${_COMPONENT} REQUIRED ${_COMPONENT}>=${QT_MIN_VERSION}) - ELSE(Qt5_FIND_REQUIRED) - PKG_CHECK_MODULES(PC_${_COMPONENT} QUIET ${_COMPONENT}>=${QT_MIN_VERSION}) - ENDIF(Qt5_FIND_REQUIRED) - - SET(QT_${_COMPONENT_UPPER}_INCLUDE_DIR ${PC_${_COMPONENT}_INCLUDE_DIRS}) +FIND_PACKAGE(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Network Test Widgets Xml) - FIND_LIBRARY(QT_${_COMPONENT_UPPER}_LIBRARY - NAMES ${_COMPONENT} - HINTS - ${PC_${_COMPONENT}_LIBDIR}) +# Copy includes and library names into the same style as pkgconfig used for Qt4 +set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) - SET(QT_${_COMPONENT_UPPER}_FOUND ${PC_${_COMPONENT}_FOUND}) +set(QT_QTCORE_LIBRARY ${Qt5Core_LIBRARIES}) +set(QT_QTDBUS_LIBRARY ${Qt5DBus_LIBRARIES}) +set(QT_QTGUI_LIBRARY ${Qt5Gui_LIBRARIES}) +set(QT_QTNETWORK_LIBRARY ${Qt5Network_LIBRARIES}) +set(QT_QTTEST_LIBRARY ${Qt5Test_LIBRARIES}) +set(QT_QTWIDGETS_LIBRARY ${Qt5Widgets_LIBRARIES}) +set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES}) - #MESSAGE(STATUS "COMPONENT ${_COMPONENT_UPPER}:") - #MESSAGE(STATUS " QT_${_COMPONENT_UPPER}_LIBRARY: ${QT_${_COMPONENT_UPPER}_LIBRARY}") - #MESSAGE(STATUS " QT_${_COMPONENT_UPPER}_INCLUDE_DIR: ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR}") - #MESSAGE(STATUS " QT_${_COMPONENT_UPPER}_FOUND: ${QT_${_COMPONENT_UPPER}_FOUND}") - - SET(QT_INCLUDES ${QT_INCLUDES} ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR}) - SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_${_COMPONENT_UPPER}_INCLUDE_DIR}) - MARK_AS_ADVANCED(QT_${_COMPONENT_UPPER}_LIBRARY QT_${_COMPONENT_UPPER}_INCLUDE_DIR) - ENDIF(NOT QT_${_COMPONENT_UPPER}_FOUND) -ENDFOREACH(_COMPONENT) - -#MESSAGE(STATUS "QT_LIBRARIES: ${QT_LIBRARIES}") -#MESSAGE(STATUS "QT_INCLUDES: ${QT_INCLUDES}") +set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY}) STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}") STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}") @@ -158,6 +118,8 @@ EXECUTE_PROCESS(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable qt_config QtCore RESULT_VARIABLE _pkgconfig_failed) STRING(REPLACE " " ";" QT_CONFIG_FLAGS "${_pkgconfig_flags}") +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC") + INCLUDE(Qt5Macros) SET(QT_FOUND TRUE) -- 1.9.1 ++++++ 0026-Fix-tests-build-for-Qt5-release.patch ++++++

From de35be668db0e31b3fe1114e0885b6506ed30eba Mon Sep 17 00:00:00 2001 From: John Brooks <john.brooks@jollamobile.com> Date: Wed, 22 Jan 2014 13:22:48 -0700 Subject: [PATCH 26/40] Fix tests build for Qt5 release

Reviewed-by: David Edmundson <davidedmundson@kde.org> --- tests/dbus/account-channel-dispatcher.cpp | 2 +- tests/dbus/chan-basics.cpp | 2 +- tests/dbus/chan-conference.cpp | 10 +++++----- tests/dbus/chan-group.cpp | 2 +- tests/dbus/client-factories.cpp | 4 ++-- tests/dbus/client.cpp | 4 ++-- tests/dbus/contact-messenger.cpp | 2 +- tests/dbus/contact-search-chan.cpp | 4 ++-- tests/dbus/properties.cpp | 2 +- tests/dbus/stream-tube-handlers.cpp | 2 +- tests/dbus/streamed-media-chan.cpp | 2 +- tests/dbus/text-chan.cpp | 4 ++-- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tests/dbus/account-channel-dispatcher.cpp b/tests/dbus/account-channel-dispatcher.cpp index 510a163..8f7f634 100644 --- a/tests/dbus/account-channel-dispatcher.cpp +++ b/tests/dbus/account-channel-dispatcher.cpp @@ -1061,7 +1061,7 @@ void TestAccountChannelDispatcher::testCreateAndHandleChannelHandledAgain() guint handle = tp_handle_ensure(contactRepo, "someone@localhost", 0, 0); mChanPath = mConn->objectPath() + QLatin1String("/TextChannel"); - QByteArray chanPath(mChanPath.toAscii()); + QByteArray chanPath(mChanPath.toLatin1()); ExampleEcho2Channel *textChanService = EXAMPLE_ECHO_2_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_2_CHANNEL, "connection", mConn->service(), diff --git a/tests/dbus/chan-basics.cpp b/tests/dbus/chan-basics.cpp index 8596060..a3a00da 100644 --- a/tests/dbus/chan-basics.cpp +++ b/tests/dbus/chan-basics.cpp @@ -229,7 +229,7 @@ void TestChanBasics::testFallback() guint handle = tp_handle_ensure(contactRepo, "someone@localhost", 0, 0); QString textChanPath = mConn->objectPath() + QLatin1String("/Channel"); - QByteArray chanPath(textChanPath.toAscii()); + QByteArray chanPath(textChanPath.toLatin1()); TpTestsTextChannelNull *textChanService = TP_TESTS_TEXT_CHANNEL_NULL (g_object_new ( TP_TESTS_TYPE_TEXT_CHANNEL_NULL, diff --git a/tests/dbus/chan-conference.cpp b/tests/dbus/chan-conference.cpp index 830fa97..1b074d6 100644 --- a/tests/dbus/chan-conference.cpp +++ b/tests/dbus/chan-conference.cpp @@ -98,7 +98,7 @@ void TestConferenceChan::initTestCase() GPtrArray *initialChannels = g_ptr_array_new(); mTextChan1Path = mConn->objectPath() + QLatin1String("/TextChannel/1"); - chanPath = mTextChan1Path.toAscii(); + chanPath = mTextChan1Path.toLatin1(); mTextChan1Service = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -108,7 +108,7 @@ void TestConferenceChan::initTestCase() g_ptr_array_add(initialChannels, g_strdup(chanPath.data())); mTextChan2Path = mConn->objectPath() + QLatin1String("/TextChannel/2"); - chanPath = mTextChan2Path.toAscii(); + chanPath = mTextChan2Path.toLatin1(); mTextChan2Service = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -119,7 +119,7 @@ void TestConferenceChan::initTestCase() // let's not add this one to initial channels mTextChan3Path = mConn->objectPath() + QLatin1String("/TextChannel/3"); - chanPath = mTextChan3Path.toAscii(); + chanPath = mTextChan3Path.toLatin1(); mTextChan3Service = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -128,7 +128,7 @@ void TestConferenceChan::initTestCase() NULL)); mConferenceChanPath = mConn->objectPath() + QLatin1String("/ConferenceChannel"); - chanPath = mConferenceChanPath.toAscii(); + chanPath = mConferenceChanPath.toLatin1(); mConferenceChanService = TP_TESTS_CONFERENCE_CHANNEL(g_object_new( TP_TESTS_TYPE_CONFERENCE_CHANNEL, "connection", mConn->service(), @@ -229,7 +229,7 @@ void TestConferenceChan::testConference() SLOT(onConferenceChannelRemoved(const Tp::ChannelPtr &, const Tp::Channel::GroupMemberChangeDetails &)))); tp_tests_conference_channel_remove_channel (mConferenceChanService, - mChannelMerged->objectPath().toAscii().data()); + mChannelMerged->objectPath().toLatin1().data()); while (!mChannelRemovedDetailed) { QCOMPARE(mLoop->exec(), 0); } diff --git a/tests/dbus/chan-group.cpp b/tests/dbus/chan-group.cpp index b516a1a..6ccc8ad 100644 --- a/tests/dbus/chan-group.cpp +++ b/tests/dbus/chan-group.cpp @@ -448,7 +448,7 @@ void TestChanGroup::testGroupFlagsChange() guint handle = tp_handle_ensure(contactRepo, "someone@localhost", 0, 0); QString textChanPath = mConn->objectPath() + QLatin1String("/Channel"); - QByteArray chanPath(textChanPath.toAscii()); + QByteArray chanPath(textChanPath.toLatin1()); TpTestsPropsGroupTextChannel *textChanService = TP_TESTS_PROPS_GROUP_TEXT_CHANNEL(g_object_new( TP_TESTS_TYPE_PROPS_GROUP_TEXT_CHANNEL, diff --git a/tests/dbus/client-factories.cpp b/tests/dbus/client-factories.cpp index 1f7b7fa..719007b 100644 --- a/tests/dbus/client-factories.cpp +++ b/tests/dbus/client-factories.cpp @@ -516,7 +516,7 @@ void TestClientFactories::initTestCase() guint handle = tp_handle_ensure(mContactRepo, "someone@localhost", 0, 0); mText1ChanPath = mConnPath + QLatin1String("/TextChannel1"); - QByteArray chanPath(mText1ChanPath.toAscii()); + QByteArray chanPath(mText1ChanPath.toLatin1()); mText1ChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConnService, @@ -525,7 +525,7 @@ void TestClientFactories::initTestCase() NULL)); mText2ChanPath = mConnPath + QLatin1String("/TextChannel2"); - chanPath = mText2ChanPath.toAscii(); + chanPath = mText2ChanPath.toLatin1(); mText2ChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConnService, diff --git a/tests/dbus/client.cpp b/tests/dbus/client.cpp index 20729eb..46088ae 100644 --- a/tests/dbus/client.cpp +++ b/tests/dbus/client.cpp @@ -451,7 +451,7 @@ void TestClient::initTestCase() // create a Channel by magic, rather than doing D-Bus round-trips for it mText1ChanPath = mConn->objectPath() + QLatin1String("/TextChannel1"); - QByteArray chanPath(mText1ChanPath.toAscii()); + QByteArray chanPath(mText1ChanPath.toLatin1()); mText1ChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -460,7 +460,7 @@ void TestClient::initTestCase() NULL)); mText2ChanPath = mConn->objectPath() + QLatin1String("/TextChannel2"); - chanPath = mText2ChanPath.toAscii(); + chanPath = mText2ChanPath.toLatin1(); mText2ChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), diff --git a/tests/dbus/contact-messenger.cpp b/tests/dbus/contact-messenger.cpp index 446f79e..4932000 100644 --- a/tests/dbus/contact-messenger.cpp +++ b/tests/dbus/contact-messenger.cpp @@ -403,7 +403,7 @@ void TestContactMessenger::initTestCase() guint handle = tp_handle_ensure(mContactRepo, "Ann", 0, 0); mMessagesChanPath = mConnPath + QLatin1String("/MessagesChannel"); - QByteArray chanPath = mMessagesChanPath.toAscii(); + QByteArray chanPath = mMessagesChanPath.toLatin1(); mMessagesChanService = EXAMPLE_ECHO_2_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_2_CHANNEL, "connection", mConnService, diff --git a/tests/dbus/contact-search-chan.cpp b/tests/dbus/contact-search-chan.cpp index 9739d6f..220c416 100644 --- a/tests/dbus/contact-search-chan.cpp +++ b/tests/dbus/contact-search-chan.cpp @@ -114,7 +114,7 @@ void TestContactSearchChan::initTestCase() QByteArray chan1Path; mChan1Path = mConn->objectPath() + QLatin1String("/ContactSearchChannel/1"); - chan1Path = mChan1Path.toAscii(); + chan1Path = mChan1Path.toLatin1(); mChan1Service = TP_TESTS_CONTACT_SEARCH_CHANNEL(g_object_new( TP_TESTS_TYPE_CONTACT_SEARCH_CHANNEL, "connection", mConn->service(), @@ -123,7 +123,7 @@ void TestContactSearchChan::initTestCase() QByteArray chan2Path; mChan2Path = mConn->objectPath() + QLatin1String("/ContactSearchChannel/2"); - chan2Path = mChan2Path.toAscii(); + chan2Path = mChan2Path.toLatin1(); mChan2Service = TP_TESTS_CONTACT_SEARCH_CHANNEL(g_object_new( TP_TESTS_TYPE_CONTACT_SEARCH_CHANNEL, "connection", mConn->service(), diff --git a/tests/dbus/properties.cpp b/tests/dbus/properties.cpp index 31f9d2a..07fb741 100644 --- a/tests/dbus/properties.cpp +++ b/tests/dbus/properties.cpp @@ -104,7 +104,7 @@ void TestProperties::testPropertiesMonitoring() "a.random.interface", changed, NULL); tp_svc_dbus_properties_emit_properties_changed (mConnService, - mConn->interface().toAscii().data(), changed, NULL); + mConn->interface().toLatin1().data(), changed, NULL); QCOMPARE(spy.count(), 0); diff --git a/tests/dbus/stream-tube-handlers.cpp b/tests/dbus/stream-tube-handlers.cpp index ebc9a6e..fcd7937 100644 --- a/tests/dbus/stream-tube-handlers.cpp +++ b/tests/dbus/stream-tube-handlers.cpp @@ -1209,7 +1209,7 @@ void TestStreamTubeHandlers::testSSTHErrorPaths() // Pass it a text channel, and with no satisfied requests QString textChanPath = mConn->objectPath() + QLatin1String("/TextChannel"); - QByteArray chanPath(textChanPath.toAscii()); + QByteArray chanPath(textChanPath.toLatin1()); ExampleEchoChannel *textChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), diff --git a/tests/dbus/streamed-media-chan.cpp b/tests/dbus/streamed-media-chan.cpp index 1c5dd9d..8c160ee 100644 --- a/tests/dbus/streamed-media-chan.cpp +++ b/tests/dbus/streamed-media-chan.cpp @@ -1127,7 +1127,7 @@ void TestStreamedMediaChan::testHoldNoUnhold() SIGNAL(localHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason)), SLOT(onLocalHoldStateChanged(Tp::LocalHoldState, Tp::LocalHoldStateReason)))); // Request hold - QWeakPointer<PendingOperation> holdOp = mChan->requestHold(true); + QPointer<PendingOperation> holdOp = mChan->requestHold(true); while (mLocalHoldStates.size() != 2 || (holdOp && !holdOp.data()->isFinished())) { mLoop->processEvents(); } diff --git a/tests/dbus/text-chan.cpp b/tests/dbus/text-chan.cpp index 5bc5aa8..de1d9d2 100644 --- a/tests/dbus/text-chan.cpp +++ b/tests/dbus/text-chan.cpp @@ -145,7 +145,7 @@ void TestTextChan::initTestCase() // create a Channel by magic, rather than doing D-Bus round-trips for it mTextChanPath = mConn->objectPath() + QLatin1String("/TextChannel"); - QByteArray chanPath(mTextChanPath.toAscii()); + QByteArray chanPath(mTextChanPath.toLatin1()); mTextChanService = EXAMPLE_ECHO_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_CHANNEL, "connection", mConn->service(), @@ -154,7 +154,7 @@ void TestTextChan::initTestCase() NULL)); mMessagesChanPath = mConn->objectPath() + QLatin1String("/MessagesChannel"); - chanPath = mMessagesChanPath.toAscii(); + chanPath = mMessagesChanPath.toLatin1(); mMessagesChanService = EXAMPLE_ECHO_2_CHANNEL(g_object_new( EXAMPLE_TYPE_ECHO_2_CHANNEL, "connection", mConn->service(), -- 1.9.1 ++++++ 0027-Fix-TestKeyFile-sort-list-before-comparing.patch ++++++

From 15ddf0963b75f09b1ed6558dd0472058e7eb9914 Mon Sep 17 00:00:00 2001 From: Martin Kampas <martin.kampas@tieto.com> Date: Fri, 8 Nov 2013 13:54:19 +0100 Subject: [PATCH 27/40] Fix TestKeyFile: sort list before comparing

Reviewed-by: David Edmundson <davidedmundson@kde.org> --- tests/key-file.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/key-file.cpp b/tests/key-file.cpp index 1d7b439..ebcf1e7 100644 --- a/tests/key-file.cpp +++ b/tests/key-file.cpp @@ -31,7 +31,9 @@ void TestKeyFile::testKeyFile() KeyFile keyFile(QLatin1String("test-key-file.ini")); QCOMPARE(keyFile.status(), KeyFile::NoError); - QCOMPARE(keyFile.allGroups(), + QStringList allGroups = keyFile.allGroups(); + allGroups.sort(); + QCOMPARE(allGroups, QStringList() << QString() << QLatin1String("test group 1") << QLatin1String("test group 2")); -- 1.9.1 ++++++ 0028-Fix-TestAccountSet-testFilters.patch ++++++

From 1adfbc3329dfa604165d9fd197abb14000e1ac1f Mon Sep 17 00:00:00 2001 From: Martin Kampas <martin.kampas@tieto.com> Date: Mon, 11 Nov 2013 15:39:00 +0100 Subject: [PATCH 28/40] Fix TestAccountSet::testFilters

The ordering of mAM->allAccounts() has changed. Fixed so it works irrespective of the order. Reviewed-by: David Edmundson <davidedmundson@kde.org> --- tests/dbus/account-set.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/dbus/account-set.cpp b/tests/dbus/account-set.cpp index 07cc1ea..8bc51be 100644 --- a/tests/dbus/account-set.cpp +++ b/tests/dbus/account-set.cpp @@ -258,7 +258,7 @@ void TestAccountSet::testFilters() createAccount("spurious", "normal", "spuriousnormal", parameters); QCOMPARE(mAM->allAccounts().size(), 2); QCOMPARE(mAM->validAccounts()->accounts().size(), 2); - AccountPtr spuriousAcc = mAM->allAccounts()[1]; + AccountPtr spuriousAcc = *(mAM->allAccounts().toSet() -= fooAcc).begin(); Tp::AccountSetPtr filteredAccountSet; -- 1.9.1 ++++++ 0029-Fix-TestDBusProxyFactory-testDropRefs.patch ++++++

From d6435eb0c335bab46d33d727560e2732bcd203aa Mon Sep 17 00:00:00 2001 From: Martin Kampas <martin.kampas@tieto.com> Date: Tue, 12 Nov 2013 08:09:22 +0100 Subject: [PATCH 29/40] Fix TestDBusProxyFactory::testDropRefs

(Hopefully) prevent getting the new proxy instantiated on the very same address. Reviewed-by: David Edmundson <davidedmundson@kde.org> --- tests/dbus/dbus-proxy-factory.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tests/dbus/dbus-proxy-factory.cpp b/tests/dbus/dbus-proxy-factory.cpp index 67c8ab5..8596ea9 100644 --- a/tests/dbus/dbus-proxy-factory.cpp +++ b/tests/dbus/dbus-proxy-factory.cpp @@ -1,4 +1,5 @@ #include <QtCore/QDebug> +#include <QtCore/QScopedPointer> #include <QtCore/QTimer> #include <QtDBus/QtDBus> #include <QtTest/QtTest> @@ -222,6 +223,9 @@ void TestDBusProxyFactory::testDropRefs() Connection *firstPtr = firstProxy.data(); firstProxy.reset(); + // Hopefully this prevents getting the new proxy instantiated on the very same address + QScopedPointer<char, QScopedPointerArrayDeleter<char> > hole(new char[sizeof(Connection)]); + PendingReady *different = mFactory->proxy(mConnName1, mConnPath1, ChannelFactory::create(QDBusConnection::sessionBus()), ContactFactory::create()); -- 1.9.1 ++++++ 0030-Fix-HandledChannelNotifier-for-Qt5.patch ++++++

From 46029e9f26c78f95c9846097d296ddaec9826c44 Mon Sep 17 00:00:00 2001 From: Martin Kampas <martin.kampas@tieto.com> Date: Tue, 12 Nov 2013 11:54:00 +0100 Subject: [PATCH 30/40] Fix HandledChannelNotifier for Qt5

The QObject::connectNotify() signature changed in Qt5. Detected by TestAccountChannelDispatcher::testCreateAndHandleChannelHandledAgain() which hangs forever because HandledChannelNotifier::handledAgain() gets never emitted. Reviewed-by: David Edmundson <davidedmundson@kde.org> --- TelepathyQt/handled-channel-notifier.cpp | 9 +++++++++ TelepathyQt/handled-channel-notifier.h | 6 +++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/TelepathyQt/handled-channel-notifier.cpp b/TelepathyQt/handled-channel-notifier.cpp index 47b2b55..e871306 100644 --- a/TelepathyQt/handled-channel-notifier.cpp +++ b/TelepathyQt/handled-channel-notifier.cpp @@ -93,11 +93,20 @@ void HandledChannelNotifier::onChannelInvalidated() deleteLater(); } +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) +void HandledChannelNotifier::connectNotify(const QMetaMethod &signal) +{ + if (signal == QMetaMethod::fromSignal(&HandledChannelNotifier::handledAgain)) { + mPriv->handler->setQueueChannelReceived(false); + } +} +#else void HandledChannelNotifier::connectNotify(const char *signalName) { if (qstrcmp(signalName, SIGNAL(handledAgain(QDateTime,Tp::ChannelRequestHints))) == 0) { mPriv->handler->setQueueChannelReceived(false); } } +#endif } // Tp diff --git a/TelepathyQt/handled-channel-notifier.h b/TelepathyQt/handled-channel-notifier.h index 0dab6af..6474031 100644 --- a/TelepathyQt/handled-channel-notifier.h +++ b/TelepathyQt/handled-channel-notifier.h @@ -52,7 +52,11 @@ Q_SIGNALS: void handledAgain(const QDateTime &userActionTime, const Tp::ChannelRequestHints &requestHints); protected: - void connectNotify(const char *); +#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0) + void connectNotify(const QMetaMethod &signal); +#else + void connectNotify(const char *signal); +#endif private Q_SLOTS: TP_QT_NO_EXPORT void onChannelReceived(const Tp::ChannelPtr &channel, -- 1.9.1 ++++++ 0031-Update-to-spec-0.27.3.patch ++++++ ++++ 1892 lines (skipped) ++++++ 0032-Update-changes-from-Channel_Dispatcher_Future.patch ++++++

From 6823281506d8e063e43e6ecd0ae071b48758f90c Mon Sep 17 00:00:00 2001 From: David Edmundson <kde@davidedmundson.co.uk> Date: Sun, 19 Jan 2014 20:19:42 +0100 Subject: [PATCH 32/40] Update changes from Channel_Dispatcher_Future

--- TelepathyQt/channel-dispatcher.xml | 14 ++++++++++++++ TelepathyQt/contact-messenger.cpp | 7 +++---- TelepathyQt/future-channel-dispatcher.xml | 12 ------------ tools/manager-file.py | 1 + 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/TelepathyQt/channel-dispatcher.xml b/TelepathyQt/channel-dispatcher.xml index a1588a4..c2b4332 100644 --- a/TelepathyQt/channel-dispatcher.xml +++ b/TelepathyQt/channel-dispatcher.xml @@ -6,4 +6,18 @@ <xi:include href="../spec/Channel_Dispatcher.xml"/> +<xi:include href="../spec/Channel_Dispatcher_Interface_Messages1.xml"/> + +<tp:generic-types> + <tp:external-type name="Message_Part" type="a{sv}" from="Telepathy specification"/> + <tp:mapping name="Message_Part" array-name="Message_Part_List" array-depth="2"> + <tp:member name="Key" type="s"/> + <tp:member name="Value" type="v"/> + </tp:mapping> +</tp:generic-types> + +<xi:include href="../spec/generic-types.xml"/> +<xi:include href="../spec/errors.xml"/> + + </tp:spec> diff --git a/TelepathyQt/contact-messenger.cpp b/TelepathyQt/contact-messenger.cpp index fdb5608..1f34f4b 100644 --- a/TelepathyQt/contact-messenger.cpp +++ b/TelepathyQt/contact-messenger.cpp @@ -55,22 +55,21 @@ struct TP_QT_NO_EXPORT ContactMessenger::Private AccountPtr account; QString contactIdentifier; SimpleTextObserverPtr observer; - TpFuture::Client::ChannelDispatcherInterfaceMessagesInterface *cdMessagesInterface; + Tp::Client::ChannelDispatcherInterfaceMessages1Interface *cdMessagesInterface; }; PendingSendMessage *ContactMessenger::Private::sendMessage(const Message &message, MessageSendingFlags flags) { if (!cdMessagesInterface) { - cdMessagesInterface = new TpFuture::Client::ChannelDispatcherInterfaceMessagesInterface( + cdMessagesInterface = new Tp::Client::ChannelDispatcherInterfaceMessages1Interface( account->dbusConnection(), TP_QT_CHANNEL_DISPATCHER_BUS_NAME, TP_QT_CHANNEL_DISPATCHER_OBJECT_PATH, parent); } PendingSendMessage *op = new PendingSendMessage(ContactMessengerPtr(parent), message); - // TODO: is there a way to avoid this? Ideally TpFuture classes should use Tp types. - TpFuture::MessagePartList parts; + Tp::MessagePartList parts; foreach (const Tp::MessagePart &part, message.parts()) { parts << static_cast<QMap<QString, QDBusVariant> >(part); } diff --git a/TelepathyQt/future-channel-dispatcher.xml b/TelepathyQt/future-channel-dispatcher.xml index 0e7f67c..091637d 100644 --- a/TelepathyQt/future-channel-dispatcher.xml +++ b/TelepathyQt/future-channel-dispatcher.xml @@ -4,17 +4,5 @@ <tp:title>Channel Dispatcher extensions from the future</tp:title> -<xi:include href="../spec/Channel_Dispatcher_Interface_Messages.xml"/> - -<tp:generic-types> - <tp:external-type name="Message_Part" type="a{sv}" from="Telepathy specification"/> - <tp:mapping name="Message_Part" array-name="Message_Part_List" array-depth="2"> - <tp:member name="Key" type="s"/> - <tp:member name="Value" type="v"/> - </tp:mapping> -</tp:generic-types> - -<xi:include href="../spec/generic-types.xml"/> -<xi:include href="../spec/errors.xml"/> </tp:spec> diff --git a/tools/manager-file.py b/tools/manager-file.py index 45f6404..d873014 100644 --- a/tools/manager-file.py +++ b/tools/manager-file.py @@ -25,6 +25,7 @@ import re import sys +import os _NOT_C_STR = re.compile(r'[^A-Za-z0-9_-]') -- 1.9.1 ++++++ 0033-Update-test-library-to-match-spec-changes.patch ++++++

From bb2c4e68af128fe76d5599b46b33c81d7841608e Mon Sep 17 00:00:00 2001 From: David Edmundson <kde@davidedmundson.co.uk> Date: Sun, 19 Jan 2014 20:50:11 +0100 Subject: [PATCH 33/40] Update test library to match spec changes

--- tests/lib/glib/future/extensions/misc.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/lib/glib/future/extensions/misc.xml b/tests/lib/glib/future/extensions/misc.xml index 061b4d4..91abcfb 100644 --- a/tests/lib/glib/future/extensions/misc.xml +++ b/tests/lib/glib/future/extensions/misc.xml @@ -5,7 +5,6 @@ <tp:title>Miscellaneous extensions from the future</tp:title> <xi:include href="../../../../../spec/Call_Content.xml"/> -<xi:include href="../../../../../spec/Call_Content_Codec_Offer.xml"/> <xi:include href="../../../../../spec/Call_Content_Interface_Media.xml"/> <xi:include href="../../../../../spec/Call_Stream_Endpoint.xml"/> <xi:include href="../../../../../spec/Call_Stream_Interface_Media.xml"/> -- 1.9.1 ++++++ 0034-Add-Room-Subject-RoomConfig-interfaces-to-generation.patch ++++++

From 5afa270e4eed0f6401509809331db7e8a13653ca Mon Sep 17 00:00:00 2001 From: Leon Handreke <leonh@ndreke.de> Date: Sat, 18 Jan 2014 18:32:40 +0100 Subject: [PATCH 34/40] Add {Room,Subject,RoomConfig} interfaces to generation

--- TelepathyQt/CMakeLists.txt | 3 +++ TelepathyQt/ChannelInterfaceRoomConfigInterface | 13 +++++++++++++ TelepathyQt/ChannelInterfaceRoomInterface | 13 +++++++++++++ TelepathyQt/ChannelInterfaceSubjectInterface | 13 +++++++++++++ TelepathyQt/channel.xml | 3 +++ TelepathyQt/svc-channel.xml | 3 +++ 6 files changed, 48 insertions(+) create mode 100644 TelepathyQt/ChannelInterfaceRoomConfigInterface create mode 100644 TelepathyQt/ChannelInterfaceRoomInterface create mode 100644 TelepathyQt/ChannelInterfaceSubjectInterface diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 06aaad7..47ec09c 100644 --- a/TelepathyQt/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -232,10 +232,13 @@ set(telepathy_qt_HEADERS ChannelInterfaceMediaSignallingInterface ChannelInterfaceMessagesInterface ChannelInterfacePasswordInterface + ChannelInterfaceRoomInterface + ChannelInterfaceRoomConfigInterface ChannelInterfaceSASLAuthenticationInterface ChannelInterfaceSecurableInterface ChannelInterfaceServicePointInterface ChannelInterfaceSMSInterface + ChannelInterfaceSubjectInterface ChannelInterfaceTubeInterface ChannelRequest ChannelRequestHints diff --git a/TelepathyQt/ChannelInterfaceRoomConfigInterface b/TelepathyQt/ChannelInterfaceRoomConfigInterface new file mode 100644 index 0000000..22e769a --- /dev/null +++ b/TelepathyQt/ChannelInterfaceRoomConfigInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceRoomConfigInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceRoomConfigInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceRoomInterface b/TelepathyQt/ChannelInterfaceRoomInterface new file mode 100644 index 0000000..8eea392 --- /dev/null +++ b/TelepathyQt/ChannelInterfaceRoomInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceRoomInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceRoomInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/ChannelInterfaceSubjectInterface b/TelepathyQt/ChannelInterfaceSubjectInterface new file mode 100644 index 0000000..b2aa91e --- /dev/null +++ b/TelepathyQt/ChannelInterfaceSubjectInterface @@ -0,0 +1,13 @@ +#ifndef _TelepathyQt_ChannelInterfaceSubjectInterface_HEADER_GUARD_ +#define _TelepathyQt_ChannelInterfaceSubjectInterface_HEADER_GUARD_ + +#ifndef IN_TP_QT_HEADER +#define IN_TP_QT_HEADER +#endif + +#include <TelepathyQt/channel.h> + +#undef IN_TP_QT_HEADER + +#endif +// vim:set ft=cpp: diff --git a/TelepathyQt/channel.xml b/TelepathyQt/channel.xml index 1c568c5..7f2ef4d 100644 --- a/TelepathyQt/channel.xml +++ b/TelepathyQt/channel.xml @@ -32,10 +32,13 @@ <xi:include href="../spec/Channel_Interface_Media_Signalling.xml"/> <xi:include href="../spec/Channel_Interface_Messages.xml"/> <xi:include href="../spec/Channel_Interface_Password.xml"/> +<xi:include href="../spec/Channel_Interface_Room.xml"/> +<xi:include href="../spec/Channel_Interface_Room_Config.xml"/> <xi:include href="../spec/Channel_Interface_SASL_Authentication.xml"/> <xi:include href="../spec/Channel_Interface_Securable.xml"/> <xi:include href="../spec/Channel_Interface_Service_Point.xml"/> <xi:include href="../spec/Channel_Interface_SMS.xml"/> +<xi:include href="../spec/Channel_Interface_Subject.xml"/> <xi:include href="../spec/Channel_Interface_Tube.xml"/> </tp:spec> diff --git a/TelepathyQt/svc-channel.xml b/TelepathyQt/svc-channel.xml index d4e8e6e..2df9cb0 100644 --- a/TelepathyQt/svc-channel.xml +++ b/TelepathyQt/svc-channel.xml @@ -30,9 +30,12 @@ <xi:include href="../spec/Channel_Interface_Media_Signalling.xml"/> <xi:include href="../spec/Channel_Interface_Messages.xml"/> <xi:include href="../spec/Channel_Interface_Password.xml"/> +<xi:include href="../spec/Channel_Interface_Room.xml"/> +<xi:include href="../spec/Channel_Interface_Room_Config.xml"/> <xi:include href="../spec/Channel_Interface_SASL_Authentication.xml"/> <xi:include href="../spec/Channel_Interface_Securable.xml"/> <xi:include href="../spec/Channel_Interface_Service_Point.xml"/> <xi:include href="../spec/Channel_Interface_SMS.xml"/> +<xi:include href="../spec/Channel_Interface_Subject.xml"/> </tp:spec> -- 1.9.1 ++++++ 0035-Fix-ChannelDispatcher.Messages-test.patch ++++++

From 9d349d4d0a56bbd5fe0799193448a53c6247d14a Mon Sep 17 00:00:00 2001 From: David Edmundson <kde@davidedmundson.co.uk> Date: Sun, 19 Jan 2014 23:12:52 +0100 Subject: [PATCH 35/40] Fix ChannelDispatcher.Messages test

--- tests/dbus/contact-messenger.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/dbus/contact-messenger.cpp b/tests/dbus/contact-messenger.cpp index 4932000..93ba023 100644 --- a/tests/dbus/contact-messenger.cpp +++ b/tests/dbus/contact-messenger.cpp @@ -44,9 +44,9 @@ class TestContactMessenger; class CDMessagesAdaptor : public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages.DRAFT") + Q_CLASSINFO("D-Bus Interface", "org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages1") Q_CLASSINFO("D-Bus Introspection", "" -" <interface name=\"org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages.DRAFT\" >\n" +" <interface name=\"org.freedesktop.Telepathy.ChannelDispatcher.Interface.Messages1\" >\n" " <method name=\"SendMessage\" >\n" " <arg name=\"Account\" type=\"o\" direction=\"in\" />\n" " <arg name=\"TargetID\" type=\"s\" direction=\"in\" />\n" -- 1.9.1 ++++++ 0036-Fix-moc-command-for-Qt5.2.patch ++++++

From 938509e23a3a02609d96dd82abdcb5a51d104b57 Mon Sep 17 00:00:00 2001 From: Dario Freddi <dario.freddi@ispirata.com> Date: Sun, 2 Feb 2014 15:40:38 +0100 Subject: [PATCH 36/40] Fix moc command for Qt5.2

The check was already there, but since Qt5 CMake files are being shipped with Qt5 itself, the check was meaningless as the only thing which matters is Qt's version, and not CMake's one. Reviewed-by: David Edmundson <davidedmundson@kde.org> --- cmake/modules/FindQt.cmake | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake index b3131f0..8cf0f25 100644 --- a/cmake/modules/FindQt.cmake +++ b/cmake/modules/FindQt.cmake @@ -81,11 +81,11 @@ MACRO(QT_CREATE_MOC_COMMAND infile outfile moc_flags moc_options) ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) ELSE(QT_VERSION_MAJOR MATCHES 4) IF(QT_VERSION_MAJOR MATCHES 5) - IF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + IF(QTVERSION VERSION_GREATER 5.1.99) QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}" "") - ELSE(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + ELSE() QT5_CREATE_MOC_COMMAND(${infile} ${outfile} "${moc_flags}" "${moc_options}") - ENDIF(CMAKE_VERSION VERSION_GREATER 2.8.11.20130607) + ENDIF() ENDIF(QT_VERSION_MAJOR MATCHES 5) ENDIF(QT_VERSION_MAJOR MATCHES 4) ENDMACRO(QT_CREATE_MOC_COMMAND) -- 1.9.1 ++++++ 0037-Simplify-FindQt5.cmake.patch ++++++

From dca59397c00d27f3de0da4269fe53d4dda5520cb Mon Sep 17 00:00:00 2001 From: Uwe Korn <uwelk@xhochy.com> Date: Fri, 14 Mar 2014 16:55:26 +0100 Subject: [PATCH 37/40] Simplify FindQt5.cmake

Make further use of Qt 5's cmake integration Reviewed-by: David Edmundson --- cmake/modules/FindQt5.cmake | 53 ++++++++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 22 deletions(-) diff --git a/cmake/modules/FindQt5.cmake b/cmake/modules/FindQt5.cmake index 922ebc1..957f7b3 100644 --- a/cmake/modules/FindQt5.cmake +++ b/cmake/modules/FindQt5.cmake @@ -44,25 +44,31 @@ IF(QT_INCLUDES AND QT_LIBRARIES AND QT_MAJOR_VERSION MATCHES 5) RETURN() ENDIF(QT_INCLUDES AND QT_LIBRARIES AND QT_MAJOR_VERSION MATCHES 5) -IF(NOT QT_QMAKE_EXECUTABLE) - FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake5 qmake-qt5 - PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") - SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") -ENDIF(NOT QT_QMAKE_EXECUTABLE) - -EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) -IF(NOT QTVERSION MATCHES "5.*") - SET(QT_FOUND FALSE) - SET(QT5_FOUND FALSE) - IF(Qt5_FIND_REQUIRED) - MESSAGE(FATAL_ERROR "CMake was unable to find Qt5, put qmake in your path or set QTDIR/QT_QMAKE_EXECUTABLE.") - ENDIF(Qt5_FIND_REQUIRED) - RETURN() -ENDIF(NOT QTVERSION MATCHES "5.*") - -FIND_PACKAGE(PkgConfig REQUIRED) - -FIND_PACKAGE(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Core DBus Gui Network Test Widgets Xml) +IF(NOT Qt5Core_DIR ) + IF(NOT QT_QMAKE_EXECUTABLE) + FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake5 qmake-qt5 + PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") + SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") + ENDIF(NOT QT_QMAKE_EXECUTABLE) + + EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) + IF(NOT QTVERSION MATCHES "5.*") + SET(QT_FOUND FALSE) + SET(QT5_FOUND FALSE) + IF(Qt5_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "CMake was unable to find Qt5, put qmake in your path or set QTDIR/QT_QMAKE_EXECUTABLE.") + ENDIF(Qt5_FIND_REQUIRED) + RETURN() + ENDIF(NOT QTVERSION MATCHES "5.*") +ENDIF(NOT Qt5Core_DIR ) + +find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5DBus ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Gui ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Network ${REQUIRED_QT_VERSION} REQUIRED) +find_package(Qt5Xml ${REQUIRED_QT_VERSION} REQUIRED) # Copy includes and library names into the same style as pkgconfig used for Qt4 set(QT_INCLUDES ${Qt5Core_INCLUDE_DIRS} ${Qt5DBus_INCLUDE_DIRS} ${Qt5Gui_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Test_INCLUDE_DIRS} ${Qt5Widgets_INCLUDE_DIRS}) @@ -77,9 +83,12 @@ set(QT_QTXML_LIBRARY ${Qt5Xml_LIBRARIES}) set(QT_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTWIDGETS_LIBRARY} ${QT_QTXML_LIBRARY}) -STRING(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+.*" "\\1" QT_VERSION_MAJOR "${QTVERSION}") -STRING(REGEX REPLACE "^[0-9]+\\.([0-9])+\\.[0-9]+.*" "\\1" QT_VERSION_MINOR "${QTVERSION}") -STRING(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+).*" "\\1" QT_VERSION_PATCH "${QTVERSION}") +SET(QT_VERSION_MAJOR ${Qt5Core_VERSION_MAJOR}) +SET(QT_VERSION_MINOR ${Qt5Core_VERSION_MINOR}) +SET(QT_VERSION_PATCH ${Qt5Core_VERSION_PATCH}) +SET(QT_VERSION ${Qt5Core_VERSION}) + +GET_PROPERTY(QT_QMAKE_EXECUTABLE TARGET ${Qt5Core_QMAKE_EXECUTABLE} PROPERTY IMPORTED_LOCATION) IF(NOT QT_INCLUDE_DIR) EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_INSTALL_HEADERS" OUTPUT_VARIABLE QTHEADERS) -- 1.9.1 ++++++ 0038-Allow-compilation-when-only-qmake-qt4-is-in-the-path.patch ++++++

From 7feb7ee8d2eb1986b5a1314bb064b39a79718c68 Mon Sep 17 00:00:00 2001 From: Uwe Korn <uwelk@xhochy.com> Date: Fri, 14 Mar 2014 16:56:36 +0100 Subject: [PATCH 38/40] Allow compilation when only qmake-qt4 is in the path

If Qt5 is found via cmake we do not need to find the qmake executable. This fixes builds when only qmake4 is available in the path. Reviewed-by: David Edmundson --- cmake/modules/FindQt.cmake | 41 ++++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 15 deletions(-) diff --git a/cmake/modules/FindQt.cmake b/cmake/modules/FindQt.cmake index 8cf0f25..5cb2836 100644 --- a/cmake/modules/FindQt.cmake +++ b/cmake/modules/FindQt.cmake @@ -7,22 +7,33 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -IF(NOT QT_QMAKE_EXECUTABLE) - FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5 - PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") - SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") -ENDIF(NOT QT_QMAKE_EXECUTABLE) +IF(DESIRED_QT_VERSION MATCHES 5) + # Qt5 was explicitly requested, so use its CMakeConfig instead of qmake which may not be at a global location + find_package(Qt5Core QUIET) + IF( Qt5Core_DIR ) + SET(QT5_INSTALLED TRUE) + ENDIF( Qt5Core_DIR ) +ENDIF(DESIRED_QT_VERSION MATCHES 5) + +#Otherwise search for installed qmakes +IF(NOT QT5_INSTALLED) + IF(NOT QT_QMAKE_EXECUTABLE) + FIND_PROGRAM(QT_QMAKE_EXECUTABLE_FINDQT NAMES qmake qmake4 qmake-qt4 qmake5 qmake-qt5 + PATHS "${QT_SEARCH_PATH}/bin" "$ENV{QTDIR}/bin") + SET(QT_QMAKE_EXECUTABLE ${QT_QMAKE_EXECUTABLE_FINDQT} CACHE PATH "Qt qmake program.") + ENDIF(NOT QT_QMAKE_EXECUTABLE) -# now find qmake -IF(QT_QMAKE_EXECUTABLE) - EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) - IF(QTVERSION MATCHES "4.*") - SET(QT4_INSTALLED TRUE) - ENDIF(QTVERSION MATCHES "4.*") - IF(QTVERSION MATCHES "5.*") - SET(QT5_INSTALLED TRUE) - ENDIF(QTVERSION MATCHES "5.*") -ENDIF(QT_QMAKE_EXECUTABLE) + # now find qmake + IF(QT_QMAKE_EXECUTABLE) + EXEC_PROGRAM(${QT_QMAKE_EXECUTABLE} ARGS "-query QT_VERSION" OUTPUT_VARIABLE QTVERSION) + IF(QTVERSION MATCHES "4.*") + SET(QT4_INSTALLED TRUE) + ENDIF(QTVERSION MATCHES "4.*") + IF(QTVERSION MATCHES "5.*") + SET(QT5_INSTALLED TRUE) + ENDIF(QTVERSION MATCHES "5.*") + ENDIF(QT_QMAKE_EXECUTABLE) +ENDIF(NOT QT5_INSTALLED) IF(NOT DESIRED_QT_VERSION) IF(QT4_INSTALLED) -- 1.9.1 ++++++ 0039-Add-Q_UNUSED-as-Q_ASSERT-is-a-no-op-in-release-mode.patch ++++++

From ff169cde751d0bb0309109514dd10b9eff7de4e3 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" <uwelk@xhochy.com> Date: Fri, 28 Mar 2014 10:28:16 +0000 Subject: [PATCH 39/40] Add Q_UNUSED as Q_ASSERT is a no-op in release mode

Reviewed-by: David Edmundson --- TelepathyQt/connection-manager.cpp | 1 + examples/file-transfer/file-sender.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/TelepathyQt/connection-manager.cpp b/TelepathyQt/connection-manager.cpp index 96b3234..e6e32e0 100644 --- a/TelepathyQt/connection-manager.cpp +++ b/TelepathyQt/connection-manager.cpp @@ -1084,6 +1084,7 @@ void ConnectionManager::gotParametersLegacy(QDBusPendingCallWatcher *watcher) ++pos; } Q_ASSERT(found); + Q_UNUSED(found); if (!reply.isError()) { debug() << QString(QLatin1String("Got reply to ConnectionManager.GetParameters(%1)")).arg(protocolName); diff --git a/examples/file-transfer/file-sender.cpp b/examples/file-transfer/file-sender.cpp index a747af1..50d50c2 100644 --- a/examples/file-transfer/file-sender.cpp +++ b/examples/file-transfer/file-sender.cpp @@ -91,6 +91,7 @@ void FileSender::onAMReady(PendingOperation *op) PendingReady *pr = qobject_cast<PendingReady*>(op); Q_ASSERT(pr != NULL); + Q_UNUSED(pr); qDebug() << "AccountManager ready"; mAccount = mAM->accountForObjectPath( @@ -116,6 +117,7 @@ void FileSender::onAccountReady(PendingOperation *op) PendingReady *pr = qobject_cast<PendingReady*>(op); Q_ASSERT(pr != NULL); + Q_UNUSED(pr); qDebug() << "Account ready"; qDebug() << "Checking if account is online..."; -- 1.9.1 ++++++ 0040-Add-5-to-pkg-config-package-names-for-Qt5.patch ++++++

From 0191a6ddf0c094d9ae61b9ee48f1b282e13a9ef2 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" <uwelk@xhochy.com> Date: Wed, 26 Feb 2014 18:40:43 +0000 Subject: [PATCH 40/40] Add 5 to pkg-config package names for Qt5

--- CMakeLists.txt | 5 +++++ TelepathyQt/TelepathyQt-uninstalled.pc.in | 2 +- TelepathyQt/TelepathyQt.pc.in | 2 +- TelepathyQt/TelepathyQtService.pc.in | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e72f559..d5e1b71 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,6 +83,11 @@ set(QT5_MIN_VERSION "5.0.0") set(QT5_MAX_VERSION "6.0.0") find_package(Qt REQUIRED) +IF(QT_VERSION_MAJOR MATCHES 5) + # It is QtCore for Qt4 but Qt5Core for Qt5 in pkg-config + SET(QT_VERSION_PC 5) +ENDIF(QT_VERSION_MAJOR MATCHES 5) + foreach(flag ${QT_CONFIG_FLAGS}) if (${flag} MATCHES "reduce_relocations") set(TP_QT_EXECUTABLE_LINKER_FLAGS "-fPIE") diff --git a/TelepathyQt/TelepathyQt-uninstalled.pc.in b/TelepathyQt/TelepathyQt-uninstalled.pc.in index e8bf5ce..a61c2d3 100644 --- a/TelepathyQt/TelepathyQt-uninstalled.pc.in +++ b/TelepathyQt/TelepathyQt-uninstalled.pc.in @@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR} Name: TelepathyQt${QT_VERSION_MAJOR} (uninstalled copy) Description: Qt utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, QtNetwork >= ${QT_MIN_VERSION}, QtNetwork < ${QT_MAX_VERSION}, QtXml >= ${QT_MIN_VERSION}, QtXml < ${QT_MAX_VERSION} +Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Network >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Network < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Xml >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Xml < ${QT_MAX_VERSION} Libs: ${CMAKE_BINARY_DIR}/TelepathyQt/libtelepathy-qt${QT_VERSION_MAJOR}.so Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt/TelepathyQt.pc.in b/TelepathyQt/TelepathyQt.pc.in index 92ba026..d245fed 100644 --- a/TelepathyQt/TelepathyQt.pc.in +++ b/TelepathyQt/TelepathyQt.pc.in @@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} Name: TelepathyQt${QT_VERSION_MAJOR} Description: Qt utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, QtNetwork >= ${QT_MIN_VERSION}, QtNetwork < ${QT_MAX_VERSION}, QtXml >= ${QT_MIN_VERSION}, QtXml < ${QT_MAX_VERSION} +Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Network >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Network < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}Xml >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Xml < ${QT_MAX_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR} Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} diff --git a/TelepathyQt/TelepathyQtService.pc.in b/TelepathyQt/TelepathyQtService.pc.in index 69ba8c5..c579665 100644 --- a/TelepathyQt/TelepathyQtService.pc.in +++ b/TelepathyQt/TelepathyQtService.pc.in @@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} Name: TelepathyQt${QT_VERSION_MAJOR}Service Description: Qt Telepathy Service side bindings Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} +Requires.private: Qt${QT_VERSION_PC}Core >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}Core < ${QT_MAX_VERSION}, Qt${QT_VERSION_PC}DBus >= ${QT_MIN_VERSION}, Qt${QT_VERSION_PC}DBus < ${QT_MAX_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-service Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} -- 1.9.1 ++++++ search-for-farstream0.2.diff ++++++ diff --git a/cmake/modules/FindFarstream.cmake b/cmake/modules/FindFarstream.cmake index de42c29..abc311b 100644 --- a/cmake/modules/FindFarstream.cmake +++ b/cmake/modules/FindFarstream.cmake @@ -25,7 +25,7 @@ if (NOT WIN32) if (FARSTREAM_MIN_VERSION) PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1>=${FARSTREAM_MIN_VERSION}) else (FARSTREAM_MIN_VERSION) - PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.1) + PKG_CHECK_MODULES(PC_FARSTREAM farstream-0.2) endif (FARSTREAM_MIN_VERSION) set(FARSTREAM_DEFINITIONS ${PC_FARSTREAM_CFLAGS_OTHER}) endif (NOT WIN32) @@ -34,10 +34,10 @@ find_path(FARSTREAM_INCLUDE_DIR farstream/fs-conference.h PATHS ${PC_FARSTREAM_INCLUDEDIR} ${PC_FARSTREAM_INCLUDE_DIRS} - PATH_SUFFIXES farstream-0.1 + PATH_SUFFIXES farstream-0.2 ) -find_library(FARSTREAM_LIBRARIES NAMES farstream-0.1 +find_library(FARSTREAM_LIBRARIES NAMES farstream-0.2 PATHS ${PC_FARSTREAM_LIBDIR} ${PC_FARSTREAM_LIBRARY_DIRS} ++++++ search-for-gstreamer1.0.diff ++++++ diff -urNB telepathy-qt4-0.9.3.orig/cmake/modules/FindGStreamer.cmake telepathy-qt4-0.9.3/cmake/modules/FindGStreamer.cmake --- telepathy-qt4-0.9.3.orig/cmake/modules/FindGStreamer.cmake 2012-07-13 19:40:23.000000000 +0200 +++ telepathy-qt4-0.9.3/cmake/modules/FindGStreamer.cmake 2013-07-20 21:09:05.023740233 +0200 @@ -5,76 +5,58 @@ # GSTREAMER_INCLUDE_DIR - the GStreamer include directory # GSTREAMER_LIBRARIES - the libraries needed to use GStreamer # GSTREAMER_DEFINITIONS - Compiler switches required for using GStreamer +# GSTREAMER_VERSION - the version of GStreamer -# Copyright (c) 2006, Tim Beaulen <tbscope@gmail.com> -# -# Redistribution and use is allowed according to the terms of the BSD license. -# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# Copyright (c) 2008 Helio Chissini de Castro, <helio@kde.org> +# (c)2006, Tim Beaulen <tbscope@gmail.com> -# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_0_10_FOUND etc) +# TODO: Other versions --> GSTREAMER_X_Y_FOUND (Example: GSTREAMER_0_8_FOUND and GSTREAMER_1.0_FOUND etc) -IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + +IF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) # in cache already - SET(GSTREAMER_FIND_QUIETLY TRUE) -ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) - SET(GSTREAMER_FIND_QUIETLY FALSE) -ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY AND GSTREAMER_INTERFACE_LIBRARY) + SET(GStreamer_FIND_QUIETLY TRUE) +ELSE (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) + SET(GStreamer_FIND_QUIETLY FALSE) +ENDIF (GSTREAMER_INCLUDE_DIR AND GSTREAMER_LIBRARIES AND GSTREAMER_BASE_LIBRARY) IF (NOT WIN32) + FIND_PACKAGE(PkgConfig REQUIRED) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls - FIND_PACKAGE(PkgConfig) - PKG_CHECK_MODULES(PC_GSTREAMER gstreamer-0.10) - #MESSAGE(STATUS "DEBUG: GStreamer include directory = ${GSTREAMER_INCLUDE_DIRS}") - #MESSAGE(STATUS "DEBUG: GStreamer link directory = ${GSTREAMER_LIBRARY_DIRS}") - #MESSAGE(STATUS "DEBUG: GStreamer CFlags = ${GSTREAMER_CFLAGS_OTHER}") - SET(GSTREAMER_DEFINITIONS ${PC_GSTREAMER_CFLAGS_OTHER}) + # don't make this check required - otherwise you can't use macro_optional_find_package on this one + PKG_CHECK_MODULES(PKG_GSTREAMER gstreamer-1.0) + SET(GSTREAMER_VERSION ${PKG_GSTREAMER_VERSION}) + SET(GSTREAMER_DEFINITIONS ${PKG_GSTREAMER_CFLAGS}) ENDIF (NOT WIN32) FIND_PATH(GSTREAMER_INCLUDE_DIR gst/gst.h PATHS - ${PC_GSTREAMER_INCLUDEDIR} - ${PC_GSTREAMER_INCLUDE_DIRS} - PATH_SUFFIXES gstreamer-0.10 + ${PKG_GSTREAMER_INCLUDE_DIRS} + PATH_SUFFIXES gstreamer-1.0 ) -FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-0.10 +FIND_LIBRARY(GSTREAMER_LIBRARIES NAMES gstreamer-1.0 PATHS - ${PC_GSTREAMER_LIBDIR} - ${PC_GSTREAMER_LIBRARY_DIRS} + ${PKG_GSTREAMER_LIBRARY_DIRS} ) -FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-0.10 +FIND_LIBRARY(GSTREAMER_BASE_LIBRARY NAMES gstbase-1.0 PATHS - ${PC_GSTREAMER_LIBDIR} - ${PC_GSTREAMER_LIBRARY_DIRS} - ) - -FIND_LIBRARY(GSTREAMER_INTERFACE_LIBRARY NAMES gstinterfaces-0.10 - PATHS - ${PC_GSTREAMER_LIBDIR} - ${PC_GSTREAMER_LIBRARY_DIRS} + ${PKG_GSTREAMER_LIBRARY_DIRS} ) IF (GSTREAMER_INCLUDE_DIR) - #MESSAGE(STATUS "DEBUG: Found GStreamer include dir: ${GSTREAMER_INCLUDE_DIR}") ELSE (GSTREAMER_INCLUDE_DIR) MESSAGE(STATUS "GStreamer: WARNING: include dir not found") ENDIF (GSTREAMER_INCLUDE_DIR) IF (GSTREAMER_LIBRARIES) - #MESSAGE(STATUS "DEBUG: Found GStreamer library: ${GSTREAMER_LIBRARIES}") ELSE (GSTREAMER_LIBRARIES) MESSAGE(STATUS "GStreamer: WARNING: library not found") ENDIF (GSTREAMER_LIBRARIES) -IF (GSTREAMER_INTERFACE_LIBRARY) - #MESSAGE(STATUS "DEBUG: Found GStreamer interface library: ${GSTREAMER_INTERFACE_LIBRARY}") -ELSE (GSTREAMER_INTERFACE_LIBRARY) - MESSAGE(STATUS "GStreamer: WARNING: interface library not found") -ENDIF (GSTREAMER_INTERFACE_LIBRARY) - INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(GStreamer DEFAULT_MSG GSTREAMER_LIBRARIES GSTREAMER_INCLUDE_DIR GSTREAMER_BASE_LIBRARY) -MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY GSTREAMER_INTERFACE_LIBRARY) +MARK_AS_ADVANCED(GSTREAMER_INCLUDE_DIR GSTREAMER_LIBRARIES GSTREAMER_BASE_LIBRARY) ++++++ search-for-telepathy-farstream-0.4.diff ++++++ diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in index 1c608ad..2670265 100644 --- a/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in +++ b/TelepathyQt/Farstream/TelepathyQtFarstream-uninstalled.pc.in @@ -6,6 +6,6 @@ abs_top_srcdir=${CMAKE_SOURCE_DIR} Name: TelepathyQt${QT_VERSION_MAJOR}Farstream (uninstalled copy) Description: Qt Telepathy Farstream utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} +Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} Libs: ${CMAKE_BINARY_DIR}/TelepathyQt${QT_VERSION_MAJOR}/Farstream/libtelepathy-qt${QT_VERSION_MAJOR}-farstream.so Cflags: -I${CMAKE_SOURCE_DIR} -I${CMAKE_BINARY_DIR} diff --git a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in index 1a66d6d..a8ac174 100644 --- a/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in +++ b/TelepathyQt/Farstream/TelepathyQtFarstream.pc.in @@ -6,6 +6,6 @@ includedir=${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR} Name: TelepathyQt${QT_VERSION_MAJOR}Farstream Description: Qt Telepathy Farstream utility library for the Telepathy framework Version: ${PACKAGE_VERSION} -Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} +Requires.private: QtCore >= ${QT_MIN_VERSION}, QtCore < ${QT_MAX_VERSION}, QtDBus >= ${QT_MIN_VERSION}, QtDBus < ${QT_MAX_VERSION}, telepathy-glib >= ${TELEPATHY_GLIB_MIN_VERSION}, telepathy-farstream-0.4 >= ${TELEPATHY_FARSTREAM_MIN_VERSION}, TelepathyQt${QT_VERSION_MAJOR} = ${PACKAGE_VERSION} Libs: -L${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR} -ltelepathy-qt${QT_VERSION_MAJOR}-farstream Cflags: -I${CMAKE_INSTALL_PREFIX}/${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR} diff --git a/cmake/modules/FindTelepathyFarstream.cmake b/cmake/modules/FindTelepathyFarstream.cmake index 74b12d8..215ed28 100644 --- a/cmake/modules/FindTelepathyFarstream.cmake +++ b/cmake/modules/FindTelepathyFarstream.cmake @@ -23,9 +23,9 @@ if (NOT WIN32) # in the find_path() and find_library() calls find_package(PkgConfig) if (TELEPATHY_FARSTREAM_MIN_VERSION) - PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream>=${TELEPATHY_FARSTREAM_MIN_VERSION}) + PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream-0.4>=${TELEPATHY_FARSTREAM_MIN_VERSION} telepathy-farstream>=${TELEPATHY_FARSTREAM_MIN_VERSION}) else (TELEPATHY_FARSTREAM_MIN_VERSION) - PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream) + PKG_CHECK_MODULES(PC_TELEPATHY_FARSTREAM telepathy-farstream-0.4 telepathy-farstream) endif (TELEPATHY_FARSTREAM_MIN_VERSION) set(TELEPATHY_FARSTREAM_DEFINITIONS ${PC_TELEPATHY_FARSTREAM_CFLAGS_OTHER}) endif (NOT WIN32) @@ -34,10 +34,10 @@ find_path(TELEPATHY_FARSTREAM_INCLUDE_DIR telepathy-farstream/telepathy-farstrea PATHS ${PC_TELEPATHY_FARSTREAM_INCLUDEDIR} ${PC_TELEPATHY_FARSTREAM_INCLUDE_DIRS} - PATH_SUFFIXES telepathy-1.0 + PATH_SUFFIXES telepathy-1.0-compat telepathy-1.0 ) -find_library(TELEPATHY_FARSTREAM_LIBRARIES NAMES telepathy-farstream +find_library(TELEPATHY_FARSTREAM_LIBRARIES NAMES telepathy-farstream-0.4 telepathy-farstream PATHS ${PC_TELEPATHY_FARSTREAM_LIBDIR} ${PC_TELEPATHY_FARSTREAM_LIBRARY_DIRS} -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org