4 files changed, 13 insertions, 66 deletions
diff --git a/network/remmina/README b/network/remmina/README
index 60a3c67a0c..2a57015484 100644
--- a/network/remmina/README
+++ b/network/remmina/README
@@ -6,6 +6,5 @@ integrated and consistant user interface. Currently RDP, VNC, NX,
 XDMCP and SSH are supported.
 
 Optional support for extra features can be enabled with some switches:
-VTE3=ON      (VTE, requires vte3, default OFF)
 AVAHI=ON     (Avahi/Zeroconf, requires avahi, default OFF)
 TELEPATHY=ON (Telepathy, default OFF)
diff --git a/network/remmina/patches/remmina-external_tools.patch b/network/remmina/patches/remmina-external_tools.patch
deleted file mode 100644
index 9680b51789..0000000000
--- a/network/remmina/patches/remmina-external_tools.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-https://github.com/FreeRDP/Remmina/issues/171
---- a/remmina/CMakeLists.txt
-+++ b/remmina/CMakeLists.txt
-@@ -148,7 +148,6 @@ if(WITH_TRANSLATIONS)
- endif()
- add_subdirectory(icons)
- add_subdirectory(desktop)
--add_subdirectory(external_tools)
- 
- install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR})
- 
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index c5c0543fbe..5dc5faf43f 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -4,7 +4,7 @@
 
 # Copyright 2013 Luis Henrique
 # Copyright 2013 Niels Horn, Rio de Janeiro, RJ, Brazil
-# Copyright 2015 Philip van der Hoeven, Almere, The Netherlands
+# Copyright 2015-2016 Philip van der Hoeven, Almere, The Netherlands
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -25,16 +25,15 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=remmina
-VERSION=${VERSION:-1.2.0_rcgit.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-next20160509}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 SRCNAM=Remmina
-TARVERSION=$(echo $VERSION | tr _ -)
+TARVERSION=next
 
 AVAHI=${AVAHI:-OFF}
 TELEPATHY=${TELEPATHY:-OFF}
-VTE3=${VTE3:-OFF}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -69,7 +68,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$TARVERSION
-tar xvf $CWD/$SRCNAM-$TARVERSION.tar.gz || tar xvf $CWD/v$TARVERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $SRCNAM-$TARVERSION
 chown -R root:root .
 find -L . \
@@ -78,45 +77,6 @@ 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 {} \;
 
-# Fix libdirsuffix in CMakeLists.txt
-sed "s|/lib/remmina|/lib$LIBDIRSUFFIX/remmina|g" -i CMakeLists.txt
-
-# 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-${TARVERSION#v}/libssh
-tar xvf $CWD/libssh-0.6.4.tar.gz
-cd libssh-0.6.4
-
-# Fix for the newer gcc, see https://gcc.gnu.org/gcc-5/porting_to.html
-sed -i "s|__FUNCTION__|__func__|" include/libssh/{,pki_}priv.h src/auth.c
-
-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 \
@@ -125,7 +85,8 @@ cd build
     -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
     -DWITH_AVAHI=${AVAHI} \
     -DWITH_TELEPATHY=${TELEPATHY} \
-    -DWITH_VTE=${VTE3} \
+    -DWITH_VTE=ON \
+    -DWITH_SURVEY=OFF \
     -DWITH_APPINDICATOR=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
 
@@ -141,7 +102,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 ChangeLog README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog README.md $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 7776da2433..ab0d526b31 100644
--- a/network/remmina/remmina.info
+++ b/network/remmina/remmina.info
@@ -1,12 +1,10 @@
 PRGNAM="remmina"
-VERSION="1.2.0_rcgit.1"
-HOMEPAGE="http://remmina.sourceforge.net"
-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="7b5df647a9fb0be206cfabd273bc91f4 \
-        5d092f911492e3ee4cd7b473f09a0196"
+VERSION="next20160509"
+HOMEPAGE="http://www.remmina.org"
+DOWNLOAD="https://sourceforge.net/projects/slackbuildsdirectlinks/files/remmina/remmina-next20160509.tar.gz"
+MD5SUM="b5b36564ee4354c9dd3022a7cc3fcac3"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="freerdp"
+REQUIRES="freerdp vte3"
 MAINTAINER="Philip van der Hoeven"
 EMAIL="philip@vd-hoeven.nl"