From: Andreas Sturmlechner <asturm@gentoo.org>
Date: Tue, 20 Mar 2018 13:27:33 +0000 (+0100)
Subject: dev-util/kdevelop: Fix build with Qt 5.11
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=19b98a019d762ab5f099f25499c4fe2d6002c2ca;p=gentoo.git

dev-util/kdevelop: Fix build with Qt 5.11

Package-Manager: Portage-2.3.24, Repoman-2.3.6
---

diff --git a/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch b/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
new file mode 100644
index 000000000000..72b0f8b035cf
--- /dev/null
+++ b/dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch
@@ -0,0 +1,52 @@
+From a5ec6847bad98d1fc45f5b8c1cc289f3fcc84b72 Mon Sep 17 00:00:00 2001
+From: Andras Mantia <andras@kdab.com>
+Date: Mon, 12 Feb 2018 17:52:15 +0200
+Subject: Add includes to build with Qt 5.11
+
+(cherry picked from commit 0e361a5184bda61796162830ecff88b41c1b305b)
+---
+ plugins/debuggercommon/widgets/disassemblewidget.h | 1 +
+ plugins/externalscript/editexternalscript.cpp      | 1 +
+ plugins/git/gitnameemaildialog.cpp                 | 2 ++
+ 3 files changed, 4 insertions(+)
+
+diff --git a/plugins/debuggercommon/widgets/disassemblewidget.h b/plugins/debuggercommon/widgets/disassemblewidget.h
+index e8d32ef..543b69f 100644
+--- a/plugins/debuggercommon/widgets/disassemblewidget.h
++++ b/plugins/debuggercommon/widgets/disassemblewidget.h
+@@ -26,6 +26,7 @@
+ 
+ #include "mi/mi.h"
+ 
++#include <QActionGroup>
+ #include <QTreeWidget>
+ #include <QUrl>
+ 
+diff --git a/plugins/externalscript/editexternalscript.cpp b/plugins/externalscript/editexternalscript.cpp
+index 5ec756b..2c0de28 100644
+--- a/plugins/externalscript/editexternalscript.cpp
++++ b/plugins/externalscript/editexternalscript.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include "externalscriptitem.h"
+ 
++#include <QAction>
+ #include <QDialogButtonBox>
+ #include <QPushButton>
+ 
+diff --git a/plugins/git/gitnameemaildialog.cpp b/plugins/git/gitnameemaildialog.cpp
+index ba24a70..ddba09c 100644
+--- a/plugins/git/gitnameemaildialog.cpp
++++ b/plugins/git/gitnameemaildialog.cpp
+@@ -27,6 +27,8 @@
+ 
+ #include <QDialog>
+ #include <QPushButton>
++#include <QRegularExpression>
++#include <QValidator>
+ 
+ using namespace KDevelop;
+ 
+-- 
+cgit v0.11.2
+
diff --git a/dev-util/kdevelop/kdevelop-5.2.1.ebuild b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
index d0dab918f875..832fd76122cd 100644
--- a/dev-util/kdevelop/kdevelop-5.2.1.ebuild
+++ b/dev-util/kdevelop/kdevelop-5.2.1.ebuild
@@ -96,6 +96,8 @@ RDEPEND="${COMMON_DEPEND}
 	!<kde-apps/kapptemplate-16.04.0
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt.5.11.patch" )
+
 RESTRICT+=" test"
 # see bug 366471