diff options
| -rw-r--r-- | network/remmina/doinst.sh | 9 | ||||
| -rw-r--r-- | network/remmina/remmina.SlackBuild | 69 | ||||
| -rw-r--r-- | network/remmina/remmina.info | 12 |
3 files changed, 67 insertions, 23 deletions
diff --git a/network/remmina/doinst.sh b/network/remmina/doinst.sh index 1d85d0e8d5f31..1f8ff67dedb29 100644 --- a/network/remmina/doinst.sh +++ b/network/remmina/doinst.sh @@ -1,9 +1,10 @@ if [ -x /usr/bin/update-desktop-database ]; then - /usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1 + /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1 fi -if [ -x /usr/bin/gtk-update-icon-cache ] \ - && [ -e usr/share/icons/hicolor/icon-theme.cache ]; then - /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 +if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then + if [ -x /usr/bin/gtk-update-icon-cache ]; then + /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1 + fi fi diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild index 2e3d200e4732c..72b7e20826f05 100644 --- a/network/remmina/remmina.SlackBuild +++ b/network/remmina/remmina.SlackBuild @@ -2,16 +2,35 @@ # Slackware build script for remmina -# Written by Luis Henrique <lmello.009@gmail.com> -# with contributions for the 1.x branch by Niels Horn <niels.horn@gmail.com> +# Copyright 2013 Luis Henrique +# Copyright 2013 Niels Horn, Rio de Janeiro, RJ, Brazil +# Copyright 2015 Philip van der Hoeven, Almere, The Netherlands +# All rights reserved. +# +# Redistribution and use of this script, with or without modification, is +# permitted provided that the following conditions are met: +# +# 1. Redistributions of this script must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED +# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, +# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; +# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR +# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=remmina -VERSION=${VERSION:-20131008_26b814a} +VERSION=${VERSION:-1.2.0_rcgit.1} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} SRCNAM=Remmina -#UNTARDIR=FreeRDP-$SRCNAM-356c033 +TARVERSION=${VERSION/_/-} AVAHI=${AVAHI:-OFF} TELEPATHY=${TELEPATHY:-OFF} @@ -49,12 +68,9 @@ set -e rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -#rm -rf $UNTARDIR -#tar xvf $CWD/$SRCNAM-$VERSION.tar.gz -#cd $UNTARDIR -rm -rf $SRCNAM-$VERSION -tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* -cd $SRCNAM-$VERSION +rm -rf $SRCNAM-${TARVERSION#v} +tar xvf $CWD/v$TARVERSION.tar.?z* +cd $SRCNAM-${TARVERSION#v} chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ @@ -68,12 +84,39 @@ sed "s|/lib/remmina|/lib$LIBDIRSUFFIX/remmina|g" -i CMakeLists.txt || exit 1 # Apply a whole lotta patches (if available)... [ -d $CWD/patches ] && for i in $CWD/patches/*; do patch -p1 -i $i ; done +# Static libssh 0.6.4 +LIBSSH_INSTDIR=$TMP/$SRCNAM-${VERSION#v}/libssh +tar xvf $CWD/libssh-0.6.4.tar.gz +cd libssh-0.6.4 +mkdir build +cd build +cmake \ + -DCMAKE_INSTALL_PREFIX=$LIBSSH_INSTDIR \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DWITH_GCRYPT=0 \ + -DWITH_SSH1=1 \ + -DWITH_PCAP=1 \ + -DWITH_SFTP=1 \ + -DWITH_SERVER=1 \ + -DWITH_STATIC_LIB=1 .. +make VERBOSE=1 +make install +export PKG_CONFIG_PATH=$LIBSSH_INSTDIR/lib${LIBDIRSUFFIX}/pkgconfig:$PKG_CONFIG_PATH +echo $PKG_CONFIG_PATH +cd ../.. + +# Use the static libssh libraries +sed -i 's/LIBSSH_LIBRARY NAMES ssh/LIBSSH_LIBRARY NAMES libssh.a ssh/' cmake/FindLIBSSH.cmake +sed -i 's/LIBSSH_THREADS_LIBRARY NAMES ssh/LIBSSH_THREADS_LIBRARY NAMES libssh_threads.a ssh/' cmake/FindLIBSSH.cmake + # appindicator support must explicitly be disabled because it's detected in # but the version is not high enough. mkdir -p build cd build cmake \ - -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS -lz -lssl -lcrypto" \ -DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \ -DWITH_AVAHI=${AVAHI} \ @@ -93,9 +136,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a \ - AUTHORS COPYING ChangeLog README \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a AUTHORS ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/network/remmina/remmina.info b/network/remmina/remmina.info index 758b40a994f98..947494e3b5a83 100644 --- a/network/remmina/remmina.info +++ b/network/remmina/remmina.info @@ -1,10 +1,12 @@ PRGNAM="remmina" -VERSION="20131008_26b814a" +VERSION="1.2.0_rcgit.1" HOMEPAGE="http://remmina.sourceforge.net" -DOWNLOAD="http://ponce.cc/slackware/sources/repo/Remmina-20131008_26b814a.tar.xz" -MD5SUM="1d55e71a04fcb700653cc1bb8e739288" +DOWNLOAD="https://github.com/FreeRDP/Remmina/archive/v1.2.0-rcgit.1.tar.gz \ + http://pkgs.fedoraproject.org/repo/pkgs/libssh/libssh-0.6.4.tar.gz/5d092f911492e3ee4cd7b473f09a0196/libssh-0.6.4.tar.gz" +MD5SUM="bd92d1beb5c0c3acb6e32ad546e30d84 \ + 5d092f911492e3ee4cd7b473f09a0196" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="freerdp" -MAINTAINER="Luis Henrique" -EMAIL="lmello.009@gmail.com" +MAINTAINER="Philip van der Hoeven" +EMAIL="philip@vd-hoeven.nl" |