diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-20 14:27:33 +0100 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-03-20 14:27:54 +0100 |
| commit | 19b98a019d762ab5f099f25499c4fe2d6002c2ca (patch) | |
| tree | d7a1604a293e037e6ab4f1d274d3d2fef434e32f /dev-util | |
| parent | dev-php/jpgraph: Version bump to 4.2.0, fix absolute symlink (diff) | |
| download | gentoo-19b98a019d762ab5f099f25499c4fe2d6002c2ca.tar.gz gentoo-19b98a019d762ab5f099f25499c4fe2d6002c2ca.tar.bz2 gentoo-19b98a019d762ab5f099f25499c4fe2d6002c2ca.zip | |
dev-util/kdevelop: Fix build with Qt 5.11
Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/kdevelop/files/kdevelop-5.2.1-qt-5.11.patch | 52 | ||||
| -rw-r--r-- | dev-util/kdevelop/kdevelop-5.2.1.ebuild | 2 |
2 files changed, 54 insertions, 0 deletions
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 |