net-misc/x2goclient: Fixed compilation with qt-5.11
authorLars Wendler <polynomial-c@gentoo.org>
Thu, 5 Jul 2018 08:04:53 +0000 (10:04 +0200)
committerLars Wendler <polynomial-c@gentoo.org>
Thu, 5 Jul 2018 08:04:53 +0000 (10:04 +0200)
Package-Manager: Portage-2.3.41, Repoman-2.3.9

net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch [new file with mode: 0644]
net-misc/x2goclient/x2goclient-4.1.2.1.ebuild

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 (file)
index 0000000..2329813
--- /dev/null
@@ -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
index ae8b67cda78e895c8a9ffbc7ffb442f0a4597bae..3b19d9115649fecc622de324305f94c8e0bfc720 100644 (file)
@@ -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