From bca98b7cbbe48c2c2bc552fb41bfec0c1c2c51c4 Mon Sep 17 00:00:00 2001
From: Ray-V <ray42@inbox.lv>
Date: Sun, 24 Jun 2018 19:18:48 +0100
Subject: [PATCH] removed tdenetwork patches for git build errors  - now in
 libtdevnc commit a3628aa8 added I18N filter to krusader.SlackBuild

---
 Apps/krusader/krusader.SlackBuild     | 40 +++++++++++++++------------
 Core/tdenetwork/tdenetwork.SlackBuild | 40 ++++-----------------------
 2 files changed, 28 insertions(+), 52 deletions(-)

diff --git a/Apps/krusader/krusader.SlackBuild b/Apps/krusader/krusader.SlackBuild
index 258f7cd..dc65521 100755
--- a/Apps/krusader/krusader.SlackBuild
+++ b/Apps/krusader/krusader.SlackBuild
@@ -67,21 +67,30 @@ done
 
 listdocs_fn
 
+# set support for additional language(s) as per I18N variable
+# but only for languages available with this package
+langs="";for Lang in $I18N;do [[ -e po/$Lang".po" ]] && langs="$langs $Lang"".po";done
+sed -i "s|POFILES =.*$|POFILES =$langs|" po/Makefile.am
+langs=$(echo $langs | sed 's|.po||g')
+#
+[[ $I18N != *ru* ]] && \
+sed -i 's| ru||' doc/Makefile.am
+
 ltoolupdate_fn
 
 chown_fn
 
 cd_builddir_fn
 
-LDFLAGS="${SLKLDFLAGS}" \
-CFLAGS="${SLKCFLAGS} $TQT_INCLUDE_PATH" \
-CXXFLAGS="${SLKCFLAGS}" \
-CC=${COMPILER} \
-CXX=${COMPILER_CXX} \
+LDFLAGS=$SLKLDFLAGS \
+CFLAGS="$SLKCFLAGS $TQT_INCLUDE_PATH" \
+CXXFLAGS=$SLKCFLAGS \
+CC=$COMPILER \
+CXX=$COMPILER_CXX \
 ../configure \
-   --prefix=${INSTALL_TDE} \
+   --prefix=$INSTALL_TDE \
    --sysconfdir=$SYS_CNF_DIR \
-   --mandir=${INSTALL_TDE}/man \
+   --mandir=$INSTALL_TDE/man \
    --disable-debug \
    --build=$ARCH-slackware-linux
 
@@ -109,24 +118,19 @@ $PRGNAM: Total Commander. It provides all the file management features you
 $PRGNAM: could possibly want.
 $PRGNAM:
 $PRGNAM:
-$PRGNAM: 
+$PRGNAM: With language support for:
+$PRGNAM:
+$PRGNAM: en $langs
 $PRGNAM:
-$PRGNAM: 
-$PRGNAM: Home: https://www.trinitydesktop.org/index.php
 " > $PKG/install/slack-desc
 
 cat <<EOINS >> $PKG/install/doinst.sh
 # Update the desktop database:
-if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database ${INSTALL_TDE}/share/applications > /dev/null 2>&1
-fi
+\$(which update-desktop-database) $INSTALL_TDE/share/applications
 
 # Update hicolor theme cache:
-if [ -d usr/share/icons/hicolor ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t ${INSTALL_TDE}/share/icons/hicolor 1> /dev/null 2> /dev/null
-  fi
-fi
+\$(which gtk-update-icon-cache) -f -t $INSTALL_TDE/share/icons/hicolor
+
 EOINS
 
 
diff --git a/Core/tdenetwork/tdenetwork.SlackBuild b/Core/tdenetwork/tdenetwork.SlackBuild
index 16ac510..f6714eb 100755
--- a/Core/tdenetwork/tdenetwork.SlackBuild
+++ b/Core/tdenetwork/tdenetwork.SlackBuild
@@ -34,30 +34,9 @@ getsource_fn
 untar_fn
 # If speex is installed, include it in the build for jingle
 [[ $(grep speex.h /var/log/packages/*speex*) ]] 2>/dev/null && SPX="ON"
-## add patch for gcc6
+## add patch for gcc6 - done in cgit but still required for R14.0.4
 sed -i 's|"functionName"|" functionName "|' kopete/libkopete/kautoconfig.cpp
 
-##Add '-pthread' for error:
-##/bin/ld: ../libtdevnc/libtdevncclient.a(tls_openssl.c.o): undefined reference to symbol 'pthread_mutexattr_settype@@GLIBC_2.2.5'
-##/lib64/libpthread.so.0: error adding symbols: DSO missing from command line
-[[ $TDEVERSION != R14.0.4 ]] && PTHRD="-pthread"
-
-##Error in git build where libtdevnc has been added as a dependency of KRDC and KRFB and openssl is being used:
-##../libtdevnc/libtdevncclient.a(tls_openssl.c.o): In function `InitializeTLS':
-##/tmp/build/tmp-tdenetwork/tdenetwork/libtdevnc/libvncclient/tls_openssl.c:153: undefined reference to `CRYPTO_num_locks'
-[[ $TDEVERSION != R14.0.4 ]] && {
-echo $'
---- libtdevnc/CMakeLists.txt
-+++ libtdevnc/CMakeLists.txt
-@@ -304 +304 @@
--    ${ADDITIONAL_LIBS} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${GNUTLS_LIBRARIES}
-+    ${ADDITIONAL_LIBS} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${GNUTLS_LIBRARIES} ${OPENSSL_LIBRARIES}
-' | while read line
-do
-patch -N -p0
-done || true # added for if/when upstream apply this patch causing it to fail
-}
-
 listdocs_fn
 
 chown_fn
@@ -68,7 +47,7 @@ cd_builddir_fn
 ## GADU & MEANWHILE require libgadu and meanwhile installed.
   cmake \
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS $TQT_INCLUDE_PATH" \
-    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS ${PTHRD:-}" \
+    -DCMAKE_CXX_FLAGS:STRING=$SLKCFLAGS \
     -DCMAKE_C_COMPILER=$COMPILER \
     -DCMAKE_CXX_COMPILER=$COMPILER_CXX \
     -DCMAKE_INSTALL_PREFIX=$INSTALL_TDE \
@@ -162,21 +141,14 @@ $PRGNAM: Home: https://www.trinitydesktop.org/index.php
 
 cat <<EOINS >> $PKG/install/doinst.sh
 # Update the desktop database:
-if [ -x usr/bin/update-desktop-database ]; then
-  chroot . /usr/bin/update-desktop-database $INSTALL_TDE/share/applications > /dev/null 2>&1
-fi
+\$(which update-desktop-database) $INSTALL_TDE/share/applications
 
 # Update hicolor theme cache:
-if [ -d usr/share/icons/hicolor ]; then
-  if [ -x /usr/bin/gtk-update-icon-cache ]; then
-    chroot . /usr/bin/gtk-update-icon-cache -f -t $INSTALL_TDE/share/icons/hicolor 1> /dev/null 2> /dev/null
-  fi
-fi
+\$(which gtk-update-icon-cache) -f -t $INSTALL_TDE/share/icons/hicolor
 
 # Update the mime database:
-if [ -x usr/bin/update-mime-database ]; then
-  chroot . /usr/bin/update-mime-database $INSTALL_TDE/share/mime >/dev/null 2>&1
-fi
+\$(which update-mime-database) /usr/share/mime
+
 EOINS
 
 makepkg_fn