summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch20
-rw-r--r--net-misc/x2goclient/x2goclient-4.1.2.1.ebuild6
2 files changed, 25 insertions, 1 deletions
diff --git a/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
new file mode 100644
index 000000000000..2329813defd8
--- /dev/null
+++ b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
@@ -0,0 +1,20 @@
+From: Mihai Moldovan <ionic@ionic.de>
+Date: Thu, 5 Jul 2018 06:52:18 +0000 (+0200)
+Subject: src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
+X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=ce14cfda34175b6456a8cc7d1e336dce2b0b0682
+
+src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
+---
+
+diff --git a/src/printwidget.cpp b/src/printwidget.cpp
+index 58a8af7..131d340 100644
+--- a/src/printwidget.cpp
++++ b/src/printwidget.cpp
+@@ -23,6 +23,7 @@
+ #include "x2gosettings.h"
+ #include "x2gologdebug.h"
+ #include <QDir>
++#include <QButtonGroup>
+ #ifdef Q_OS_WIN
+ #include "wapi.h"
+ #endif
diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
index ae8b67cda78e..3b19d9115649 100644
--- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
+++ b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils gnome2-utils qmake-utils
+inherit desktop gnome2-utils qmake-utils
DESCRIPTION="The X2Go Qt client"
HOMEPAGE="http://www.x2go.org"
@@ -32,6 +32,10 @@ RDEPEND="${COMMON_DEPEND}
CLIENT_BUILD="${WORKDIR}"/${P}.client_build
PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
+PATCHES=(
+ "${FILESDIR}/${P}-qt511.patch"
+)
+
src_prepare() {
default