From f4a012d74e520a8c2e7d80c7c2a792007ec51b32 Mon Sep 17 00:00:00 2001 From: Marcus Moeller Date: Fri, 28 Jun 2019 21:43:38 +0200 Subject: network/x2goclient: Updated for version 4.1.2.1. Signed-off-by: Matteo Bernardini --- network/x2goclient/README | 3 -- network/x2goclient/x2goclient.SlackBuild | 60 ++++++++++---------------------- network/x2goclient/x2goclient.info | 12 +++---- 3 files changed, 24 insertions(+), 51 deletions(-) (limited to 'network') diff --git a/network/x2goclient/README b/network/x2goclient/README index 499824ee769e..c92ab5849a37 100644 --- a/network/x2goclient/README +++ b/network/x2goclient/README @@ -7,6 +7,3 @@ Multiple users/clients can access a single X2Go Server at the same time, with each user/client having an individual Desktop session by default; however, desktop sharing is possible. This is the client. - -If you want to build also the nsplugin, run the script with: -PLUGIN=1 ./x2goclient.SlackBuild diff --git a/network/x2goclient/x2goclient.SlackBuild b/network/x2goclient/x2goclient.SlackBuild index f32eef0c133b..488474a30524 100644 --- a/network/x2goclient/x2goclient.SlackBuild +++ b/network/x2goclient/x2goclient.SlackBuild @@ -3,6 +3,7 @@ # Slackware build script for x2goclient # Copyright 2014 Elvio "HelLViS69" Basello +# Copyright 2019 Marcus Moeller # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,13 +24,13 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=x2goclient -VERSION=${VERSION:-4.0.5.1} +VERSION=${VERSION:-4.1.2.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac @@ -40,8 +41,8 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -69,46 +70,21 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -qmake x2goclient.pro +# The newer libssh doesn't ship this library anymore +[[ "$(pkg-config --modversion libssh)" > "0.8" ]] && \ + sed -i "s| -lssh_threads||" x2goclient.pro + +sed -i -e '/^QMAKE_BINARY=/s@qmake-qt4@qmake@' Makefile +sed -i -e '/^LRELEASE_BINARY=/s@lrelease-qt4@lrelease@' Makefile + make -# There is no "make install" target.. so bad.. we have to move stuff manually -mkdir -p $PKG/usr/bin $PKG/usr/share/applications -cp $TMP/$PRGNAM-$VERSION/x2goclient $PKG/usr/bin -cp $TMP/$PRGNAM-$VERSION/desktop/x2goclient.desktop $PKG/usr/share/applications - -# Install icons -PIXMAPS=$PKG/usr/share/pixmaps/x2goclient -mkdir -p $PIXMAPS/16x16 $PIXMAPS/22x22 $PIXMAPS/32x32 $PIXMAPS/48x48 $PIXMAPS/64x64 \ - $PIXMAPS/128x128 $PIXMAPS/hildon -cp $TMP/$PRGNAM-$VERSION/res/img/icons/16x16/* $PIXMAPS/16x16 -cp $TMP/$PRGNAM-$VERSION/res/img/icons/22x22/* $PIXMAPS/22x22 -cp $TMP/$PRGNAM-$VERSION/res/img/icons/32x32/* $PIXMAPS/32x32 -cp $TMP/$PRGNAM-$VERSION/res/img/icons/48x48/* $PIXMAPS/48x48 -cp $TMP/$PRGNAM-$VERSION/res/img/icons/64x64/* $PIXMAPS/64x64 -cp $TMP/$PRGNAM-$VERSION/res/img/icons/128x128/* $PIXMAPS/128x128 -cp $TMP/$PRGNAM-$VERSION/res/img/icons/hildon/* $PIXMAPS/hildon -cp $TMP/$PRGNAM-$VERSION/res/img/icons/x2go-win-48.ico $PIXMAPS -cp $TMP/$PRGNAM-$VERSION/res/img/icons/x2go-mac.icns $PIXMAPS -cp $TMP/$PRGNAM-$VERSION/res/img/icons/x2goclient.xpm $PIXMAPS - -# Install man -mkdir -p $PKG/usr/man/man1 -gzip -c $TMP/$PRGNAM-$VERSION/man/man1/x2goclient.1 > $PKG/usr/man/man1/x2goclient.1.gz - -# Install plugin -if [ ! -z $PLUGIN ]; then - # Binary and plugin are mutually excludable, so we need to recompile all stuff - make clean - X2GO_CLIENT_TARGET=plugin qmake x2goclient.pro - make - mkdir -p $PKG/etc/x2go/plugin-provider $PKG/usr/share/x2go/plugin \ - $PKG/usr/lib${LIBDIRSUFFIX}/nsbrowser/plugins - cp $TMP/$PRGNAM-$VERSION/libx2goplugin.so $PKG/usr/lib${LIBDIRSUFFIX}/nsbrowser/plugins - cp $TMP/$PRGNAM-$VERSION/provider/etc/x2goplugin-apache.conf $PKG/etc/x2go - cp $TMP/$PRGNAM-$VERSION/provider/share/x2goplugin.html $PKG/etc/x2go/plugin-provider - cp $TMP/$PRGNAM-$VERSION/provider/share/x2goplugin.html $PKG/usr/share/x2go/plugin -fi +make install PREFIX=/usr DESTDIR=$PKG + +# Move man pages in the proper place and compress them +mv $PKG/usr/share/man $PKG/usr +find $PKG/usr/man -type f -exec gzip -9 {} \; +for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/network/x2goclient/x2goclient.info b/network/x2goclient/x2goclient.info index 5968a52dd53a..699c3abc5d01 100644 --- a/network/x2goclient/x2goclient.info +++ b/network/x2goclient/x2goclient.info @@ -1,10 +1,10 @@ PRGNAM="x2goclient" -VERSION="4.0.5.1" +VERSION="4.1.2.1" HOMEPAGE="http://www.x2go.org" -DOWNLOAD="http://code.x2go.org/releases/source/x2goclient/x2goclient-4.0.5.1.tar.gz" -MD5SUM="08ff4bd5d40a9ce011be4c56ac5ce296" +DOWNLOAD="https://code.x2go.org/releases/source/x2goclient/x2goclient-4.1.2.1.tar.gz" +MD5SUM="0ed3b974ffec4e3bb1db40fb0be7b6d0" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" -MAINTAINER="Elvio Basello (HelLViS69)" -EMAIL="hellvis69@gmail.com" +REQUIRES="nx-libs" +MAINTAINER="Marcus Moeller" +EMAIL="mmoeller@faircomputer.ch" -- cgit v1.2.3