diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-10 21:45:40 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-04-10 22:09:27 +0200 |
| commit | abdd68c0fd6d25581387d76d14b6228f0582fa73 (patch) | |
| tree | 52ecdb8aef810d37eb2a3451930d2d28a51dca8b /app-editors/juffed | |
| parent | app-misc/pax-utils: remove unused patches (diff) | |
| download | gentoo-abdd68c0fd6d25581387d76d14b6228f0582fa73.tar.gz gentoo-abdd68c0fd6d25581387d76d14b6228f0582fa73.tar.bz2 gentoo-abdd68c0fd6d25581387d76d14b6228f0582fa73.zip | |
app-editors/juffed: Fix build with Qt-5.11
Package-Manager: Portage-2.3.28, Repoman-2.3.9
Diffstat (limited to 'app-editors/juffed')
| -rw-r--r-- | app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch | 28 | ||||
| -rw-r--r-- | app-editors/juffed/juffed-0.10_p20160323-r1.ebuild | 5 |
2 files changed, 32 insertions, 1 deletions
diff --git a/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch new file mode 100644 index 000000000000..4dfa7fae31f7 --- /dev/null +++ b/app-editors/juffed/files/juffed-0.10_p20160323-qt-5.11.patch @@ -0,0 +1,28 @@ +From cb10c88a091c62c29054138a2da69d05cbf1e406 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 10 Apr 2018 19:43:17 +0200 +Subject: [PATCH] Fix build with Qt 5.11 + +--- + plugins/keybindings/KeysPage.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/plugins/keybindings/KeysPage.cpp b/plugins/keybindings/KeysPage.cpp +index 6579e3e..e68b039 100644 +--- a/plugins/keybindings/KeysPage.cpp ++++ b/plugins/keybindings/KeysPage.cpp +@@ -1,9 +1,10 @@ + #include "KeysPage.h" + +-#include <QPushButton> ++#include <QAction> + #include <QHeaderView> + #include <QKeyEvent> + #include <QMessageBox> ++#include <QPushButton> + + #include "KeySettings.h" + #include "Log.h" +-- +2.17.0 + diff --git a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild index e8118beedc92..97e18f2d896c 100644 --- a/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild +++ b/app-editors/juffed/juffed-0.10_p20160323-r1.ebuild @@ -29,7 +29,10 @@ DEPEND="${RDEPEND}" DOCS=( ChangeLog README ) -PATCHES=( "${FILESDIR}/${P}-qscintilla-2.10.patch" ) +PATCHES=( + "${FILESDIR}/${P}-qscintilla-2.10.patch" + "${FILESDIR}/${P}-qt-5.11.patch" +) src_prepare() { # Upstream version outdated/dysfunctional and CRLF terminated |