[gentoo-commits] repo/gentoo:master commit in: kde-apps/umbrello/, kde-apps/umbrello/files/

[Andreas Sturmlechner]

commit:     d30261e88e695a52e8bafabb6f06cd4faad20536
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 13 13:23:31 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Feb 13 13:31:48 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d30261e8

kde-apps/umbrello: Fix build with KF 5.54

Tested-by: Manuel Mommertz <2kmm <AT> gmx.de>
Closes: https://bugs.gentoo.org/677868
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 .../umbrello/files/umbrello-18.08.3-kf-5.54.patch  | 32 ++++++++++++++++++++++
 kde-apps/umbrello/umbrello-18.08.3.ebuild          |  4 ++-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch b/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch
new file mode 100644
index 00000000000..2cf4e6a72ee
--- /dev/null
+++ b/kde-apps/umbrello/files/umbrello-18.08.3-kf-5.54.patch
@@ -0,0 +1,32 @@
+From 62a9e5e6afdd920779f1211afb0381857659e578 Mon Sep 17 00:00:00 2001
+From: Ralf Habacker <ralf.habacker@×××××××.de>
+Date: Thu, 6 Dec 2018 13:36:34 +0100
+Subject: Fix KDE CI compile error with Qt 5.10 on linux
+
+The error was "specialization of template<class T>
+struct QMetaTypeId in different namespace [-fpermissive]"
+
+The Qt 5.10 related issue is fixed by using another approach
+to exclude KF5 class KAboutData.
+---
+ umbrello/main.cpp | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/umbrello/main.cpp b/umbrello/main.cpp
+index e3315fa..9d2acd8 100644
+--- a/umbrello/main.cpp
++++ b/umbrello/main.cpp
+@@ -19,9 +19,8 @@
+ 
+ // kde includes
+ #if QT_VERSION > 0x050000
+-namespace dummy {
+-#include <kaboutdata.h>
+-}
++// prevent including of <kaboutdata.h>
++#define KABOUTDATA_H
+ #include <k4aboutdata.h>
+ #define KAboutData K4AboutData
+ #include <KCrash>
+-- 
+cgit v1.1

diff --git a/kde-apps/umbrello/umbrello-18.08.3.ebuild b/kde-apps/umbrello/umbrello-18.08.3.ebuild
index c570c012f3e..2afd90e22b9 100644
--- a/kde-apps/umbrello/umbrello-18.08.3.ebuild
+++ b/kde-apps/umbrello/umbrello-18.08.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -48,6 +48,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kde4-l10n-17.07.80
 "
 
+PATCHES=( "${FILESDIR}/${P}-kf-5.54.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DBUILD_KF5=ON