dev-util/kdevelop: Fix build with Qt 5.11
authorAndreas Sturmlechner <asturm@gentoo.org>
Tue, 20 Mar 2018 13:27:33 +0000 (14:27 +0100)
committerAndreas Sturmlechner <asturm@gentoo.org>
Tue, 20 Mar 2018 13:27:54 +0000 (14:27 +0100)
Package-Manager: Portage-2.3.24, Repoman-2.3.6

dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch [new file with mode: 0644]
dev-util/kdevelop/kdevelop-5.2.1.ebuild

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 (file)
index 0000000..72b0f8b
--- /dev/null
@@ -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
+
index d0dab918f8754dd413f3fbba71ce36a7d4a30464..832fd76122cd3a0c59d57536f0ee157deac7356f 100644 (file)
@@ -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