Hello community,
here is the log from the commit of package ktp-common-internals for
openSUSE:Factory checked in at 2019-11-15 22:37:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ktp-common-internals (Old)
and /work/SRC/openSUSE:Factory/.ktp-common-internals.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ktp-common-internals"
Fri Nov 15 22:37:34 2019 rev:9 rq:748769 version:19.08.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/ktp-common-internals/ktp-common-internals.changes
2019-11-12 11:39:16.398337980 +0100
+++
/work/SRC/openSUSE:Factory/.ktp-common-internals.new.26869/ktp-common-internals.changes
2019-11-15 22:37:37.912004821 +0100
@@ -1,0 +2,7 @@
+Thu Nov 14 20:35:30 UTC 2019 - Wolfgang Bauer <[email protected]>
+
+- Add Fix-build-with-telepathy-qt-0.9.8.patch to fix build with
+ telepathy-qt 0.9.8
+- Update build requirements
+
+-------------------------------------------------------------------
New:
----
Fix-build-with-telepathy-qt-0.9.8.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ktp-common-internals.spec ++++++
--- /var/tmp/diff_new_pack.PxBsf8/_old 2019-11-15 22:37:38.340006209 +0100
+++ /var/tmp/diff_new_pack.PxBsf8/_new 2019-11-15 22:37:38.344006222 +0100
@@ -32,6 +32,8 @@
Source1:
https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig
Source2: applications.keyring
%endif
+# PATCH-FIX-UPSTREAM
+Patch0: Fix-build-with-telepathy-qt-0.9.8.patch
BuildRequires: doxygen
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
@@ -58,10 +60,12 @@
BuildRequires: telepathy-logger-qt5-devel
BuildRequires: telepathy-mission-control-devel
BuildRequires: telepathy-qt5-devel
+BuildRequires: pkgconfig(Qt5DBus)
BuildRequires: pkgconfig(Qt5Qml) >= 5.2.0
BuildRequires: pkgconfig(Qt5Sql) >= 5.2.0
BuildRequires: pkgconfig(Qt5Test) >= 5.2.0
BuildRequires: pkgconfig(Qt5Widgets) >= 5.2.0
+BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(libotr) >= 4.0.0
Requires: ktp-icons
Requires: telepathy-accounts-signon
@@ -109,6 +113,7 @@
%prep
%setup -q
+%autopatch -p1
%build
%cmake_kf5 -d build
++++++ Fix-build-with-telepathy-qt-0.9.8.patch ++++++
>From f030b527c4d390ead78d2e56a1655444f97b5545 Mon Sep 17 00:00:00 2001
From: Antonio Rojas <[email protected]>
Date: Thu, 14 Nov 2019 20:34:21 +0100
Subject: Fix build with telepathy-qt 0.9.8
Explicitely add the necessary link targets which are no longer exported by
telepathy-qt
Differential Revision: https://phabricator.kde.org/D25269
---
CMakeLists.txt | 4 +++-
KTp/CMakeLists.txt | 2 ++
KTp/OTR/CMakeLists.txt | 1 +
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 187400e..2650321 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,8 +20,10 @@ set (KTP_VERSION
"${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_M
set (KTP_MESSAGE_FILTER_FRAMEWORK_VERSION "5")
find_package (Qt5 REQUIRED CONFIG COMPONENTS
+ DBus
Qml
- Test)
+ Test
+ Xml)
find_package (KF5 5.11 REQUIRED COMPONENTS
CoreAddons
diff --git a/KTp/CMakeLists.txt b/KTp/CMakeLists.txt
index 85d578b..ffbce10 100644
--- a/KTp/CMakeLists.txt
+++ b/KTp/CMakeLists.txt
@@ -91,6 +91,8 @@ set_target_properties(KTpCommonInternals PROPERTIES
target_link_libraries (KTpCommonInternals
PUBLIC
+ Qt5::DBus
+ Qt5::Xml
KF5::Wallet #included from wallet-interface.h
${TELEPATHY_QT5_LIBRARIES}
PRIVATE
diff --git a/KTp/OTR/CMakeLists.txt b/KTp/OTR/CMakeLists.txt
index 12e28de..0743e25 100644
--- a/KTp/OTR/CMakeLists.txt
+++ b/KTp/OTR/CMakeLists.txt
@@ -28,6 +28,7 @@ generate_export_header(KTpOTR)
target_link_libraries (KTpOTR
PUBLIC
+ Qt5::DBus
${TELEPATHY_QT5_LIBRARIES}
PRIVATE
KF5::I18n
--
cgit v1.1
