From e661683d4ed5c18b3aefdb052ae16b2c08e2148e Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sat, 14 Sep 2019 13:07:19 +0200
Subject: Deps/telepathy: updates

New versions of libsignon-glib and telepathy-accounts-signon.
---
 .../telepathy-accounts-signon.SlackBuild           | 43 ++++++++++++++--------
 1 file changed, 28 insertions(+), 15 deletions(-)

(limited to 'deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild')

diff --git a/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild b/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild
index 5eef854..335356c 100755
--- a/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild
+++ b/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2015, 2016, 2017, 2018  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016, 2017, 2018, 2019  Eric Hameleers, Eindhoven, NL
 # Copyright 2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -22,11 +22,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-PKGNAM=telepathy-accounts-signon
-VERSION=${VERSION:-"1.0"}
-BUILD=${BUILD:-5}
+cd $(dirname $0) ; CWD=$(pwd)
 
-NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
+PKGNAM=telepathy-accounts-signon
+VERSION=${VERSION:-"2.0"}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -56,7 +56,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
-CWD=$(pwd)
+# 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 "$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -64,7 +73,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-${VERSION}*
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-${VERSION}*.tar.?z || exit 1
 cd $PKGNAM-${VERSION}* || exit 1
 chown -R root:root .
 find . \
@@ -73,14 +82,18 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \
-PATH=$QTDIR/bin:$PATH \
-  qmake \
-    PREFIX=/usr \
-    LIBDIR=/usr/lib${LIBDIRSUFFIX}
-
-make $NUMJOBS || make || exit 1
-make install INSTALL_ROOT=$PKG || exit 1
+mkdir build
+cd build
+  QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \
+  PATH=$QTDIR/bin:$PATH \
+    meson \
+      --prefix /usr \
+      --libdir /usr/lib${LIBDIRSUFFIX} \
+      ..
+
+  "${NINJA:=ninja}" $NUMJOBS || exit 1
+  DESTDIR=$PKG ninja install || exit 1
+cd - 1>/dev/null
 
 # Don't ship .la files:
 rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
-- 
cgit v1.2.3