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

[Andreas Radke]

    Date: Thursday, February 13, 2020 @ 19:05:11
  Author: andyrtr
Revision: 375552

upgpkg: x2goclient 4.1.2.2-1: upstream update 4.1.2.2

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

-------------------------+
 PKGBUILD                |   14 +++++---------
 x2goclient-qt5.11.patch |   19 -------------------
 2 files changed, 5 insertions(+), 28 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-02-13 18:33:49 UTC (rev 375551)
+++ PKGBUILD	2020-02-13 19:05:11 UTC (rev 375552)
@@ -3,8 +3,8 @@
 # Contributor: Richard Murri <admin at richardmurri.com>
 
 pkgname=x2goclient
-pkgver=4.1.2.1
-pkgrel=4
+pkgver=4.1.2.2
+pkgrel=1
 arch=('x86_64')
 license=('GPL2')
 url="https://wiki.x2go.org/doku.php"
@@ -14,11 +14,9 @@
          '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}
-        x2goclient-qt5.11.patch)
-sha256sums=('1c18981f0a39929624de9472b0e6c3fa2ac7842837dd306db318af54c5fff2af'
-            'SKIP'
-            '2d6c85698ddb556984573037cd78a403e49b346d11828a69963bbd2b3f1354b2')
+source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
+sha256sums=('c9953267c40fa67119ad96a73bacb1f266196da2059f0cdcd1b8d5199421d12a'
+            'SKIP')
 validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31'  # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
               '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') #  "X2go Git Administrator <git-admin at x2go.org>"
 
@@ -26,8 +24,6 @@
   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
 }
 
 build() {

Deleted: x2goclient-qt5.11.patch
===================================================================
--- x2goclient-qt5.11.patch	2020-02-13 18:33:49 UTC (rev 375551)
+++ x2goclient-qt5.11.patch	2020-02-13 19:05:11 UTC (rev 375552)
@@ -1,19 +0,0 @@
-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
-