summaryrefslogtreecommitdiff
path: root/net-misc/x2goclient
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-07-07 11:42:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2018-07-07 11:42:03 +0100
commitf70601e0934acd62f6c5d06c5ede4cc607179514 (patch)
tree0b337390375de04b950fc4b45edc0f895a4701a4 /net-misc/x2goclient
parentb2be182d49eea46686b5cf2680d457df61e89dc4 (diff)
gentoo resync : 07.07.2018
Diffstat (limited to 'net-misc/x2goclient')
-rw-r--r--net-misc/x2goclient/Manifest3
-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
3 files changed, 27 insertions, 2 deletions
diff --git a/net-misc/x2goclient/Manifest b/net-misc/x2goclient/Manifest
index 64baf802813f..fce0b5073778 100644
--- a/net-misc/x2goclient/Manifest
+++ b/net-misc/x2goclient/Manifest
@@ -1,3 +1,4 @@
+AUX x2goclient-4.1.2.1-qt511.patch 678 BLAKE2B d4c6de81d060d415030c7b160eaca2d72fc4c0fbcb4dc4428471069fbf6c6c1b8b918b382efd5b852cbd0accd4a2cd7c76b7b3a957a271bb46fd7b770fca74c6 SHA512 4c2571dfe286dc5e632a278c683df8ed3d5bb7107f9342ba843ac42b36d73df24a140927b0d147484c4e69668a85ccc309dd6a32627a9e0ba82493e0a9529a55
DIST x2goclient-4.1.0.1.tar.gz 1891484 BLAKE2B af9ccff0ae313c42a13089e0e1b154d8204cc626b2cb5dfbd1f0016bd7099592d2f29ff8d540a2e1d64552359e90ed024c9790bce551e38e5826bfff5b2ee408 SHA512 6cbfb70fb7f522f0a5557ab36b6e15b6cae9ad184bd1d51b6c2f2acfa7b22d8fd9344bbfee141f2d5bd71f5adf9d3bd6d2c7db7b774cd8f8af5bcd25144de98d
DIST x2goclient-4.1.1.0.tar.gz 2745227 BLAKE2B 3cd33a828a890189fa92790388abf34c95eeb33d0c5019a014b1ba893a739011886462f62b2ce74cf57c8229acf573db778defec7e0097f5c0d6ea1e35361699 SHA512 c9763ab4b1ce4065ee1512dae2fcaf5b23dd515dc64fd8bb11d033aca1a026a4bf0d06a0fab38576e98627490dc459973716689e8c9aa7c47fb6c68124405e30
DIST x2goclient-4.1.1.1.tar.gz 2749650 BLAKE2B 212e4ef9bb13478c79b46fe5ac247db2ac1cde1e24c0293397f54c793fa647318fa8f1d13417cb54218ed6757a26db4d6fe00076ad5c04c4d426ee428200735a SHA512 b18f3b2889e2f43846a1c83fccb1a1219621b442849a8e454e82e3d27a638740ea22dd419d6b1e0544416445d4abe80f8b931d46f77237bce1df11d4394451dc
@@ -5,5 +6,5 @@ DIST x2goclient-4.1.2.1.tar.gz 2735905 BLAKE2B 9ac70e350b0c586f76915edc187a2c6b1
EBUILD x2goclient-4.1.0.1-r1.ebuild 1212 BLAKE2B 817b894fa28a636679d986e1c1cbcc60c1c0c575c1ee3a6a61053c6ec4a396db6af09daa15f5b87729fb8b4da162d92345abe685f8028e78c06ca51f5342636f SHA512 6828dde23894609af104231e8e3f86e473bb9491caafe9016ffa2da2415813f785525169b288a23439d26926528bb8a2b26a1e77bf0fbd46ccc803c09527cef3
EBUILD x2goclient-4.1.1.0.ebuild 1377 BLAKE2B e7f76cefcbb3fbe497dc3d653291dd5d70998f33632a83fe2a98bb724c2a4ea9953b41ca390473b2b494824f4b52f56c0dc06d030fa72d5f67a95e813d7a5c35 SHA512 6665dbc7ddef0a202a0dca44a8cae74dc1117253f0f9129bdee3b8dd80e2ddddfac7182d58dcda89dbcacbd7dd0d30b976c698c15c5a337b37fbceeb26338b04
EBUILD x2goclient-4.1.1.1.ebuild 1378 BLAKE2B e57ee137c064cbca5f3a74a4d6da5c3a62cc12a13837d86a76934cb696f6ceae1320d0bcce78e45a1e937aa960c27b360354f7e9d8221e73570e034252089d64 SHA512 96ac2ad4645b5a220050b7a7b70ff8cf64330be309f5739f2230c6e89ea49cf296b8da6bb2335cd3a07e40cd57141cd44593f69737f17b8c0c30fa0d77c0054c
-EBUILD x2goclient-4.1.2.1.ebuild 1378 BLAKE2B e57ee137c064cbca5f3a74a4d6da5c3a62cc12a13837d86a76934cb696f6ceae1320d0bcce78e45a1e937aa960c27b360354f7e9d8221e73570e034252089d64 SHA512 96ac2ad4645b5a220050b7a7b70ff8cf64330be309f5739f2230c6e89ea49cf296b8da6bb2335cd3a07e40cd57141cd44593f69737f17b8c0c30fa0d77c0054c
+EBUILD x2goclient-4.1.2.1.ebuild 1424 BLAKE2B a5ac8442ca0388cb03572bea1a50566e0af11ec42da596df746ddc9891256fdbb1aad5ece43e154973aef13724d0aa5f05ceea2535c8bf1aae7253f1f4111e07 SHA512 23a87a883c8145ac514be6987e62b7bd65f882db2a9e93da81c5440c44032b9a4afc133d48c77f6463f907c9551409999e7d55dd45fc65e84ecd7c345373ff83
MISC metadata.xml 307 BLAKE2B 23b74b66a93119c741def7e676af997a2442085095191b9511248b54ae1b638ab7965441881e1a45c22698068a19cebd28b898324ee5570c587428f49b964170 SHA512 c1da89b20bbe06d9193927fd9b28c1ae4b3d58fde4ef79ddc2923894b59a9ff2083b16424d6935755c734069a7f0ccd03a177884cb82c64da77aaf1835c63721
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