summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-03-17 22:45:14 +0100
committerAndreas Sturmlechner <asturm@gentoo.org>2018-03-18 00:10:36 +0100
commitfad8e40540caee7cd8890220735cf85ca13d2f14 (patch)
tree5e630cc24fb9682ebf62a9de12d2d8b2174e56ee /app-mobilephone
parentapp-mobilephone/qtadb: Switch to Qt5 (diff)
downloadgentoo-fad8e40540caee7cd8890220735cf85ca13d2f14.tar.gz
gentoo-fad8e40540caee7cd8890220735cf85ca13d2f14.tar.bz2
gentoo-fad8e40540caee7cd8890220735cf85ca13d2f14.zip
app-mobilephone/qtadb: Fix build with Qt 5.11
Bug: https://bugs.gentoo.org/645428 Package-Manager: Portage-2.3.24, Repoman-2.3.6
Diffstat (limited to 'app-mobilephone')
-rw-r--r--app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch14
-rw-r--r--app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild5
2 files changed, 18 insertions, 1 deletions
diff --git a/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch
new file mode 100644
index 00000000000..49cd4938481
--- /dev/null
+++ b/app-mobilephone/qtadb/files/qtadb-0.8.1-qt5-5.11.patch
@@ -0,0 +1,14 @@
+--- a/widgets/filewidget.cpp 2014-11-22 12:44:42.000000000 +0100
++++ b/widgets/filewidget.cpp 2018-03-17 22:52:25.103930971 +0100
+@@ -21,9 +21,10 @@
+ #include "filewidget.h"
+ #include "ui_filewidget.h"
+
+-#include <QStandardPaths>
++#include <QHeaderView>
+ #include <QMenu>
+ #include <QScrollBar>
++#include <QStandardPaths>
+
+ quint32 qbytearrayToInt32(QByteArray array)
+ {
diff --git a/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild b/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild
index 9aeb80eef39..1c1f0633793 100644
--- a/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild
+++ b/app-mobilephone/qtadb/qtadb-0.8.1-r1.ebuild
@@ -26,7 +26,10 @@ DEPEND="${RDEPEND}
app-arch/unzip
"
-PATCHES=( "${FILESDIR}"/${P}-qt5.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-qt5.patch
+ "${FILESDIR}"/${P}-qt5-5.11.patch
+)
S="${WORKDIR}/michalmotyczko-${PN}-${COMMIT}"