From efc2d632e715498adf632904e2425a5d89e1e44f Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 22 Dec 2017 00:32:25 +0100
Subject: deps/telepathy: updates and recompilations

---
 deps/telepathy/libaccounts-qt5/.url                       |  2 ++
 deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild | 14 +++++++++-----
 deps/telepathy/libaccounts-qt5/libaccounts-qt5.url        |  2 --
 3 files changed, 11 insertions(+), 7 deletions(-)
 create mode 100644 deps/telepathy/libaccounts-qt5/.url
 delete mode 100644 deps/telepathy/libaccounts-qt5/libaccounts-qt5.url

(limited to 'deps/telepathy/libaccounts-qt5')

diff --git a/deps/telepathy/libaccounts-qt5/.url b/deps/telepathy/libaccounts-qt5/.url
new file mode 100644
index 0000000..813b209
--- /dev/null
+++ b/deps/telepathy/libaccounts-qt5/.url
@@ -0,0 +1,2 @@
+https://gitlab.com/accounts-sso/libaccounts-qt/repository/VERSION_1.15/archive.tar.gz
+
diff --git a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild
index 7dc8fb2..ab95f60 100755
--- a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild
+++ b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2015, 2016  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016, 2017  Eric Hameleers, Eindhoven, NL
 # Copyright 2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -24,7 +24,7 @@
 
 PKGNAM=libaccounts-qt5
 SRCNAM=libaccounts-qt
-VERSION=${VERSION:-"627a089_20151106git"}
+VERSION=${VERSION:-"1.15"}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -32,7 +32,7 @@ NUMJOBS=${NUMJOBS:--j7}
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$(uname -m)" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
     # Unless $ARCH is already set, use uname -m for all other archs:
     *) ARCH=$(uname -m) ;;
@@ -40,8 +40,8 @@ if [ -z "$ARCH" ]; then
   export ARCH
 fi
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
@@ -75,6 +75,10 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
+# Fix a compilation error:
+sed -i accounts-qt.pro \
+  -e 's|SUBDIRS  += Accounts tests|SUBDIRS += Accounts|'
+
 QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 \
 PATH=$QTDIR/bin:$PATH \
   qmake \
diff --git a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.url b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.url
deleted file mode 100644
index b4015f3..0000000
--- a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.url
+++ /dev/null
@@ -1,2 +0,0 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.gz?ref=627a0898899d8dc356095d5a3123bae709db8bc0
-
-- 
cgit v1.2.3-65-gdbad