summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-04-20 11:13:38 +0200
committer Eric Hameleers <alien@slackware.com>2016-04-20 11:13:38 +0200
commit312a476890ae830b91ceda3773f9a858110e7586 (patch)
treebb81ce4a7fb30ee0d2635d5f35d2606812ca5099
parent9678ae4f1e6973793b583aa600abd01097fb077b (diff)
downloadktown-312a476890ae830b91ceda3773f9a858110e7586.tar.gz
ktown-312a476890ae830b91ceda3773f9a858110e7586.tar.xz
Refresh the 'deps' for upcoming KDE 5_16.04.
New packages: - deps/ninja (needed for easier compilation of qt5-webkit) - deps/qt5-webkit (sources have been split off qt5)
-rwxr-xr-xdeps/alldeps.SlackBuild2
-rw-r--r--deps/ninja/.url1
-rwxr-xr-xdeps/ninja/ninja.SlackBuild119
-rw-r--r--deps/ninja/slack-desc19
-rw-r--r--deps/phonon-gstreamer/.url2
-rwxr-xr-xdeps/phonon-gstreamer/phonon-gstreamer.SlackBuild8
-rw-r--r--deps/phonon-vlc/.url2
-rwxr-xr-xdeps/phonon-vlc/phonon-vlc.SlackBuild8
-rw-r--r--deps/phonon/.url2
-rwxr-xr-xdeps/phonon/phonon.SlackBuild6
-rw-r--r--deps/qt5-webkit/.url1
-rw-r--r--deps/qt5-webkit/doinst.sh9
-rw-r--r--deps/qt5-webkit/patches/qt5-webkit.pthread.patch32
-rwxr-xr-xdeps/qt5-webkit/qt5-webkit.SlackBuild158
-rw-r--r--deps/qt5-webkit/slack-desc19
-rw-r--r--deps/qt5/.url1
-rw-r--r--deps/qt5/patches/qt5.alsa.patch101
-rw-r--r--deps/qt5/patches/qt5.qtbug-51621.patch39
-rw-r--r--deps/qt5/patches/qt5.qtbug-51648.patch88
-rw-r--r--deps/qt5/patches/qt5.qtbug-51649.patch159
-rw-r--r--deps/qt5/patches/qt5.qtbug-51676.patch126
-rw-r--r--deps/qt5/patches/qt5.qtbug-51890.patch82
-rwxr-xr-xdeps/qt5/qt5.SlackBuild31
-rwxr-xr-xdeps/telepathy/farstream/farstream.SlackBuild4
-rw-r--r--deps/telepathy/farstream/farstream.url1
-rwxr-xr-xdeps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild6
-rw-r--r--deps/telepathy/libaccounts-glib/libaccounts-glib.url1
-rwxr-xr-xdeps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild6
-rw-r--r--deps/telepathy/libaccounts-qt5/libaccounts-qt5.url2
-rw-r--r--deps/telepathy/libnice/libnice.url1
-rwxr-xr-xdeps/telepathy/libotr/libotr.SlackBuild4
-rw-r--r--deps/telepathy/libotr/libotr.url2
-rwxr-xr-xdeps/telepathy/libsignon-glib/libsignon-glib.SlackBuild6
-rw-r--r--deps/telepathy/libsignon-glib/libsignon-glib.url3
-rwxr-xr-xdeps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild6
-rw-r--r--deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.url2
-rwxr-xr-xdeps/telepathy/signon-ui/signon-ui.SlackBuild2
-rwxr-xr-xdeps/telepathy/signon/signon.SlackBuild6
-rw-r--r--deps/telepathy/signon/signon.url2
-rwxr-xr-xdeps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild4
-rwxr-xr-xdeps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild4
-rwxr-xr-xdeps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild4
-rwxr-xr-xdeps/telepathy/telepathy-glib/telepathy-glib.SlackBuild4
-rw-r--r--deps/telepathy/telepathy-haze/patches/telepathy-haze.libpurple.patch11
-rwxr-xr-xdeps/telepathy/telepathy-haze/telepathy-haze.SlackBuild4
-rwxr-xr-xdeps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild4
-rwxr-xr-xdeps/telepathy/telepathy-logger/telepathy-logger.SlackBuild4
-rwxr-xr-xdeps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild4
-rwxr-xr-xdeps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild4
-rwxr-xr-xdeps/updates.SlackBuild2
50 files changed, 957 insertions, 161 deletions
diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild
index efc408d..7f57bfd 100755
--- a/deps/alldeps.SlackBuild
+++ b/deps/alldeps.SlackBuild
@@ -15,8 +15,10 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR
ALLDEPS=" \
extra-cmake-modules \
+ ninja \
sni-qt \
qt5 \
+ qt5-webkit \
OpenAL \
qt-gstreamer \
qjson \
diff --git a/deps/ninja/.url b/deps/ninja/.url
new file mode 100644
index 0000000..a839548
--- /dev/null
+++ b/deps/ninja/.url
@@ -0,0 +1 @@
+https://github.com/ninja-build/ninja/archive/v1.6.0.tar.gz
diff --git a/deps/ninja/ninja.SlackBuild b/deps/ninja/ninja.SlackBuild
new file mode 100755
index 0000000..97c33ad
--- /dev/null
+++ b/deps/ninja/ninja.SlackBuild
@@ -0,0 +1,119 @@
+#!/bin/sh
+
+# Copyright 2016 Eric Hameleers, Eindhoven, NL
+# Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=ninja
+VERSION=${VERSION:-1.6.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i486 ;;
+ 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) ;;
+ esac
+ export ARCH
+fi
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ SLKLDFLAGS="-L/usr/lib64"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+fi
+
+case "$ARCH" in
+ arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+ *) TARGET=$ARCH-slackware-linux ;;
+esac
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+# Fix bogus permissions:
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Build the program:
+LDFLAGS="$SLKLDFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+CFLAGS="$SLKCFLAGS" \
+ python bootstrap.py \
+ 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
+
+# Manually install stuff:
+install -D -m0755 ninja $PKG/usr/bin/ninja
+install -D -m0644 misc/bash-completion $PKG/etc/bash_completion.d/ninja
+install -D -m0644 misc/ninja.vim $PKG/usr/share/vim/vimfiles/after/syntax//ninja.vim
+
+# Compress the man page(s):
+if [ -d $PKG/usr/man ]; then
+ find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
+ for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+fi
+
+# Strip binaries (if any):
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ COPYING HACKING.md README RELEASING \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+# Add a package description:
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/deps/ninja/slack-desc b/deps/ninja/slack-desc
new file mode 100644
index 0000000..dbd4c4e
--- /dev/null
+++ b/deps/ninja/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+ninja: ninja (build system with a focus on speed)
+ninja:
+ninja: Ninja is a small build system with a focus on speed.
+ninja: It differs from other build systems in two major respects:
+ninja: it is designed to have its input files generated by a higher-level
+ninja: build system, and it is designed to run builds as fast as possible.
+ninja:
+ninja:
+ninja:
+ninja: ninja home: https://ninja-build.org/
+ninja:
diff --git a/deps/phonon-gstreamer/.url b/deps/phonon-gstreamer/.url
new file mode 100644
index 0000000..4172160
--- /dev/null
+++ b/deps/phonon-gstreamer/.url
@@ -0,0 +1,2 @@
+http://download.kde.org/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.0.tar.xz
+
diff --git a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
index e355306..e413c03 100755
--- a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
+++ b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
@@ -25,8 +25,8 @@
PKGNAM=phonon-gstreamer
SRCNAM=phonon-backend-gstreamer
-VERSION=${VERSION:-4.8.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.9.0}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:" -j7 "}
@@ -66,9 +66,9 @@ PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $SRCNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
-cd $SRCNAM-$VERSION || exit 1
+cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find . \
diff --git a/deps/phonon-vlc/.url b/deps/phonon-vlc/.url
new file mode 100644
index 0000000..24587d5
--- /dev/null
+++ b/deps/phonon-vlc/.url
@@ -0,0 +1,2 @@
+http://download.kde.org/stable/phonon/phonon-backend-vlc/0.9.0/phonon-backend-vlc-0.9.0.tar.xz
+
diff --git a/deps/phonon-vlc/phonon-vlc.SlackBuild b/deps/phonon-vlc/phonon-vlc.SlackBuild
index 3d9bd1b..75200ec 100755
--- a/deps/phonon-vlc/phonon-vlc.SlackBuild
+++ b/deps/phonon-vlc/phonon-vlc.SlackBuild
@@ -25,8 +25,8 @@
PKGNAM=phonon-vlc
SRCNAM=phonon-backend-vlc
-VERSION=${VERSION:-0.8.2}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.9.0}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:" -j7 "}
@@ -65,9 +65,9 @@ PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $SRCNAM-$VERSION
+rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
-cd $SRCNAM-$VERSION || exit 1
+cd $PKGNAM-$VERSION || exit 1
chown -R root:root .
find . \
diff --git a/deps/phonon/.url b/deps/phonon/.url
index 4e1a11b..f573a2d 100644
--- a/deps/phonon/.url
+++ b/deps/phonon/.url
@@ -1 +1 @@
-http://download.kde.org/stable/phonon/4.8.3/src/phonon-4.8.3.tar.xz
+http://download.kde.org/stable/phonon/4.9.0/phonon-4.9.0.tar.xz
diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild
index b92a87b..e232962 100755
--- a/deps/phonon/phonon.SlackBuild
+++ b/deps/phonon/phonon.SlackBuild
@@ -21,12 +21,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified 2010, 2011, 2012, 2014, 2015 Eric Hameleers, Eindhoven, NL
+# Modified 2010, 2011, 2012, 2014, 2015, 2016 Eric Hameleers, Eindhoven, NL
PKGNAM=phonon
-VERSION=${VERSION:-4.8.3}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-4.9.0}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/qt5-webkit/.url b/deps/qt5-webkit/.url
new file mode 100644
index 0000000..126a427
--- /dev/null
+++ b/deps/qt5-webkit/.url
@@ -0,0 +1 @@
+http://download.qt.io/community_releases/5.6/5.6.0/qtwebkit-opensource-src-5.6.0.tar.xz
diff --git a/deps/qt5-webkit/doinst.sh b/deps/qt5-webkit/doinst.sh
new file mode 100644
index 0000000..3e5691a
--- /dev/null
+++ b/deps/qt5-webkit/doinst.sh
@@ -0,0 +1,9 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+ /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+ if [ -x /usr/bin/gtk-update-icon-cache ]; then
+ /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+ fi
+fi
diff --git a/deps/qt5-webkit/patches/qt5-webkit.pthread.patch b/deps/qt5-webkit/patches/qt5-webkit.pthread.patch
new file mode 100644
index 0000000..53d5439
--- /dev/null
+++ b/deps/qt5-webkit/patches/qt5-webkit.pthread.patch
@@ -0,0 +1,32 @@
+From 5f359baacdf92fabcece83f0a2b30f74c7c02a3c Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+Date: Mon, 22 Feb 2016 10:57:32 +0100
+Subject: [PATCH] Fix linking with libpthread
+
+WebKit use libpthread directly but is depending on other qt modules
+causing it to be linked against, which might break unless -lpthread
+is last. Instead just add it explicitly after the static libraries.
+
+Change-Id: I2b95cff2c96373f8dce6f95052c4fccbe1982b33
+Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
+(cherry picked from commit 5dd4bb67cfce812fd7686e43616e2069f354a7df)
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+---
+ Tools/qmake/mkspecs/features/default_post.prf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/Tools/qmake/mkspecs/features/default_post.prf b/Tools/qmake/mkspecs/features/default_post.prf
+index 67276b7..39bb3f7 100644
+--- a/Tools/qmake/mkspecs/features/default_post.prf
++++ b/Tools/qmake/mkspecs/features/default_post.prf
+@@ -201,6 +201,7 @@ needToLink() {
+ linkAgainstLibrary($$library, $$eval(WEBKIT.$${library_identifier}.root_source_dir))
+ LIBS += $$eval(WEBKIT.$${library_identifier}.dependent_libs)
+ }
++ posix:!darwin: LIBS += -lpthread
+ }
+
+ creating_module {
+--
+2.7.1
+
diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild
new file mode 100755
index 0000000..5c818f6
--- /dev/null
+++ b/deps/qt5-webkit/qt5-webkit.SlackBuild
@@ -0,0 +1,158 @@
+#!/bin/sh
+
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Derived from the qt5.SlackBuild
+
+# Modifications for qt5-webkit 5.6.0 2016 by Eric Hameleers, Eindhoven, NL
+
+PKGNAM=qt5-webkit
+VERSION=${VERSION:-5.6.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:--j7}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i486 ;;
+ 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) ;;
+ esac
+ export ARCH
+fi
+
+if [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ SLKLDFLAGS=""
+ SLKLDFLAGS="-L/usr/lib64"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ # To prevent "qatomic_armv6.h error: output number 2 not directly addressable"
+ # More permanent solution is to patch gcc:
+ # http://bazaar.launchpad.net/~linaro-toolchain-dev/gcc-linaro/4.6/revision/106731
+ SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16 -fno-strict-volatile-bitfields"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ SLKLDFLAGS=""
+ LIBDIRSUFFIX=""
+fi
+
+case "$ARCH" in
+ arm*) TARGET=$ARCH-slackware-linux-gnueabi ;;
+ *) TARGET=$ARCH-slackware-linux ;;
+esac
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-${PKGNAM}
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf qtwebkit-opensource-src-$VERSION
+echo "Extracting qtwebkit-opensource-src-$VERSION.tar.xz"
+tar xf $CWD/qtwebkit-opensource-src-$VERSION.tar.xz || exit 1
+cd qtwebkit-opensource-src-$VERSION || exit 1
+
+# Fix linking to pthread:
+cat $CWD/patches/qt5-webkit.pthread.patch | patch -p1 --verbose || exit 1
+
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
+
+# Use -reduce-relocations only on i?86 and x86_64 architextures.
+# https://bugreports.qt-project.org/browse/QTBUG-36129
+if echo $ARCH | grep -q '\(i.86\|x86_64\)' 2>/dev/null; then
+ RELOCATIONS="-reduce-relocations"
+else
+ RELOCATIONS=""
+fi
+
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+export OPENSOURCE_CXXFLAGS="$SLKCFLAGS"
+export QTDIR="/usr/lib$LIBDIRSUFFIX/qt5"
+export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}"
+
+mkdir build
+cd build
+ qmake-qt5 ..
+ make || exit 1
+ make install INSTALL_ROOT=$PKG || exit 1
+cd ..
+
+# Strip binaries the Slackware way:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Fix internal linking for Qt5WebKit.pc , thanks to Larry Hajali's SBo script:
+sed -i \
+ -e "s|-Wl,-whole-archive -lWebKit1 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit[^ ]* ||" \
+ -e "s|-Wl,-whole-archive -lWebKit2 -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebKit2[^ ]* ||" \
+ -e "s|-Wl,-whole-archive -lWebCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WebCore[^ ]* ||" \
+ -e "s|-Wl,-whole-archive -lANGLE -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/ANGLE[^ ]* ||" \
+ -e "s|-Wl,-whole-archive -lJavaScriptCore -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/JavaScriptCore[^ ]* ||" \
+ -e "s|-Wl,-whole-archive -lWTF -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/WTF[^ ]* ||" \
+ -e "s|-Wl,-whole-archive -lleveldb -Wl,-no-whole-archive -L${PWD}/qtwebkit/Source/ThirdParty/leveldb[^ ]* ||" \
+ $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebKit.pc
+
+# Fix the path in prl files:
+find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \
+ -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
+
+# Fix the qmake path in pri file:
+sed -i "s,${QTDIR}/qtbase,/usr/lib${LIBDIRSUFFIX}/qt5," \
+ $PKG/usr/lib${LIBDIRSUFFIX}/qt5/mkspecs/modules/qt_lib_bootstrap_private.pri
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ ChangeLog* VERSION \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt5/doc/html ]; then
+ ( cd $PKG/usr/doc/$PKGNAM-$VERSION
+ ln -sf /usr/lib${LIBDIRSUFFIX}/qt5/doc/html .
+ )
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+
diff --git a/deps/qt5-webkit/slack-desc b/deps/qt5-webkit/slack-desc
new file mode 100644
index 0000000..baba7e8
--- /dev/null
+++ b/deps/qt5-webkit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+qt5-webkit: qt5-webkit (Qt based web browser engine)
+qt5-webkit:
+qt5-webkit: Qtwebkit is a Qt based web browser engine.
+qt5-webkit: This package contains the Qt5 based version.
+qt5-webkit:
+qt5-webkit: Homepage: http://qt-project.org
+qt5-webkit:
+qt5-webkit:
+qt5-webkit:
+qt5-webkit:
+qt5-webkit:
diff --git a/deps/qt5/.url b/deps/qt5/.url
new file mode 100644
index 0000000..241563c
--- /dev/null
+++ b/deps/qt5/.url
@@ -0,0 +1 @@
+http://download.qt.io/official_releases/qt/5.6/5.6.0/single/qt-everywhere-opensource-src-5.6.0.tar.xz
diff --git a/deps/qt5/patches/qt5.alsa.patch b/deps/qt5/patches/qt5.alsa.patch
index 528bc8b..892431b 100644
--- a/deps/qt5/patches/qt5.alsa.patch
+++ b/deps/qt5/patches/qt5.alsa.patch
@@ -1,104 +1,11 @@
-http://svnweb.freebsd.org/ports/head/multimedia/qt5-multimedia/files/patch-git_3b322323?view=log#rev402657
-
-commit 3b322323d036ae2fc9f685bfc74d1ebcd5532159
-Author: Raphael Kubo da Costa <rakuco@FreeBSD.org>
-Date: Fri Nov 27 14:36:50 2015 +0100
-
- alsa: Relax ALSA version checks for 1.1.x to be detected.
-
- Relax the check for SND_LIB_MINOR and SND_LIB_SUBMINOR so that ALSA
- 1.1.x is not considered older than 1.0.10. QtMultimedia builds fine with
- ALSA 1.1.
-
- Change-Id: If697c34cc7d9bbe2f2a3413d0c25ac4de4e93b34
- Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
-
---- config.tests/alsa/alsatest.cpp
-+++ config.tests/alsa/alsatest.cpp
+--- qt-everywhere-opensource-src-5.6.0/qtbase/config.tests/unix/alsa/alsatest.cpp.orig 2016-02-29 08:15:48.203031809 +0000
++++ qt-everywhere-opensource-src-5.6.0/qtbase/config.tests/unix/alsa/alsatest.cpp 2016-02-29 08:16:39.712811962 +0000
@@ -32,7 +32,7 @@
****************************************************************************/
#include <alsa/asoundlib.h>
--#if (!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
-+#if (!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
+-#if(!(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 10))
++#if(!(SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 10)))
#error "Alsa version found too old, require >= 1.0.10"
#endif
---- src/plugins/alsa/qalsaaudiodeviceinfo.cpp
-+++ src/plugins/alsa/qalsaaudiodeviceinfo.cpp
-@@ -141,7 +141,7 @@ bool QAlsaAudioDeviceInfo::open()
- QList<QByteArray> devices = availableDevices(mode);
-
- if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- if (devices.size() > 0)
- dev = QLatin1String(devices.first().constData());
- else
-@@ -150,7 +150,7 @@ bool QAlsaAudioDeviceInfo::open()
- dev = QLatin1String("hw:0,0");
- #endif
- } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- dev = device;
- #else
- int idx = 0;
-@@ -194,7 +194,7 @@ bool QAlsaAudioDeviceInfo::testSettings(const QAudioFormat& format) const
- snd_pcm_hw_params_t *params;
- QString dev;
-
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- dev = device;
- if (dev.compare(QLatin1String("default")) == 0) {
- QList<QByteArray> devices = availableDevices(QAudio::AudioOutput);
-@@ -335,7 +335,7 @@ QList<QByteArray> QAlsaAudioDeviceInfo::availableDevices(QAudio::Mode mode)
- QList<QByteArray> devices;
- QByteArray filter;
-
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- // Create a list of all current audio devices that support mode
- void **hints, **n;
- char *name, *descr, *io;
---- src/plugins/alsa/qalsaaudioinput.cpp
-+++ src/plugins/alsa/qalsaaudioinput.cpp
-@@ -303,7 +303,7 @@ bool QAlsaAudioInput::open()
- QString dev = QString(QLatin1String(m_device.constData()));
- QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioInput);
- if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- if (devices.size() > 0)
- dev = QLatin1String(devices.first());
- else
-@@ -312,7 +312,7 @@ bool QAlsaAudioInput::open()
- dev = QLatin1String("hw:0,0");
- #endif
- } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- dev = QLatin1String(m_device);
- #else
- int idx = 0;
---- src/plugins/alsa/qalsaaudiooutput.cpp
-+++ src/plugins/alsa/qalsaaudiooutput.cpp
-@@ -306,7 +306,7 @@ bool QAlsaAudioOutput::open()
- QString dev = QString(QLatin1String(m_device.constData()));
- QList<QByteArray> devices = QAlsaAudioDeviceInfo::availableDevices(QAudio::AudioOutput);
- if(dev.compare(QLatin1String("default")) == 0) {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- if (devices.size() > 0)
- dev = QLatin1String(devices.first());
- else
-@@ -315,7 +315,7 @@ bool QAlsaAudioOutput::open()
- dev = QLatin1String("hw:0,0");
- #endif
- } else {
--#if(SND_LIB_MAJOR == 1 && SND_LIB_MINOR == 0 && SND_LIB_SUBMINOR >= 14)
-+#if (SND_LIB_MAJOR == 1 && (SND_LIB_MINOR > 0 || SND_LIB_SUBMINOR >= 14))
- dev = QLatin1String(m_device);
- #else
- int idx = 0;
diff --git a/deps/qt5/patches/qt5.qtbug-51621.patch b/deps/qt5/patches/qt5.qtbug-51621.patch
new file mode 100644
index 0000000..187a3d7
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-51621.patch
@@ -0,0 +1,39 @@
+build with explicitlib after all
+
+unlike speculated in 2fe363514, this is not a workaround at all: it
+causes that libraries' public link interfaces (LIBS) are exported in the
+first place. unlike with staticlib, this does not export LIBS_PRIVATE,
+so it wouldn't even be a particularly effective workaround for rpath
+brokenness anyway.
+
+the problem was pretty well hidden by the qt module system, which at the
+level of libraries is pretty redundant with the .prl file handling,
+which shows just how stupid the whole "design" is.
+
+unlike before, we now enable explicitlib for all libraries, not just qt
+modules - we enable create_prl for all of them as well, after all.
+
+an immediate effect of this change is that it fixes linking on RaspPI:
+the qtcore headers make the user code require linking libatomic, so we
+must add it to our public link interface.
+
+Task-number: QTBUG-51621
+Change-Id: I5742c88694db8e8a9b79d17222dc6df2b38e5ab2
+
+X-Git-Url: https://codereview.qt-project.org/gitweb?p=qt%2Fqtbase.git;a=blobdiff_plain;f=mkspecs%2Ffeatures%2Fqt_build_config.prf;h=b3081b960ec192c3421d7a1c2bd5a628f0ca8455;hp=518fd93f0457c6060721c38ad8b6a0286407e562;hb=268e7ee9778de79d2485bdd028721ec7adbc1324;hpb=495e8c205424253186bef47421de63534d23dd59
+
+diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf
+index 518fd93..b3081b9 100644
+--- a/mkspecs/features/qt_build_config.prf
++++ b/mkspecs/features/qt_build_config.prf
+@@ -72,6 +72,10 @@ CONFIG += \
+ # However, testcases should be still built with exceptions.
+ exceptions_off testcase_exceptions
+
++# Under Windows, this is neither necessary (transitive deps are automatically
++# resolved), nor functional (.res files end up in .prl files and break things).
++unix: CONFIG += explicitlib
++
+
+ defineTest(qtBuildPart) {
+ bp = $$eval($$upper($$section(_QMAKE_CONF_, /, -2, -2))_BUILD_PARTS)
diff --git a/deps/qt5/patches/qt5.qtbug-51648.patch b/deps/qt5/patches/qt5.qtbug-51648.patch
new file mode 100644
index 0000000..279839b
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-51648.patch
@@ -0,0 +1,88 @@
+From b024fbe83863fc57364a52c717d5b43d654bdb5d Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Sat, 5 Mar 2016 12:23:21 -0800
+Subject: [PATCH] QtDBus: clean up signal hooks and object tree in
+ closeConnection
+
+If a QObject is added or passed as receiver to QDBusConnection::connect()
+and it is managed by Q_GLOBAL_STATIC or similar mechanism, it is
+possible that when that its destructor is called after the dbus daemon
+thread ends. In that case, QObject::destroyed connected via
+Qt::BlockingQueuedConnection to QDBusConnectionPrivate will cause dead
+lock since the thread is no longer processing events.
+
+Task-number: QTBUG-51648
+Change-Id: I1a1810a6d6d0234af0269d5f3fc1f54101bf1547
+---
+ src/dbus/qdbusconnection_p.h | 1 +
+ src/dbus/qdbusintegrator.cpp | 28 +++++++++++++++++++++++++++-
+ 2 files changed, 28 insertions(+), 1 deletion(-)
+
+diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h
+index c77daf7..565eb83 100644
+--- a/src/dbus/qdbusconnection_p.h
++++ b/src/dbus/qdbusconnection_p.h
+@@ -254,6 +254,7 @@ private:
+ const QVector<int> &metaTypes, int slotIdx);
+
+ SignalHookHash::Iterator removeSignalHookNoLock(SignalHookHash::Iterator it);
++ void disconnectObjectTree(ObjectTreeNode &node);
+
+ bool isServiceRegisteredByThread(const QString &serviceName);
+
+diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
+index cd44861..a3cd47b 100644
+--- a/src/dbus/qdbusintegrator.cpp
++++ b/src/dbus/qdbusintegrator.cpp
+@@ -1030,7 +1030,6 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate()
+ qPrintable(name));
+
+ closeConnection();
+- rootNode.children.clear(); // free resources
+ qDeleteAll(cachedMetaObjects);
+
+ if (mode == ClientMode || mode == PeerMode) {
+@@ -1052,6 +1051,20 @@ QDBusConnectionPrivate::~QDBusConnectionPrivate()
+ }
+ }
+
++void QDBusConnectionPrivate::disconnectObjectTree(QDBusConnectionPrivate::ObjectTreeNode &haystack)
++{
++ QDBusConnectionPrivate::ObjectTreeNode::DataList::Iterator it = haystack.children.begin();
++
++ while (it != haystack.children.end()) {
++ disconnectObjectTree(*it);
++ it++;
++ }
++
++ if (haystack.obj) {
++ haystack.obj->disconnect(this);
++ }
++}
++
+ void QDBusConnectionPrivate::closeConnection()
+ {
+ QDBusWriteLocker locker(CloseConnectionAction, this);
+@@ -1075,6 +1088,19 @@ void QDBusConnectionPrivate::closeConnection()
+ }
+
+ qDeleteAll(pendingCalls);
++
++ // clean up all signal hook and object tree, to avoid QObject::destroyed
++ // being activated to dbus daemon thread which already quits.
++ // dbus connection is already closed, so there is nothing we could do be clean
++ // up everything here.
++ SignalHookHash::iterator sit = signalHooks.begin();
++ while (sit != signalHooks.end()) {
++ sit.value().obj->disconnect(this);
++ sit++;
++ }
++
++ disconnectObjectTree(rootNode);
++ rootNode.children.clear(); // free resources
+ }
+
+ void QDBusConnectionPrivate::checkThread()
+--
+2.7.1
+
diff --git a/deps/qt5/patches/qt5.qtbug-51649.patch b/deps/qt5/patches/qt5.qtbug-51649.patch
new file mode 100644
index 0000000..3b7cf9e
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-51649.patch
@@ -0,0 +1,159 @@
+From acde2e69df5dedc624674107596f276125e22864 Mon Sep 17 00:00:00 2001
+From: Weng Xuetian <wengxt@gmail.com>
+Date: Thu, 3 Mar 2016 21:56:53 -0800
+Subject: [PATCH] QtDBus: finish all pending call with error if disconnected
+
+libdbus will send a local signal if connection gets disconnected. When
+this happens, end all pending calls with QDBusError::Disconnected.
+
+Task-number: QTBUG-51649
+Change-Id: I5c7d2a468bb5da746d0c0e53e458c1e376f186a9
+---
+ src/dbus/dbus_minimal_p.h | 2 ++
+ src/dbus/qdbusintegrator.cpp | 26 +++++++++++++++++-----
+ src/dbus/qdbusutil_p.h | 6 +++++
+ .../dbus/qdbusconnection/tst_qdbusconnection.cpp | 22 ++++++++++++++++++
+ .../dbus/qdbusconnection/tst_qdbusconnection.h | 1 +
+ 5 files changed, 51 insertions(+), 6 deletions(-)
+
+diff --git a/src/dbus/dbus_minimal_p.h b/src/dbus/dbus_minimal_p.h
+index f0a2954..8f25b24 100644
+--- a/src/dbus/dbus_minimal_p.h
++++ b/src/dbus/dbus_minimal_p.h
+@@ -99,9 +99,11 @@ typedef dbus_uint32_t dbus_bool_t;
+ /* dbus-shared.h */
+ #define DBUS_SERVICE_DBUS "org.freedesktop.DBus"
+ #define DBUS_PATH_DBUS "/org/freedesktop/DBus"
++#define DBUS_PATH_LOCAL "/org/freedesktop/DBus/Local"
+ #define DBUS_INTERFACE_DBUS "org.freedesktop.DBus"
+ #define DBUS_INTERFACE_INTROSPECTABLE "org.freedesktop.DBus.Introspectable"
+ #define DBUS_INTERFACE_PROPERTIES "org.freedesktop.DBus.Properties"
++#define DBUS_INTERFACE_LOCAL "org.freedesktop.DBus.Local"
+
+ #define DBUS_NAME_FLAG_ALLOW_REPLACEMENT 0x1 /**< Allow another service to become the primary owner if requested */
+ #define DBUS_NAME_FLAG_REPLACE_EXISTING 0x2 /**< Request to replace the current primary owner */
+diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
+index cd44861..320419f 100644
+--- a/src/dbus/qdbusintegrator.cpp
++++ b/src/dbus/qdbusintegrator.cpp
+@@ -519,6 +519,14 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
+ switch (amsg.type()) {
+ case QDBusMessage::SignalMessage:
+ handleSignal(amsg);
++ // Check local disconnected signal from libdbus
++ if (amsg.interface() == QDBusUtil::dbusInterfaceLocal()
++ && amsg.path() == QDBusUtil::dbusPathLocal()
++ && amsg.member() == QDBusUtil::disconnected()
++ && !QDBusMessagePrivate::isLocal(amsg)) {
++ while (!pendingCalls.isEmpty())
++ processFinishedCall(pendingCalls.first());
++ }
+ // if there are any other filters in this DBusConnection,
+ // let them see the signal too
+ return false;
+@@ -1767,10 +1775,16 @@ void QDBusConnectionPrivate::processFinishedCall(QDBusPendingCallPrivate *call)
+
+ QDBusMessage &msg = call->replyMessage;
+ if (call->pending) {
+- // decode the message
+- DBusMessage *reply = q_dbus_pending_call_steal_reply(call->pending);
+- msg = QDBusMessagePrivate::fromDBusMessage(reply, connection->capabilities);
+- q_dbus_message_unref(reply);
++ // when processFinishedCall is called and pending call is not completed,
++ // it means we received disconnected signal from libdbus
++ if (q_dbus_pending_call_get_completed(call->pending)) {
++ // decode the message
++ DBusMessage *reply = q_dbus_pending_call_steal_reply(call->pending);
++ msg = QDBusMessagePrivate::fromDBusMessage(reply, connection->capabilities);
++ q_dbus_message_unref(reply);
++ } else {
++ msg = QDBusMessage::createError(QDBusError::Disconnected, QDBusUtil::disconnectedErrorMessage());
++ }
+ }
+ qDBusDebug() << connection << "got message reply:" << msg;
+
+@@ -2070,8 +2084,8 @@ void QDBusConnectionPrivate::sendInternal(QDBusPendingCallPrivate *pcall, void *
+ pcall->pending = pending;
+ q_dbus_pending_call_set_notify(pending, qDBusResultReceived, pcall, 0);
+
+- // DBus won't notify us when a peer disconnects so we need to track these ourselves
+- if (mode == QDBusConnectionPrivate::PeerMode)
++ // DBus won't notify us when a peer disconnects or server terminates so we need to track these ourselves
++ if (mode == QDBusConnectionPrivate::PeerMode || mode == QDBusConnectionPrivate::ClientMode)
+ pendingCalls.append(pcall);
+
+ return;
+diff --git a/src/dbus/qdbusutil_p.h b/src/dbus/qdbusutil_p.h
+index 8f5ae92..ca70ff9 100644
+--- a/src/dbus/qdbusutil_p.h
++++ b/src/dbus/qdbusutil_p.h
+@@ -155,6 +155,8 @@ namespace QDBusUtil
+ { return QStringLiteral(DBUS_SERVICE_DBUS); }
+ inline QString dbusPath()
+ { return QStringLiteral(DBUS_PATH_DBUS); }
++ inline QString dbusPathLocal()
++ { return QStringLiteral(DBUS_PATH_LOCAL); }
+ inline QString dbusInterface()
+ {
+ // it's the same string, but just be sure
+@@ -165,8 +167,12 @@ namespace QDBusUtil
+ { return QStringLiteral(DBUS_INTERFACE_PROPERTIES); }
+ inline QString dbusInterfaceIntrospectable()
+ { return QStringLiteral(DBUS_INTERFACE_INTROSPECTABLE); }
++ inline QString dbusInterfaceLocal()
++ { return QStringLiteral(DBUS_INTERFACE_LOCAL); }
+ inline QString nameOwnerChanged()
+ { return QStringLiteral("NameOwnerChanged"); }
++ inline QString disconnected()
++ { return QStringLiteral("Disconnected"); }
+ inline QString disconnectedErrorMessage()
+ { return QStringLiteral("Not connected to D-Bus server"); }
+ }
+diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
+index e91f87d..6c7e6b1 100644
+--- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
++++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.cpp
+@@ -1218,6 +1218,28 @@ void tst_QDBusConnection::callVirtualObjectLocal()
+ QCOMPARE(obj.replyArguments, subPathReply.arguments());
+ }
+
++void tst_QDBusConnection::pendingCallWhenDisconnected()
++{
++ QDBusServer *server = new QDBusServer;
++ QDBusConnection con = QDBusConnection::connectToPeer(server->address(), "disconnect");
++ QTestEventLoop::instance().enterLoop(2);
++ QVERIFY(!QTestEventLoop::instance().timeout());
++ QVERIFY(con.isConnected());
++
++ delete server;
++
++ // Make sure we call the method before we know it is disconnected.
++ QVERIFY(con.isConnected());
++ QDBusMessage message = QDBusMessage::createMethodCall("", "/", QString(), "method");
++ QDBusPendingCall reply = con.asyncCall(message);
++
++ QTestEventLoop::instance().enterLoop(2);
++ QVERIFY(!con.isConnected());
++ QVERIFY(reply.isFinished());
++ QVERIFY(reply.isError());
++ QVERIFY(reply.error().type() == QDBusError::Disconnected);
++}
++
+ QString MyObject::path;
+ QString MyObjectWithoutInterface::path;
+ QString MyObjectWithoutInterface::interface;
+diff --git a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
+index a53ba32..720e484 100644
+--- a/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
++++ b/tests/auto/dbus/qdbusconnection/tst_qdbusconnection.h
+@@ -121,6 +121,7 @@ private slots:
+ void registerVirtualObject();
+ void callVirtualObject();
+ void callVirtualObjectLocal();
++ void pendingCallWhenDisconnected();
+
+ public:
+ QString serviceName() const { return "org.qtproject.Qt.Autotests.QDBusConnection"; }
+--
+2.7.1
+
diff --git a/deps/qt5/patches/qt5.qtbug-51676.patch b/deps/qt5/patches/qt5.qtbug-51676.patch
new file mode 100644
index 0000000..8672a21
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-51676.patch
@@ -0,0 +1,126 @@
+From 11c5e716b08b6b3c5a7c9fce96b0cde8624ec869 Mon Sep 17 00:00:00 2001
+From: Thiago Macieira <thiago.macieira@intel.com>
+Date: Tue, 15 Mar 2016 11:00:20 -0700
+Subject: [PATCH] Fix QtDBus deadlock inside kded/kiod
+
+Whenever a message spy was installed, we failed to actually process
+looped-back messages by queueing them for processing by the spy. That
+had as a consequence that the caller got an error reply. Worse, since
+the message had been queued, QtDBus would attempt to deliver it later.
+Since that message had isLocal==true, bad things happened inside the
+manager thread.
+
+The correct solution is not to queue the message for the filter. If the
+message is local, then simply deliver directly, as we're still in the
+user's thread. This used to be the behavior in Qt 5.5.
+
+Task-number: QTBUG-51676
+Change-Id: I1dc112894cde7121e8ce302ae51b438ade1ff612
+---
+ src/dbus/qdbusintegrator.cpp | 42 ++++++++++++++++++++++++++++++++----------
+ src/dbus/qdbusintegrator_p.h | 1 +
+ 2 files changed, 33 insertions(+), 10 deletions(-)
+
+diff --git a/src/dbus/qdbusintegrator.cpp b/src/dbus/qdbusintegrator.cpp
+index cd44861..478a2c4 100644
+--- a/src/dbus/qdbusintegrator.cpp
++++ b/src/dbus/qdbusintegrator.cpp
+@@ -481,6 +481,11 @@ QDBusSpyCallEvent::~QDBusSpyCallEvent()
+
+ void QDBusSpyCallEvent::placeMetaCall(QObject *)
+ {
++ invokeSpyHooks(msg, hooks, hookCount);
++}
++
++inline void QDBusSpyCallEvent::invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount)
++{
+ // call the spy hook list
+ for (int i = 0; i < hookCount; ++i)
+ hooks[i](msg);
+@@ -509,7 +514,12 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
+ {
+ if (!ref.load())
+ return false;
+- if (!dispatchEnabled && !QDBusMessagePrivate::isLocal(amsg)) {
++
++ // local message are always delivered, regardless of filtering
++ // or whether the dispatcher is enabled
++ bool isLocal = QDBusMessagePrivate::isLocal(amsg);
++
++ if (!dispatchEnabled && !isLocal) {
+ // queue messages only, we'll handle them later
+ qDBusDebug() << this << "delivery is suspended";
+ pendingMessages << amsg;
+@@ -523,13 +533,23 @@ bool QDBusConnectionPrivate::handleMessage(const QDBusMessage &amsg)
+ // let them see the signal too
+ return false;
+ case QDBusMessage::MethodCallMessage:
+- // run it through the spy filters (if any) before the regular processing
++ // run it through the spy filters (if any) before the regular processing:
++ // a) if it's a local message, we're in the caller's thread, so invoke the filter directly
++ // b) if it's an external message, post to the main thread
+ if (Q_UNLIKELY(qDBusSpyHookList.exists()) && qApp) {
+ const QDBusSpyHookList &list = *qDBusSpyHookList;
+- qDBusDebug() << this << "invoking message spies";
+- QCoreApplication::postEvent(qApp, new QDBusSpyCallEvent(this, QDBusConnection(this),
+- amsg, list.constData(), list.size()));
+- return true;
++ if (isLocal) {
++ Q_ASSERT(QThread::currentThread() != thread());
++ qDBusDebug() << this << "invoking message spies directly";
++ QDBusSpyCallEvent::invokeSpyHooks(amsg, list.constData(), list.size());
++ } else {
++ qDBusDebug() << this << "invoking message spies via event";
++ QCoreApplication::postEvent(qApp, new QDBusSpyCallEvent(this, QDBusConnection(this),
++ amsg, list.constData(), list.size()));
++
++ // we'll be called back, so return
++ return true;
++ }
+ }
+
+ handleObjectCall(amsg);
+@@ -1451,9 +1471,9 @@ void QDBusConnectionPrivate::handleObjectCall(const QDBusMessage &msg)
+ // that means the dispatchLock mutex is locked
+ // must not call out to user code in that case
+ //
+- // however, if the message is internal, handleMessage was called
+- // directly and no lock is in place. We can therefore call out to
+- // user code, if necessary
++ // however, if the message is internal, handleMessage was called directly
++ // (user's thread) and no lock is in place. We can therefore call out to
++ // user code, if necessary.
+ ObjectTreeNode result;
+ int usedLength;
+ QThread *objThread = 0;
+@@ -1492,12 +1512,14 @@ void QDBusConnectionPrivate::handleObjectCall(const QDBusMessage &msg)
+ usedLength, msg));
+ return;
+ } else if (objThread != QThread::currentThread()) {
+- // synchronize with other thread
++ // looped-back message, targeting another thread:
++ // synchronize with it
+ postEventToThread(HandleObjectCallPostEventAction, result.obj,
+ new QDBusActivateObjectEvent(QDBusConnection(this), this, result,
+ usedLength, msg, &sem));
+ semWait = true;
+ } else {
++ // looped-back message, targeting current thread
+ semWait = false;
+ }
+ } // release the lock
+diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h
+index 2bbebdf..c0d9c22 100644
+--- a/src/dbus/qdbusintegrator_p.h
++++ b/src/dbus/qdbusintegrator_p.h
+@@ -145,6 +145,7 @@ public:
+ {}
+ ~QDBusSpyCallEvent();
+ void placeMetaCall(QObject *) Q_DECL_OVERRIDE;
++ static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount);
+
+ QDBusConnection conn; // keeps the refcount in QDBusConnectionPrivate up
+ QDBusMessage msg;
+--
+2.7.1
+
diff --git a/deps/qt5/patches/qt5.qtbug-51890.patch b/deps/qt5/patches/qt5.qtbug-51890.patch
new file mode 100644
index 0000000..51168b9
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-51890.patch
@@ -0,0 +1,82 @@
+QTBUG-51890: qtwebengine fails to build with system nss 3.23
+Patch obtained from:
+https://github.com/qtproject/qtwebengine/commit/82900c7b96b2a6fb42fe3841df7685b820edd588.patch
+
+And modified to exclude the "Subproject commit" lines.
+
+# ----------------------------------------------------------------------------
+
+From 82900c7b96b2a6fb42fe3841df7685b820edd588 Mon Sep 17 00:00:00 2001
+From: Kai Koehne <kai.koehne@theqtcompany.com>
+Date: Thu, 24 Mar 2016 13:55:28 +0100
+Subject: [PATCH] Use system NSS only for certificate handling
+
+Compiling against NSS 3.23 fails with current Chromium. Also, with NSS
+3.21 there are failures connecting to e.g. google.com.
+
+Fix this by adapting the setup endorsed by upstream Chromium: BoringSSL
+is always used for cryptography, and NSS only for certificate handlng.
+
+Patches included in 3rdparty update:
+
+0a385bb [backport] Call EnsureNSSHttpIOInit in the chimera build.
+0472123 Fix build against newer NSS
+90c62c4 <third_party/libpng> [Backport] update to libpng 1.2.56
+34857b8 <third_party/libpng> [Backport] Stop large iCCP chunks causing delays and "Aw Snap!"
+
+Task-number: QTBUG-52193
+Task-number: QTBUG-51890
+Task-number: QTBUG-52068
+Change-Id: If8aaed9b9a09475c5ed0dfec64d31f45ce9670f5
+Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
+---
+ src/3rdparty | 2 +-
+ src/core/config/linux.pri | 9 ++++++---
+ tools/qmake/mkspecs/features/configure.prf | 4 ++--
+ 3 files changed, 9 insertions(+), 6 deletions(-)
+
+#diff --git a/src/3rdparty b/src/3rdparty
+#index 3b2b78c..0a385bb 160000
+#--- a/src/3rdparty
+#+++ b/src/3rdparty
+#@@ -1 +1 @@
+#-Subproject commit 3b2b78caa761db2b7b25dc51c3dae8316f595db1
+#+Subproject commit 0a385bb01d9cf060fae4c9d350ee98561654df96
+diff --git a/src/core/config/linux.pri b/src/core/config/linux.pri
+index 88c1a41..39eeb2a 100644
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -18,11 +18,14 @@ GYP_CONFIG += \
+ use_gio=0 \
+ use_gnome_keyring=0 \
+ use_kerberos=0 \
+- use_pango=0
++ use_pango=0 \
++ use_openssl=1
+
+-!use?(nss) {
++use?(nss) {
++ GYP_CONFIG += use_nss_certs=1 \
++ use_openssl_certs=0
++} else {
+ GYP_CONFIG += use_nss_certs=0 \
+- use_openssl=1 \
+ use_openssl_certs=1
+ }
+
+diff --git a/tools/qmake/mkspecs/features/configure.prf b/tools/qmake/mkspecs/features/configure.prf
+index 4cb4600..953572d 100644
+--- a/tools/qmake/mkspecs/features/configure.prf
++++ b/tools/qmake/mkspecs/features/configure.prf
+@@ -72,9 +72,9 @@ defineTest(runConfigure) {
+ defineTest(finalizeConfigure) {
+ linux {
+ use?(nss) {
+- log("SSL............................... Using system NSS$${EOL}")
++ log("Certificate handling.............. Using system NSS$${EOL}")
+ } else {
+- log("SSL............................... Using bundled BoringSSL$${EOL}")
++ log("Certificate handling.............. Using bundled BoringSSL$${EOL}")
+ }
+ use?(system_icu) {
+ packagesExist("icu-uc icu-i18n") {
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 83efd87..d5c57cc 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -45,10 +45,11 @@
# Modifications for qt 5.4.0 2015 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.4.1 2015 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.5.1 2015,2016 by Eric Hameleers, Eindhoven, NL
+# Modifications for qt 5.6.0 2016 by Eric Hameleers, Eindhoven, NL
PKGNAM=qt5
-VERSION=${VERSION:-5.5.1}
-BUILD=${BUILD:-5}
+VERSION=${VERSION:-5.6.0}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
@@ -131,12 +132,24 @@ fi
cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
# Properly detect ALSA version 1.1.0 as being newer than 1.0.10:
-cd qtmultimedia
- cat $CWD/patches/qt5.alsa.patch | patch -p0 --verbose || exit 1
+cat $CWD/patches/qt5.alsa.patch | patch -p1 --verbose || exit 1
+
+# Build with explicitlib, preventing linker errors:
+cd qtbase
+ cat $CWD/patches/qt5.qtbug-51621.patch | patch -p1 --verbose || exit 1
cd -
-# Prevent cropped video in full-screen mode (QTBUG-48321):
-cat $CWD/patches/qt5.whandle.patch | patch -p1 --verbose || exit 1
+# Backport fixes for QtDBus deadlocks:
+cd qtbase
+ cat $CWD/patches/qt5.qtbug-51648.patch | patch -p1 --verbose || exit 1
+ cat $CWD/patches/qt5.qtbug-51649.patch | patch -p1 --verbose || exit 1
+ cat $CWD/patches/qt5.qtbug-51676.patch | patch -p1 --verbose || exit 1
+cd -
+
+# qtwebengine fails to build with system nss 3.23:
+cd qtwebengine
+ cat $CWD/patches/qt5.qtbug-51890.patch | patch -p1 --verbose || exit 1
+cd -
if ! pkg-config --exists libpulse 2>/dev/null ; then
# Forcibly disable pulseaudio in qtwebengine:
@@ -147,10 +160,6 @@ else
PACONF=" "
fi
-# Install path fix for libplatformplugin.so:
-# See https://bugs.webkit.org/show_bug.cgi?id=117077
-cat $CWD/patches/platformplugin-install-path-fix.patch | patch -p1 --verbose || exit 1
-
sed -i -e "s/-O2/$SLKCFLAGS/" qtbase/mkspecs/common/g++-base.conf || exit 1
sed -i -e "s/-O2/$SLKCFLAGS/" qtbase/mkspecs/common/gcc-base.conf || exit 1
sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" qtbase/mkspecs/common/gcc-base.conf || exit 1
diff --git a/deps/telepathy/farstream/farstream.SlackBuild b/deps/telepathy/farstream/farstream.SlackBuild
index 1986f75..1537cd9 100755
--- a/deps/telepathy/farstream/farstream.SlackBuild
+++ b/deps/telepathy/farstream/farstream.SlackBuild
@@ -24,8 +24,8 @@
# Modified 2015 by Eric Hameleers <alien@slackware.com>
PKGNAM=farstream
-VERSION=${VERSION:-0.2.7}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.2.8}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/farstream/farstream.url b/deps/telepathy/farstream/farstream.url
new file mode 100644
index 0000000..41fe18e
--- /dev/null
+++ b/deps/telepathy/farstream/farstream.url
@@ -0,0 +1 @@
+https://freedesktop.org/software/farstream/releases/farstream/farstream-0.2.8.tar.gz
diff --git a/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild b/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
index a0d5296..bd76bed 100755
--- a/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
+++ b/deps/telepathy/libaccounts-glib/libaccounts-glib.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -23,8 +23,8 @@
PKGNAM=libaccounts-glib
-VERSION=${VERSION:-"02d16e50_20150911git"}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-"1.21"}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/libaccounts-glib/libaccounts-glib.url b/deps/telepathy/libaccounts-glib/libaccounts-glib.url
new file mode 100644
index 0000000..1e3715e
--- /dev/null
+++ b/deps/telepathy/libaccounts-glib/libaccounts-glib.url
@@ -0,0 +1 @@
+https://gitlab.com/accounts-sso/libaccounts-glib/repository/archive.zip?ref=master
diff --git a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.SlackBuild
index a4e4380..7dc8fb2 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 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -24,8 +24,8 @@
PKGNAM=libaccounts-qt5
SRCNAM=libaccounts-qt
-VERSION=${VERSION:-"13d1af2a_20150911git"}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-"627a089_20151106git"}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.url b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.url
index b58b1fb..b4015f3 100644
--- a/deps/telepathy/libaccounts-qt5/libaccounts-qt5.url
+++ b/deps/telepathy/libaccounts-qt5/libaccounts-qt5.url
@@ -1,2 +1,2 @@
-https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.gz?ref=13d1af2a8b8007526bb1e7d4058ec86229b08ada
+https://gitlab.com/accounts-sso/libaccounts-qt/repository/archive.tar.gz?ref=627a0898899d8dc356095d5a3123bae709db8bc0
diff --git a/deps/telepathy/libnice/libnice.url b/deps/telepathy/libnice/libnice.url
new file mode 100644
index 0000000..32ff125
--- /dev/null
+++ b/deps/telepathy/libnice/libnice.url
@@ -0,0 +1 @@
+https://nice.freedesktop.org/releases/libnice-0.1.13.tar.gz
diff --git a/deps/telepathy/libotr/libotr.SlackBuild b/deps/telepathy/libotr/libotr.SlackBuild
index 470075a..7af1e2b 100755
--- a/deps/telepathy/libotr/libotr.SlackBuild
+++ b/deps/telepathy/libotr/libotr.SlackBuild
@@ -23,8 +23,8 @@
PKGNAM=libotr
-VERSION=${VERSION:-4.1.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.1.1}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/deps/telepathy/libotr/libotr.url b/deps/telepathy/libotr/libotr.url
index f3a49a1..d538b2a 100644
--- a/deps/telepathy/libotr/libotr.url
+++ b/deps/telepathy/libotr/libotr.url
@@ -1 +1 @@
-https://otr.cypherpunks.ca/libotr-4.1.0.tar.gz
+https://otr.cypherpunks.ca/libotr-4.1.1.tar.gz
diff --git a/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild b/deps/telepathy/libsignon-glib/libsignon-glib.SlackBuild
index 6ab0c4d..2c6cfcf 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 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -23,8 +23,8 @@
PKGNAM=libsignon-glib
-VERSION=${VERSION:-"1.12"}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-"1.13"}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/deps/telepathy/libsignon-glib/libsignon-glib.url b/deps/telepathy/libsignon-glib/libsignon-glib.url
index cd018ce..2c6f064 100644
--- a/deps/telepathy/libsignon-glib/libsignon-glib.url
+++ b/deps/telepathy/libsignon-glib/libsignon-glib.url
@@ -1 +1,2 @@
-https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=1.12
+#https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=1.13
+https://gitlab.com/accounts-sso/libsignon-glib/repository/archive.tar.gz?ref=b74889415b725211c46f107103577bdaddcbd1d5
diff --git a/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild b/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild
index ae9fe4e..cb6a9bc 100755
--- a/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild
+++ b/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -23,8 +23,8 @@
PKGNAM=signon-plugin-oauth2
-VERSION=${VERSION:-"7b8274da_20150911git"}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-"3dec32c_20160414git"}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.url b/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.url
index 85c0620..3c331e3 100644
--- a/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.url
+++ b/deps/telepathy/signon-plugin-oauth2/signon-plugin-oauth2.url
@@ -1 +1 @@
-https://gitlab.com/accounts-sso/signon-plugin-oauth2/repository/archive.tar.gz?ref=7b8274da7876bfa7cc6a10bb5d919495dcd03e82
+https://gitlab.com/accounts-sso/signon-plugin-oauth2/repository/archive.tar.gz?ref=3dec32c5c640838db827a962c7866e6983657e1c
diff --git a/deps/telepathy/signon-ui/signon-ui.SlackBuild b/deps/telepathy/signon-ui/signon-ui.SlackBuild
index ac1b400..a14e177 100755
--- a/deps/telepathy/signon-ui/signon-ui.SlackBuild
+++ b/deps/telepathy/signon-ui/signon-ui.SlackBuild
@@ -25,7 +25,7 @@
PKGNAM=signon-ui
SRCNAM=signon-ui
VERSION=${VERSION:-"0.17+15.10.20150810"}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/signon/signon.SlackBuild b/deps/telepathy/signon/signon.SlackBuild
index 177792b..ba32513 100755
--- a/deps/telepathy/signon/signon.SlackBuild
+++ b/deps/telepathy/signon/signon.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -24,8 +24,8 @@
PKGNAM=signon
SRCNAM=signond
-VERSION=${VERSION:-"d09cb035_20150911git"}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-"49e13c1_20160414git"}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/signon/signon.url b/deps/telepathy/signon/signon.url
index dafaf53..313e4d5 100644
--- a/deps/telepathy/signon/signon.url
+++ b/deps/telepathy/signon/signon.url
@@ -1 +1 @@
-https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=d09cb03532a4d9c0a49f3630eae9c053cbb98f56
+https://gitlab.com/accounts-sso/signond/repository/archive.tar.gz?ref=49e13c1b5aae35278168984fb1a7c0fc1ad8883e
diff --git a/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild b/deps/telepathy/telepathy-accounts-signon/telepathy-accounts-signon.SlackBuild
index 44adbf7..551a776 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 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -24,7 +24,7 @@
PKGNAM=telepathy-accounts-signon
VERSION=${VERSION:-"1.0"}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild b/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild
index f5cf4df..fbc79be 100755
--- a/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild
+++ b/deps/telepathy/telepathy-farstream/telepathy-farstream.SlackBuild
@@ -21,12 +21,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified 2015 by Eric Hameleers <alien@slackware.com>
+# Modified 2015, 2016 by Eric Hameleers <alien@slackware.com>
PKGNAM=telepathy-farstream
VERSION=${VERSION:-0.6.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild b/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
index d6d5795..923c085 100755
--- a/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
+++ b/deps/telepathy/telepathy-gabble/telepathy-gabble.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -24,7 +24,7 @@
PKGNAM=telepathy-gabble
VERSION=${VERSION:-"0.18.3"}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild b/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild
index 714f5fe..bfc748f 100755
--- a/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild
+++ b/deps/telepathy/telepathy-glib/telepathy-glib.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -24,7 +24,7 @@
PKGNAM=telepathy-glib
VERSION=${VERSION:-"0.24.1"}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-haze/patches/telepathy-haze.libpurple.patch b/deps/telepathy/telepathy-haze/patches/telepathy-haze.libpurple.patch
new file mode 100644
index 0000000..c2aa0c3
--- /dev/null
+++ b/deps/telepathy/telepathy-haze/patches/telepathy-haze.libpurple.patch
@@ -0,0 +1,11 @@
+--- telepathy-haze-0.8.0/src/media-stream.c.orig 2013-09-23 18:51:19.000000000 +0200
++++ telepathy-haze-0.8.0/src/media-stream.c 2016-04-17 17:11:03.995364296 +0200
+@@ -1076,7 +1076,7 @@
+ if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP)
+ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP;
+ else if (proto == TP_MEDIA_STREAM_BASE_PROTO_TCP)
+- protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP;
++ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE;
+ else
+ DEBUG ("Unknown network protocol");
+
diff --git a/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild b/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild
index cbf12bc..d238aa9 100755
--- a/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild
+++ b/deps/telepathy/telepathy-haze/telepathy-haze.SlackBuild
@@ -72,6 +72,10 @@ cd $TMP
rm -rf $PKGNAM-$VERSION
tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
cd $PKGNAM-$VERSION || exit 1
+
+# libpurple changed protocol:
+cat $CWD/patches/telepathy-haze.libpurple.patch | patch -p1 --verbose || exit 1
+
chown -R root:root .
find . \
\( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild b/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild
index fd988b4..9de0fab 100755
--- a/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild
+++ b/deps/telepathy/telepathy-logger-qt5/telepathy-logger-qt5.SlackBuild
@@ -21,13 +21,13 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified 2015 by Eric Hameleers <alien@slackware.com>
+# Modified 2015, 2016 by Eric Hameleers <alien@slackware.com>
PKGNAM=telepathy-logger-qt5
SRCNAM=telepathy-logger-qt
VERSION=${VERSION:-15.04.0}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild b/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
index 94651de..f43b321 100755
--- a/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
+++ b/deps/telepathy/telepathy-logger/telepathy-logger.SlackBuild
@@ -21,12 +21,12 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified 2015 by Eric Hameleers <alien@slackware.com>
+# Modified 2015, 2016 by Eric Hameleers <alien@slackware.com>
PKGNAM=telepathy-logger
VERSION=${VERSION:-0.8.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild b/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
index a6461c5..260ff63 100755
--- a/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
+++ b/deps/telepathy/telepathy-mission-control/telepathy-mission-control.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -24,7 +24,7 @@
PKGNAM=telepathy-mission-control
VERSION=${VERSION:-"5.16.3"}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild b/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild
index 301df81..4002753 100755
--- a/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild
+++ b/deps/telepathy/telepathy-qt5/telepathy-qt5.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
-# Copyright 2015 Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL
# Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
@@ -25,7 +25,7 @@
PKGNAM=telepathy-qt5
SRCNAM=telepathy-qt
VERSION=${VERSION:-0.9.6.1}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:--j7}
diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild
index b538e04..f5c5f55 100755
--- a/deps/updates.SlackBuild
+++ b/deps/updates.SlackBuild
@@ -15,9 +15,11 @@ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt ; export QTDIR
ALLDEPS=" \
extra-cmake-modules \
+ ninja \
sni-qt \
OpenAL \
qt5 \
+ qt5-webkit \
qca-qt5 \
libdbusmenu-qt5 \
qt-gstreamer \