network/telegram-cli: Updated for version 20200106.

This fixes the build on 15.0, but this still needs a
maintainer.

Upstream was dead, but a community has built up around this fork.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 18 insertions, 33 deletions

diff --git a/network/telegram-cli/telegram-cli.SlackBuild b/network/telegram-cli/telegram-cli.SlackBuild
index 777c3d5c732e..2588d23fda50 100644
--- a/network/telegram-cli/telegram-cli.SlackBuild
+++ b/network/telegram-cli/telegram-cli.SlackBuild
@@ -25,17 +25,15 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=telegram-cli
-VERSION=${VERSION:-1.4.1}
+SRCNAM=tg
+VERSION=${VERSION:-20200106}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
-SRCNAM=tg
-SRCVERSION=6547c0b21b977b327b3c5e8142963f4bc246187a
-
-# Git modules
-MODULENAM=(tgl tl-parser)
-MODULEVERSION=(ffb04caca71de0cddf28cd33a4575922900a59ed 36bf1902ff3476c75d0b1f42b34a91e944123b3c)
+# Git module
+SRCNAM2=tgl
+VERSION2=57f1bc41ae13297e6c3e23ac465fd45ec6659f50
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -45,9 +43,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -76,20 +71,12 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$SRCVERSION
-tar xvf $CWD/$SRCNAM-$SRCVERSION.tar.gz || tar xvf $CWD/$SRCVERSION.tar.gz
-cd $SRCNAM-$SRCVERSION
-
-rm -rf ${MODULENAM[0]}
-tar xvf $CWD/${MODULENAM[0]}-${MODULEVERSION[0]}.tar.gz || tar xvf $CWD/${MODULEVERSION[0]}.tar.gz
-mv ${MODULENAM[0]}-${MODULEVERSION[0]} ${MODULENAM[0]}
-
-( cd ${MODULENAM[0]}
-  rm -rf ${MODULENAM[1]}
-  tar xvf $CWD/${MODULENAM[1]}-${MODULEVERSION[1]}.tar.gz || tar xvf $CWD/${MODULEVERSION[1]}.tar.gz
-  mv ${MODULENAM[1]}-${MODULEVERSION[1]} ${MODULENAM[1]}
-)
-
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
+cd $SRCNAM-$VERSION
+rm -rf $SRCNAM2
+tar xvf $CWD/$SRCNAM2-$VERSION2.tar.gz
+mv $SRCNAM2-$VERSION2 tgl
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -99,7 +86,7 @@ find -L . \
 
 patch -p1 < $CWD/libreadline.patch
 
-CFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS -fcommon" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/network/telegram-cli/telegram-cli.info b/network/telegram-cli/telegram-cli.info
index a7482c43f52e..2e5288050ff3 100644
--- a/network/telegram-cli/telegram-cli.info
+++ b/network/telegram-cli/telegram-cli.info
@@ -1,12 +1,10 @@
 PRGNAM="telegram-cli"
-VERSION="1.4.1"
-HOMEPAGE="https://github.com/vysheng/tg"
-DOWNLOAD="https://github.com/vysheng/tg/archive/6547c0b21b977b327b3c5e8142963f4bc246187a.tar.gz \
-          https://github.com/vysheng/tgl/archive/ffb04caca71de0cddf28cd33a4575922900a59ed.tar.gz \
-          https://github.com/vysheng/tl-parser/archive/36bf1902ff3476c75d0b1f42b34a91e944123b3c.tar.gz"
-MD5SUM="599bdbdccdf632251eb696ad7732f4e3 \
-        284a0f059a30d2c04ca5dcdd6643a491 \
-        854f4d66a29a6ab530a11acbcef5542e"
+VERSION="20200106"
+HOMEPAGE="https://github.com/kenorb-contrib/tg"
+DOWNLOAD="https://github.com/kenorb-contrib/tg/archive/20200106/tg-20200106.tar.gz \
+          https://github.com/kenorb-contrib/tgl/archive/57f1bc41ae13297e6c3e23ac465fd45ec6659f50/tgl-57f1bc41ae13297e6c3e23ac465fd45ec6659f50.tar.gz"
+MD5SUM="0deb315d28e6adfe357b703a0c2bb066 \
+        04ce98ac8e0504af5c2a27db567fbe82"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="libconfig lua"