[arch-commits] Commit in x2goclient/trunk (PKGBUILD x2goclient-qt5.11.patch)

[Andreas Radke]

    Date: Friday, August 24, 2018 @ 11:04:41
  Author: andyrtr
Revision: 332945

upgpkg: x2goclient 4.1.2.1-3

build with qt5, bye qt4

Added:
  x2goclient/trunk/x2goclient-qt5.11.patch
Modified:
  x2goclient/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |   16 ++++++++++------
 x2goclient-qt5.11.patch |   19 +++++++++++++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-08-24 09:25:24 UTC (rev 332944)
+++ PKGBUILD	2018-08-24 11:04:41 UTC (rev 332945)
@@ -5,19 +5,21 @@
 
 pkgname=x2goclient
 pkgver=4.1.2.1
-pkgrel=2
+pkgrel=3
 arch=('x86_64')
 license=('GPL2')
 url="http://www.x2go.org"
 pkgdesc="a graphical client (Qt4) for the X2Go system"
-makedepends=(#'qt5-x11extras' 'qt5-tools' 'qt5-svg' 'phonon-qt5'
-             'man2html' 'xdg-utils' 'xorg-xauth')
-depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme')
+makedepends=('qt5-tools' 'man2html' 'xdg-utils' 'xorg-xauth')
+depends=('qt5-x11extras' 'qt5-svg'
+         'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme')
 # FS#48088
 optdepends=('xorg-xauth: may be required by X2goservers running a different linux distribution giving MIT-COOKIE errors')
-source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
+        x2goclient-qt5.11.patch)
 sha256sums=('1c18981f0a39929624de9472b0e6c3fa2ac7842837dd306db318af54c5fff2af'
-            'SKIP')
+            'SKIP'
+            '2d6c85698ddb556984573037cd78a403e49b346d11828a69963bbd2b3f1354b2')
 validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31'  # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
               '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') #  "X2go Git Administrator <git-admin at x2go.org>"
 
@@ -24,6 +26,8 @@
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i "s:-o root -g root ::" Makefile
+  sed -i -e 's/qt4/qt5/' Makefile
+  patch -Np1 -i ../x2goclient-qt5.11.patch
   sed -e 's/-lssh_threads//' -i x2goclient.pro # Fix build with libssh 0.8
 }
 

Added: x2goclient-qt5.11.patch
===================================================================
--- x2goclient-qt5.11.patch	                        (rev 0)
+++ x2goclient-qt5.11.patch	2018-08-24 11:04:41 UTC (rev 332945)
@@ -0,0 +1,19 @@
+commit ce14cfda34175b6456a8cc7d1e336dce2b0b0682
+Author: Mihai Moldovan <ionic at ionic.de>
+Date:   Thu Jul 5 08:52:18 2018 +0200
+
+    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
+