Date: Friday, January 25, 2019 @ 07:04:33
Author: andyrtr
Revision: 344733
archrelease: copy trunk to extra-x86_64
Added:
x2goclient/repos/extra-x86_64/PKGBUILD
(from rev 344732, x2goclient/trunk/PKGBUILD)
x2goclient/repos/extra-x86_64/x2goclient-qt5.11.patch
(from rev 344732, x2goclient/trunk/x2goclient-qt5.11.patch)
Deleted:
x2goclient/repos/extra-x86_64/PKGBUILD
x2goclient/repos/extra-x86_64/x2goclient-qt5.11.patch
-------------------------+
PKGBUILD | 87 ++++++++++++++++++++++------------------------
x2goclient-qt5.11.patch | 38 ++++++++++----------
2 files changed, 62 insertions(+), 63 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2019-01-25 07:04:27 UTC (rev 344732)
+++ PKGBUILD 2019-01-25 07:04:33 UTC (rev 344733)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andy...@archlinux.org>
-# Contributor: Gerhard Brauer <ger...@archlinux.de>
-# Contributor: Richard Murri <ad...@richardmurri.com>
-
-pkgname=x2goclient
-pkgver=4.1.2.1
-pkgrel=3
-arch=('x86_64')
-license=('GPL2')
-url="http://www.x2go.org";
-pkgdesc="a graphical client (Qt4) for the X2Go system"
-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}
- x2goclient-qt5.11.patch)
-sha256sums=('1c18981f0a39929624de9472b0e6c3fa2ac7842837dd306db318af54c5fff2af'
- 'SKIP'
- '2d6c85698ddb556984573037cd78a403e49b346d11828a69963bbd2b3f1354b2')
-validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31' # Mike Gabriel
<mike.gabr...@das-netzwerkteam.de>
- '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # "X2go Git
Administrator <git-ad...@x2go.org>"
-
-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
-}
-
-build() {
- cd ${pkgname}-${pkgver}
- make PREFIX=/usr
- make PREFIX=/usr build_man
-}
-
-package() {
-
- cd ${pkgbase}-${pkgver}
- make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
-}
Copied: x2goclient/repos/extra-x86_64/PKGBUILD (from rev 344732,
x2goclient/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2019-01-25 07:04:33 UTC (rev 344733)
@@ -0,0 +1,43 @@
+# Maintainer: AndyRTR <andy...@archlinux.org>
+# Contributor: Gerhard Brauer <ger...@archlinux.de>
+# Contributor: Richard Murri <ad...@richardmurri.com>
+
+pkgname=x2goclient
+pkgver=4.1.2.1
+pkgrel=3
+arch=('x86_64')
+license=('GPL2')
+url="https://wiki.x2go.org/doku.php";
+pkgdesc="a graphical client (Qt4) for the X2Go system"
+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}
+ x2goclient-qt5.11.patch)
+sha256sums=('1c18981f0a39929624de9472b0e6c3fa2ac7842837dd306db318af54c5fff2af'
+ 'SKIP'
+ '2d6c85698ddb556984573037cd78a403e49b346d11828a69963bbd2b3f1354b2')
+validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31' # Mike Gabriel
<mike.gabr...@das-netzwerkteam.de>
+ '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') # "X2go Git
Administrator <git-ad...@x2go.org>"
+
+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
+}
+
+build() {
+ cd ${pkgname}-${pkgver}
+ make PREFIX=/usr
+ make PREFIX=/usr build_man
+}
+
+package() {
+
+ cd ${pkgbase}-${pkgver}
+ make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
+}
Deleted: x2goclient-qt5.11.patch
===================================================================
--- x2goclient-qt5.11.patch 2019-01-25 07:04:27 UTC (rev 344732)
+++ x2goclient-qt5.11.patch 2019-01-25 07:04:33 UTC (rev 344733)
@@ -1,19 +0,0 @@
-commit ce14cfda34175b6456a8cc7d1e336dce2b0b0682
-Author: Mihai Moldovan <io...@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
-
Copied: x2goclient/repos/extra-x86_64/x2goclient-qt5.11.patch (from rev 344732,
x2goclient/trunk/x2goclient-qt5.11.patch)
===================================================================
--- x2goclient-qt5.11.patch (rev 0)
+++ x2goclient-qt5.11.patch 2019-01-25 07:04:33 UTC (rev 344733)
@@ -0,0 +1,19 @@
+commit ce14cfda34175b6456a8cc7d1e336dce2b0b0682
+Author: Mihai Moldovan <io...@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
+
