[gentoo-commits] proj/kde:master commit in: kde-apps/ktp-accounts-kcm/files/, kde-apps/ktp-accounts-kcm/

[gentoo-commits] proj/kde:master commit in: kde-apps/ktp-accounts-kcm/files/, kde-apps/ktp-accounts-kcm/

[Andreas Sturmlechner]

commit:     9a17aa7276fe4f647f28fd22cca232eb26f3a327
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 20:13:35 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 21:14:15 2019 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9a17aa72

kde-apps/ktp-accounts-kcm: Fix build with net-libs/telepathy-qt-0.9.8

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...p-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch | 30 ++++++++++++++++++++++
 .../ktp-accounts-kcm-19.11.80.ebuild               | 10 +++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch b/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch
new file mode 100644
index 0000000000..fac56a410c
--- /dev/null
+++ b/kde-apps/ktp-accounts-kcm/files/ktp-accounts-kcm-19.08.3-telepathy-qt-0.9.8.patch
@@ -0,0 +1,30 @@
+From fbe5097f4a79f286607b859be9c68de371955117 Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Mon, 18 Nov 2019 22:13:18 +0100
+Subject: Fix build with telepathy-qt 0.9.8
+
+Use the new TelepathyQt5::Core link target with 0.9.8, otherwise compilation fails with
+/usr/include/telepathy-qt5/TelepathyQt/_gen/types.h:15:10: fatal error: QDBusArgument: No such file or directory
+
+Differential Revision: https://phabricator.kde.org/D25370
+---
+ src/KCMTelepathyAccounts/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/KCMTelepathyAccounts/CMakeLists.txt b/src/KCMTelepathyAccounts/CMakeLists.txt
+index 1fe7c09..18181f9 100644
+--- a/src/KCMTelepathyAccounts/CMakeLists.txt
++++ b/src/KCMTelepathyAccounts/CMakeLists.txt
+@@ -69,6 +69,10 @@ add_library(ktpaccountskcminternal
+             ${libktpaccountskcminternal_SRCS}
+ )
+ 
++if (TARGET TelepathyQt5::Core) # telepathy-qt 0.9.8
++    set (TELEPATHY_QT5_LIBRARIES TelepathyQt5::Core)
++endif()
++
+ target_link_libraries (ktpaccountskcminternal
+                        Qt5::Widgets
+                        Qt5::Core
+-- 
+cgit v1.1

diff --git a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.11.80.ebuild b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.11.80.ebuild
index f9607bc59f..3e3436cf14 100644
--- a/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.11.80.ebuild
+++ b/kde-apps/ktp-accounts-kcm/ktp-accounts-kcm-19.11.80.ebuild
@@ -20,6 +20,10 @@ BDEPEND="
 	dev-util/intltool
 "
 COMMON_DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -30,10 +34,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/ktextwidgets-${KFMIN}:5
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-apps/kaccounts-integration-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	net-libs/accounts-qt
 	net-libs/signond
 	net-libs/telepathy-qt[qt5(+)]
@@ -49,6 +49,8 @@ RDEPEND="${COMMON_DEPEND}
 	net-im/telepathy-connection-managers
 "
 
+PATCHES=( "${FILESDIR}/${P}-telepathy-qt-0.9.8.patch" )
+
 src_prepare() {
 	if use experimental; then
 		mv "${S}"/data/kaccounts/disabled/*.in "${S}"/data/kaccounts/ || \