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.
---
 .../libsignon-glib/libsignon-glib.SlackBuild       | 56 ++++++++++++----------
 1 file changed, 30 insertions(+), 26 deletions(-)

(limited to 'deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild')

diff --git a/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild b/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild
index 5be4ac2..c465126 100755
--- a/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild
+++ b/deps/telepathy/libsignon-glib/libsignon-glib.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,9 +22,11 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PKGNAM=libsignon-glib
-VERSION=${VERSION:-"1.14"}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-"2.1"}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -37,10 +39,6 @@ if [ -z "$ARCH" ]; then
   export ARCH
 fi
 
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   SLKLDFLAGS=""
@@ -65,6 +63,19 @@ case "$ARCH" in
     *)    TARGET=$ARCH-slackware-linux ;;
 esac
 
+# 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
+
 rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
@@ -82,25 +93,18 @@ find . \
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
 export LDFLAGS="$SLKLDFLAGS"
-
-if [ ! -x configure ]; then
-  ./autogen.sh
-fi
-
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/$PKGNAM-$VERSION \
-  --localstatedir=/var \
-  --sysconfdir=/etc \
-  --disable-python \
-  --disable-static \
-  --build=$TARGET
-
-# No parallel make:
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+mkdir build
+cd build
+    meson \
+      --prefix /usr \
+      --libdir /usr/lib${LIBDIRSUFFIX} \
+      -Dtests=false \
+      ..
+
+  # No parallel make:
+  "${NINJA:=ninja}" || 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