1 files changed, 32 insertions, 35 deletions
diff --git a/network/remmina/remmina.SlackBuild b/network/remmina/remmina.SlackBuild
index 27628ae3c8..aa9b47ab2e 100644
--- a/network/remmina/remmina.SlackBuild
+++ b/network/remmina/remmina.SlackBuild
@@ -6,15 +6,16 @@
 # with contributions for the 1.x branch by Niels Horn <niels.horn@gmail.com>
 
 PRGNAM=remmina
-VERSION=${VERSION:-1.0.0}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-20131008_26b814a}
+BUILD=${BUILD:-}
 TAG=${TAG:-_SBo}
 
 SRCNAM=Remmina
-UNTARDIR=FreeRDP-$SRCNAM-356c033
+#UNTARDIR=FreeRDP-$SRCNAM-356c033
 
-AVAHI=${AVAHI:OFF}
-TELEPATHY=${TELEPATHY:OFF}
+AVAHI=${AVAHI:-OFF}
+TELEPATHY=${TELEPATHY:-OFF}
+VTE3=${VTE3:-OFF}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -48,39 +49,36 @@ 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 $UNTARDIR
+#tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+#cd $UNTARDIR
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z*
+cd $SRCNAM-$VERSION
 chown -R root:root .
-find . \
- \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -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
-# gcc-4.7.x needs additional linker flags
-SLKLDFLAGS="-lX11 -lgio-2.0 -lgobject-2.0 -lgthread-2.0 -lgmodule-2.0 -lgdk_pixbuf-2.0 -lpthread"
-
-# Apply a whole lotta patches...
-for i in $CWD/patches/*; do
-  patch -p1 -i $i
-done
-
-# VTE support must explicitly be disabled because it's detected in
-# but the version is not high enough (>=2.90).
-# The same for appindicator.
+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
+
+# 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_EXE_LINKER_FLAGS:STRING="$SLKLDFLAGS" \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=/usr/lib${LIBDIRSUFFIX} \
     -DWITH_AVAHI=${AVAHI} \
     -DWITH_TELEPATHY=${TELEPATHY} \
-    -DWITH_VTE=OFF \
+    -DWITH_VTE=${VTE3} \
     -DWITH_APPINDICATOR=OFF \
     -DCMAKE_BUILD_TYPE=Release ..
 
@@ -88,17 +86,16 @@ cd build
   make install DESTDIR=$PKG
 cd ..
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+# make install forgot these
+cp -a remmina/include/remmina/*.h $PKG/usr/include/remmina
+
+find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/{remmina,remmina-plugins}
-cp -a README $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
-  remmina/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README} \
-  $PKG/usr/doc/$PRGNAM-$VERSION/remmina
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  remmina-plugins/{AUTHORS,COPYING,ChangeLog,INSTALL,NEWS,README*} \
-  $PKG/usr/doc/$PRGNAM-$VERSION/remmina-plugins
+  AUTHORS COPYING ChangeLog README \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install