Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/x2goclient/, net-misc/x2goclient/files/
Date: Thu, 05 Jul 2018 08:05:21
Message-Id: 1530777893.ad2967e3adec92ae3078a6073b2d1eb8ceda03e7.polynomial-c@gentoo
1 commit: ad2967e3adec92ae3078a6073b2d1eb8ceda03e7
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 5 08:04:53 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 5 08:04:53 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2967e3
7
8 net-misc/x2goclient: Fixed compilation with qt-5.11
9
10 Package-Manager: Portage-2.3.41, Repoman-2.3.9
11
12 .../x2goclient/files/x2goclient-4.1.2.1-qt511.patch | 20 ++++++++++++++++++++
13 net-misc/x2goclient/x2goclient-4.1.2.1.ebuild | 6 +++++-
14 2 files changed, 25 insertions(+), 1 deletion(-)
15
16 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
17 new file mode 100644
18 index 00000000000..2329813defd
19 --- /dev/null
20 +++ b/net-misc/x2goclient/files/x2goclient-4.1.2.1-qt511.patch
21 @@ -0,0 +1,20 @@
22 +From: Mihai Moldovan <ionic@×××××.de>
23 +Date: Thu, 5 Jul 2018 06:52:18 +0000 (+0200)
24 +Subject: src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
25 +X-Git-Url: https://code.x2go.org/gitweb?p=x2goclient.git;a=commitdiff_plain;h=ce14cfda34175b6456a8cc7d1e336dce2b0b0682
26 +
27 +src/printwidget.cpp: add QButtonGroup include, fixes compile errors with Qt 5.11+.
28 +---
29 +
30 +diff --git a/src/printwidget.cpp b/src/printwidget.cpp
31 +index 58a8af7..131d340 100644
32 +--- a/src/printwidget.cpp
33 ++++ b/src/printwidget.cpp
34 +@@ -23,6 +23,7 @@
35 + #include "x2gosettings.h"
36 + #include "x2gologdebug.h"
37 + #include <QDir>
38 ++#include <QButtonGroup>
39 + #ifdef Q_OS_WIN
40 + #include "wapi.h"
41 + #endif
42
43 diff --git a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
44 index ae8b67cda78..3b19d911564 100644
45 --- a/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
46 +++ b/net-misc/x2goclient/x2goclient-4.1.2.1.ebuild
47 @@ -3,7 +3,7 @@
48
49 EAPI=6
50
51 -inherit eutils gnome2-utils qmake-utils
52 +inherit desktop gnome2-utils qmake-utils
53
54 DESCRIPTION="The X2Go Qt client"
55 HOMEPAGE="http://www.x2go.org"
56 @@ -32,6 +32,10 @@ RDEPEND="${COMMON_DEPEND}
57 CLIENT_BUILD="${WORKDIR}"/${P}.client_build
58 PLUGIN_BUILD="${WORKDIR}"/${P}.plugin_build
59
60 +PATCHES=(
61 + "${FILESDIR}/${P}-qt511.patch"
62 +)
63 +
64 src_prepare() {
65 default