Merge branch 'master' of code.chakralinux.org:packages/desktop

kio-extras/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgname=kio-extras
 pkgver=18.08.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Additional components to increase the functionality of KIO"
 arch=('x86_64')
 url='https://projects.kde.org/projects/kde/workspace/kio-extras'

wireshark/PKGBUILD

@@ -1,6 +1,6 @@
 pkgname=wireshark
 pkgver=2.6.4
-pkgrel=1
+pkgrel=2
 pkgdesc='A free network protocol analyzer for Unix/Linux and Windows'
 arch=('x86_64')
 license=('GPL2')

x2goclient/PKGBUILD

@@ -1,32 +1,33 @@
 pkgname=x2goclient
-pkgver=4.1.1.0
+pkgver=4.1.2.1
 pkgrel=1
 pkgdesc="A graphical client (Qt5) for the X2Go system"
 arch=('x86_64')
 license=('GPL2')
-url="http://www.x2go.org"
+url="https://wiki.x2go.org/doku.php"
 depends=('qt5-x11extras' 'qt5-svg' 'phonon-qt5' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme')
 makedepends=('qt5-tools' 'man2html' 'xdg-utils' 'xorg-xauth')
 # FS#48088
 optdepends=('xorg-xauth: may be required by X2goservers running a different linux distribution giving MIT-COOKIE errors')
-source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc}
-sha256sums=('be153529f67e34849b1d807170bf1de1c2d3e1bbe6c5a25ad457c88a981b63ca'
+        x2goclient-qt5.11.patch)
-            'SKIP')
+sha256sums=('1c18981f0a39929624de9472b0e6c3fa2ac7842837dd306db318af54c5fff2af'
+            'SKIP'
+            '2d6c85698ddb556984573037cd78a403e49b346d11828a69963bbd2b3f1354b2')
 validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31'  # Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
               '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') #  "X2go Git Administrator <git-admin@x2go.org>"
 
 prepare() {
   cd ${pkgname}-${pkgver}
   sed -i "s:-o root -g root ::" Makefile
-  # Enable a qt5 build
+  sed -i -e 's/qt4/qt5/' Makefile
-  sed -i 's:qmake-qt4:qmake-qt5:' Makefile
+  patch -Np1 -i ../x2goclient-qt5.11.patch
-  sed -i 's:lrelease-qt4:lrelease-qt5:' Makefile
+  sed -e 's/-lssh_threads//' -i x2goclient.pro # Fix build with libssh 0.8
 }
 
 build() {
   cd ${pkgname}-${pkgver}
-  make PREFIX=/usr build_client
+  make PREFIX=/usr
-  # Don't build the browser plugin - requires qt4 (also NPAPI is deprecated)
   make PREFIX=/usr build_man
 }
 

x2goclient/x2goclient-qt5.11.patch

@@ -0,0 +1,19 @@
+commit ce14cfda34175b6456a8cc7d1e336dce2b0b0682
+Author: Mihai Moldovan <ionic@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
+