Hello community, here is the log from the commit of package telepathy-qt5 for openSUSE:Factory checked in at 2015-03-30 19:33:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/telepathy-qt5 (Old) and /work/SRC/openSUSE:Factory/.telepathy-qt5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "telepathy-qt5" Changes: -------- --- /work/SRC/openSUSE:Factory/telepathy-qt5/telepathy-qt5.changes 2014-09-10 17:03:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.telepathy-qt5.new/telepathy-qt5.changes 2015-03-30 19:33:45.000000000 +0200 @@ -1,0 +2,10 @@ +Sun Mar 29 10:55:16 UTC 2015 - hrvoje.sen...@gmail.com + +- Add-missing-QObject-include.patch: fixed build with Qt 5.5 + +------------------------------------------------------------------- +Mon Dec 15 16:29:49 UTC 2014 - hrvoje.sen...@gmail.com + +- Added add-the-telepathy-qt-include.patch + +------------------------------------------------------------------- New: ---- Add-missing-QObject-include.patch add-the-telepathy-qt-include.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-qt5.spec ++++++ --- /var/tmp/diff_new_pack.cyOLlF/_old 2015-03-30 19:33:46.000000000 +0200 +++ /var/tmp/diff_new_pack.cyOLlF/_new 2015-03-30 19:33:46.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package telepathy-qt5 # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -28,6 +28,10 @@ Url: http://telepathy.freedesktop.org/ Source: http://telepathy.freedesktop.org/releases/telepathy-qt/telepathy-qt-%{version}.tar.gz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM add-the-telepathy-qt-include.patch +Patch0: add-the-telepathy-qt-include.patch +# PATCH-FIX-UPSTREAM Add-missing-QObject-include.patch +Patch1: Add-missing-QObject-include.patch BuildRequires: cmake BuildRequires: dbus-1-python BuildRequires: fdupes @@ -81,6 +85,8 @@ %prep %setup -q -n telepathy-qt-%{version} +%patch0 -p1 +%patch1 -p1 %build if [ %{_lib} = lib64 ]; then ++++++ Add-missing-QObject-include.patch ++++++ >From 494a955128a193382a698ee3d71071d8ff8388e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Benoit?= <r3m1.ben...@gmail.com> Date: Fri, 27 Mar 2015 12:57:54 +0100 Subject: Add missing QObject include Needed to build against Qt 5.5 as QStringList doesn't include QObject anymore. diff --git a/TelepathyQt/readiness-helper.h b/TelepathyQt/readiness-helper.h index d570d17..fea4538 100644 --- a/TelepathyQt/readiness-helper.h +++ b/TelepathyQt/readiness-helper.h @@ -33,6 +33,7 @@ #include <QSet> #include <QSharedDataPointer> #include <QStringList> +#include <QObject> class QDBusError; -- cgit v0.10.2 ++++++ add-the-telepathy-qt-include.patch ++++++ >From 31c8f4170f58a21baebce226918e6ed52a46dd0b Mon Sep 17 00:00:00 2001 From: Aleix Pol <aleix...@kde.org> Date: Thu, 30 Oct 2014 17:23:14 +0100 Subject: Add the telepathy-qt include directories to the telepathy-qt target Whoever wants to link against telepathy-qt will need to be able to include it, so do it right away. Reviewed by: David Edmundson diff --git a/TelepathyQt/CMakeLists.txt b/TelepathyQt/CMakeLists.txt index 8e41f86..000c63b 100644 --- a/TelepathyQt/CMakeLists.txt +++ b/TelepathyQt/CMakeLists.txt @@ -773,6 +773,7 @@ target_link_libraries(telepathy-qt${QT_VERSION_MAJOR} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${TP_QT_LIBRARY_LINKER_FLAGS}) +target_include_directories(telepathy-qt${QT_VERSION_MAJOR} PUBLIC "$<INSTALL_INTERFACE:${INCLUDE_INSTALL_DIR}/telepathy-qt${QT_VERSION_MAJOR}/>") # Link - Library used by tests to test some unexported functionality target_link_libraries(telepathy-qt-test-backdoors -- cgit v0.10.2
