From b34d35ccdc6282b4584693786980c8d6ed6708f8 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 11 Sep 2017 23:04:42 +0200
Subject: Updated deps for KDE 5_17.09

---
 deps/OpenAL/.url                                   |   2 +-
 deps/OpenAL/OpenAL.SlackBuild                      |  73 ++++----
 deps/PyQt5/.url                                    |   2 +-
 deps/PyQt5/PyQt5.SlackBuild                        |  22 +--
 deps/alldeps.SlackBuild                            |   2 +
 deps/cfitsio/.url                                  |   2 +
 deps/cfitsio/cfitsio.SlackBuild                    |   4 +-
 deps/ddcutil/.url                                  |   2 +
 deps/ddcutil/ddcutil.SlackBuild                    | 122 +++++++++++++
 deps/ddcutil/slack-desc                            |  20 +++
 deps/dvdauthor/dvdauthor.SlackBuild                |   4 +-
 deps/frei0r-plugins/.url                           |   2 +-
 deps/frei0r-plugins/frei0r-plugins.SlackBuild      |   2 +-
 deps/id3lib/.url                                   |   2 +
 deps/id3lib/id3lib.SlackBuild                      | 143 +++++++++++++++
 deps/id3lib/patches/id3lib.c_wrapper.patch         |  58 ++++++
 deps/id3lib/patches/id3lib.cppheaders.patch        |  22 +++
 deps/id3lib/patches/id3lib.manpages.patch          | 198 +++++++++++++++++++++
 deps/id3lib/patches/id3lib.mkstemp.patch           |  54 ++++++
 deps/id3lib/patches/id3lib.nullpointer_check.patch |  12 ++
 deps/id3lib/patches/id3lib.utf8_writing.patch      |  38 ++++
 deps/id3lib/patches/id3lib.vbr_stack_smash.patch   |  19 ++
 deps/id3lib/slack-desc                             |  20 +++
 deps/json-glib/json-glib.SlackBuild                |   2 +-
 deps/libappindicator/libappindicator.SlackBuild    |   2 +-
 deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild    |   2 +-
 deps/libdmtx/libdmtx.SlackBuild                    |   2 +-
 deps/libindicator/libindicator.SlackBuild          |   2 +-
 deps/libinput/libinput.SlackBuild                  |   2 +-
 deps/libwacom/libwacom.SlackBuild                  |   2 +-
 deps/libxkbcommon/.url                             |   2 +-
 deps/libxkbcommon/libxkbcommon.SlackBuild          |  59 +++---
 deps/lmdb/.url                                     |   2 +-
 deps/lmdb/lmdb.SlackBuild                          |   6 +-
 deps/mlt/mlt.SlackBuild                            |   8 +-
 deps/mlt/patches/mlt_glibc226.patch                |  28 +++
 deps/mlt/patches/mlt_repository_close.patch        |  25 +++
 deps/phonon-gstreamer/phonon-gstreamer.SlackBuild  |   2 +-
 deps/phonon-vlc/phonon-vlc.SlackBuild              |   2 +-
 deps/poppler/.url                                  |   2 +-
 deps/poppler/poppler.SlackBuild                    |   8 +-
 deps/qrencode/qrencode.SlackBuild                  |   2 +-
 deps/qt5-webkit/.url                               |   2 +-
 deps/qt5-webkit/patches/qt5-webkit.gcc7.patch      |  34 ++++
 deps/qt5-webkit/patches/qt5-webkit.icu59.patch     |  80 +++++++++
 deps/qt5-webkit/qt5-webkit.SlackBuild              |  16 +-
 deps/qt5/.url                                      |   2 +-
 deps/qt5/qt5.SlackBuild                            |  13 +-
 deps/sip/.url                                      |   2 +-
 deps/sip/sip.SlackBuild                            |  13 +-
 deps/updates.SlackBuild                            |   2 +
 deps/wayland/.url                                  |   2 +-
 deps/wayland/wayland.SlackBuild                    |  67 ++++---
 53 files changed, 1046 insertions(+), 172 deletions(-)
 create mode 100644 deps/cfitsio/.url
 create mode 100644 deps/ddcutil/.url
 create mode 100755 deps/ddcutil/ddcutil.SlackBuild
 create mode 100644 deps/ddcutil/slack-desc
 create mode 100644 deps/id3lib/.url
 create mode 100755 deps/id3lib/id3lib.SlackBuild
 create mode 100644 deps/id3lib/patches/id3lib.c_wrapper.patch
 create mode 100644 deps/id3lib/patches/id3lib.cppheaders.patch
 create mode 100644 deps/id3lib/patches/id3lib.manpages.patch
 create mode 100644 deps/id3lib/patches/id3lib.mkstemp.patch
 create mode 100644 deps/id3lib/patches/id3lib.nullpointer_check.patch
 create mode 100644 deps/id3lib/patches/id3lib.utf8_writing.patch
 create mode 100644 deps/id3lib/patches/id3lib.vbr_stack_smash.patch
 create mode 100644 deps/id3lib/slack-desc
 create mode 100644 deps/mlt/patches/mlt_glibc226.patch
 create mode 100644 deps/mlt/patches/mlt_repository_close.patch
 create mode 100644 deps/qt5-webkit/patches/qt5-webkit.gcc7.patch
 create mode 100644 deps/qt5-webkit/patches/qt5-webkit.icu59.patch

(limited to 'deps')

diff --git a/deps/OpenAL/.url b/deps/OpenAL/.url
index 1174201..2063047 100644
--- a/deps/OpenAL/.url
+++ b/deps/OpenAL/.url
@@ -1,2 +1,2 @@
-http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.0.tar.bz2
+http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.1.tar.bz2
 
diff --git a/deps/OpenAL/OpenAL.SlackBuild b/deps/OpenAL/OpenAL.SlackBuild
index be1a359..eba886e 100755
--- a/deps/OpenAL/OpenAL.SlackBuild
+++ b/deps/OpenAL/OpenAL.SlackBuild
@@ -25,52 +25,47 @@
 
 PKGNAM=OpenAL
 SRCNAM=openal-soft
-VERSION=${VERSION:-1.18.0}
+VERSION=${VERSION:-1.18.1}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-if [ -e $CWD/machine.conf ]; then
-  . $CWD/machine.conf ]
-elif [ -e /etc/slackbuild/machine.conf ]; then
-  . /etc/slackbuild/machine.conf ]
+# 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
+
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv5te"
+  LIBDIRSUFFIX=""
 else
-  # Automatically determine the architecture we're building on:
-  MARCH=$( uname -m )
-  if [ -z "$ARCH" ]; then
-    case "$MARCH" in
-      i?86)    export ARCH=i586 ;;
-      arm*)    export ARCH=arm ;;
-      # Unless $ARCH is already set, use uname -m for all other archs:
-      *)       export ARCH=$MARCH ;;
-    esac
-  fi
-  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
-  if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "i586" ]; then
-    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "s390" ]; then
-    SLKCFLAGS="-O2"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "x86_64" ]; then
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-  elif [ "$ARCH" = "arm" ]; then
-    SLKCFLAGS="-O2 -march=armv5te"
-    LIBDIRSUFFIX=""
-  else
-    SLKCFLAGS="-O2"
-    LIBDIRSUFFIX=""
-  fi
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 rm -rf $PKG
diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url
index ae0f121..77e7669 100644
--- a/deps/PyQt5/.url
+++ b/deps/PyQt5/.url
@@ -1,2 +1,2 @@
-https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.8.2/PyQt5_gpl-5.8.2.tar.gz
+https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.9/PyQt5_gpl-5.9.tar.gz
 
diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild
index 9da188a..f0fd6c7 100755
--- a/deps/PyQt5/PyQt5.SlackBuild
+++ b/deps/PyQt5/PyQt5.SlackBuild
@@ -27,27 +27,26 @@
 # Modified by Eric Hameleers <alien@slackware.com>
 
 PKGNAM=PyQt5
-VERSION=${VERSION:-5.8.2}
+VERSION=${VERSION:-5.9}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
 
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  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:
-    *)       export ARCH=$MARCH ;;
+    *) 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"
 elif [ "$ARCH" = "i586" ]; then
@@ -86,6 +85,7 @@ export CXXFLAGS="$SLKCFLAGS"
 python configure.py \
   --confirm-license \
   --verbose \
+  --qsci-api \
   -q /usr/bin/qmake-qt5 \
   || exit 1
 
diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild
index 25e4814..9a722dd 100755
--- a/deps/alldeps.SlackBuild
+++ b/deps/alldeps.SlackBuild
@@ -63,6 +63,8 @@ ALLDEPS=" \
   accountsservice \
   libburn \
   qtav \
+  ddcutil \
+  id3lib \
   "
   # Only needed when adding support for Wayland:
   #elogind \
diff --git a/deps/cfitsio/.url b/deps/cfitsio/.url
new file mode 100644
index 0000000..9e1b756
--- /dev/null
+++ b/deps/cfitsio/.url
@@ -0,0 +1,2 @@
+http://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/cfitsio3410.tar.gz
+
diff --git a/deps/cfitsio/cfitsio.SlackBuild b/deps/cfitsio/cfitsio.SlackBuild
index 70377f2..70efe61 100755
--- a/deps/cfitsio/cfitsio.SlackBuild
+++ b/deps/cfitsio/cfitsio.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2015  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2017  Eric Hameleers, Eindhoven, NL
 # Copyright 2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -22,7 +22,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=cfitsio
-VERSION=${VERSION:-3.370}
+VERSION=${VERSION:-3.410}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
diff --git a/deps/ddcutil/.url b/deps/ddcutil/.url
new file mode 100644
index 0000000..b24f07b
--- /dev/null
+++ b/deps/ddcutil/.url
@@ -0,0 +1,2 @@
+https://github.com/rockowitz/ddcutil/archive/v0.8.4.tar.gz
+
diff --git a/deps/ddcutil/ddcutil.SlackBuild b/deps/ddcutil/ddcutil.SlackBuild
new file mode 100755
index 0000000..2610b71
--- /dev/null
+++ b/deps/ddcutil/ddcutil.SlackBuild
@@ -0,0 +1,122 @@
+#!/bin/sh
+
+# Copyright 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2017  Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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=ddcutil
+VERSION=${VERSION:-0.8.4}
+BUILD=${BUILD:-1}
+
+CWD=$(pwd)
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+# 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" = "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 {} \;
+
+# Configure:
+[ ! -x configure ] && ./autogen.sh
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
+  --disable-static \
+  --build=$TARGET
+
+# Build and install:
+make || exit 1
+make DESTDIR=$PKG install || exit 1
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS CONTRIBUTORS COPYING COPYRIGHT ChangeLog NEWS README \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" \
+  | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress man pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
+# Add a package description:
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz
+
diff --git a/deps/ddcutil/slack-desc b/deps/ddcutil/slack-desc
new file mode 100644
index 0000000..2f767f8
--- /dev/null
+++ b/deps/ddcutil/slack-desc
@@ -0,0 +1,20 @@
+# 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------------------------------------------------------|
+ddcutil: ddcutil (query and change monitor settings)
+ddcutil:
+ddcutil: ddcutil is a Linux program for querying and changing monitor settings,
+ddcutil: such as brightness and color levels.
+ddcutil: ddcutil primarily uses DDC/CI (Display Data Channel Command Interface)
+ddcutil: to communicate with monitors implementing MCCS (Monitor Control
+ddcutil: Command Set) over I2C.
+ddcutil: Alternatively, there is support for monitors that implement MCCS
+ddcutil: using a USB connection. 
+ddcutil:
+ddcutil: See also: http://ddcutil.com/
+
diff --git a/deps/dvdauthor/dvdauthor.SlackBuild b/deps/dvdauthor/dvdauthor.SlackBuild
index ebbd328..401e01c 100755
--- a/deps/dvdauthor/dvdauthor.SlackBuild
+++ b/deps/dvdauthor/dvdauthor.SlackBuild
@@ -26,8 +26,8 @@
 
 PKGNAM=dvdauthor
 VERSION=${VERSION:-0.7.2}
-BUILD=${BUILD:-2}
-NUMJOBS=${NUMJOBS:" -j4 "}
+BUILD=${BUILD:-3}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/frei0r-plugins/.url b/deps/frei0r-plugins/.url
index dc681c0..f4c3742 100644
--- a/deps/frei0r-plugins/.url
+++ b/deps/frei0r-plugins/.url
@@ -1 +1 @@
-https://files.dyne.org/frei0r/frei0r-plugins-1.6.0.tar.gz
+https://files.dyne.org/frei0r/frei0r-plugins-1.6.1.tar.gz
diff --git a/deps/frei0r-plugins/frei0r-plugins.SlackBuild b/deps/frei0r-plugins/frei0r-plugins.SlackBuild
index b51faa1..6e91161 100755
--- a/deps/frei0r-plugins/frei0r-plugins.SlackBuild
+++ b/deps/frei0r-plugins/frei0r-plugins.SlackBuild
@@ -25,7 +25,7 @@
 
 
 PKGNAM=frei0r-plugins
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 
 CWD=$(pwd)
diff --git a/deps/id3lib/.url b/deps/id3lib/.url
new file mode 100644
index 0000000..631ec03
--- /dev/null
+++ b/deps/id3lib/.url
@@ -0,0 +1,2 @@
+http://downloads.sourceforge.net/id3lib/id3lib-3.8.3.tar.gz
+
diff --git a/deps/id3lib/id3lib.SlackBuild b/deps/id3lib/id3lib.SlackBuild
new file mode 100755
index 0000000..e6b3847
--- /dev/null
+++ b/deps/id3lib/id3lib.SlackBuild
@@ -0,0 +1,143 @@
+#!/bin/sh
+
+# Copyright 2017  Eric Hameleers, Eindhoven, NL
+# Copyright 2017 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=id3lib
+VERSION=${VERSION:-3.8.3}
+BUILD=${BUILD:-1}
+
+# 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="64"
+  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
+
+# Patches obtained from Arch who obtained them from Debian and elsewhere -
+# Use proper C++ headers:
+cat $CWD/patches/id3lib.cppheaders.patch | patch -p1 --verbose || exit 1
+# Add man pages:
+cat $CWD/patches/id3lib.manpages.patch | patch -p1 --verbose || exit 1
+# Write UTF8/UTF16 characters correctly:
+cat $CWD/patches/id3lib.utf8_writing.patch | patch -p1 --verbose || exit 1
+# Securely use mkstemp:
+cat $CWD/patches/id3lib.mkstemp.patch | patch -p1 --verbose || exit 1
+# Add C wrapper functions for field encoding:
+cat $CWD/patches/id3lib.c_wrapper.patch | patch -p1 --verbose || exit 1
+# Add a null pointer check:
+cat $CWD/patches/id3lib.nullpointer_check.patch | patch -p1 --verbose || exit 1
+# Fix stack smash crashes when reading VBR MP3:
+cat $CWD/patches/id3lib.vbr_stack_smash.patch | patch -p1 --verbose || exit 1
+
+# iomanip.h is obsolete; use the standard C++ header:
+sed -e "s%iomanip.h%iomanip%g" -i configure
+
+# Make sure ownerships and permissions are sane:
+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 {} \;
+
+# Configure:
+[ ! -x configure ] && ./autogen.sh
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+LDFLAGS="$SLKLDFLAGS" \
+./configure \
+  --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --mandir=/usr/man \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --enable-static=no \
+  --enable-debug=no \
+  --build=$TARGET
+
+# Build and install:
+make || exit 1
+make install DESTDIR=$PKG || exit 1
+
+# 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 || true
+
+# Add documentation:
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+  AUTHORS COPYING ChangeLog HISTORY NEWS README THANKS TODO doc/*.txt \
+  $PKG/usr/doc/$PKGNAM-$VERSION
+
+# Add and compress man pages:
+mkdir -p ${PKG}/usr/man/man1
+install -p -m0644 doc/man/*.1 ${PKG}/usr/man/man1/
+gzip -9 $PKG/usr/man/man?/*.1
+
+# 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/id3lib/patches/id3lib.c_wrapper.patch b/deps/id3lib/patches/id3lib.c_wrapper.patch
new file mode 100644
index 0000000..d72e81c
--- /dev/null
+++ b/deps/id3lib/patches/id3lib.c_wrapper.patch
@@ -0,0 +1,58 @@
+This patch adds C wrapper functions for field encoding.
+
+It was first introduced in version 3.8.3-8 and fixes
+http://bugs.debian.org/281292
+--- a/include/id3.h
++++ b/include/id3.h
+@@ -104,6 +104,9 @@
+   ID3_C_EXPORT void                 CCONV ID3Field_GetBINARY          (const ID3Field *field, uchar *buffer, size_t buffLength);
+   ID3_C_EXPORT void                 CCONV ID3Field_FromFile           (ID3Field *field, const char *fileName);
+   ID3_C_EXPORT void                 CCONV ID3Field_ToFile             (const ID3Field *field, const char *fileName);
++  ID3_C_EXPORT bool                 CCONV ID3Field_SetEncoding        (ID3Field *field, ID3_TextEnc enc);
++  ID3_C_EXPORT ID3_TextEnc          CCONV ID3Field_GetEncoding        (const ID3Field *field);
++  ID3_C_EXPORT bool                 CCONV ID3Field_IsEncodable        (const ID3Field *field);
+ 
+   /* field-info wrappers */
+   ID3_C_EXPORT char*                CCONV ID3FrameInfo_ShortName     (ID3_FrameID frameid);
+--- a/src/c_wrapper.cpp
++++ b/src/c_wrapper.cpp
+@@ -681,6 +681,39 @@
+     }
+   }
+ 
++  ID3_C_EXPORT bool CCONV
++  ID3Field_SetEncoding(ID3Field *field, ID3_TextEnc enc)
++  {
++    bool changed = false;
++    if (field)
++    {
++      ID3_CATCH(changed = reinterpret_cast<ID3_Field *>(field)->SetEncoding(enc));
++    }
++    return changed;
++  }
++
++  ID3_C_EXPORT ID3_TextEnc CCONV
++  ID3Field_GetEncoding(const ID3Field *field)
++  {
++    ID3_TextEnc enc = ID3TE_NONE;
++    if (field)
++    {
++      ID3_CATCH(enc = reinterpret_cast<const ID3_Field *>(field)->GetEncoding());
++    }
++    return enc;
++  }
++
++  ID3_C_EXPORT bool CCONV
++  ID3Field_IsEncodable(const ID3Field *field)
++  {
++    bool isEncodable = false;
++    if (field)
++    {
++      ID3_CATCH(isEncodable = reinterpret_cast<const ID3_Field *>(field)->IsEncodable());
++    }
++    return isEncodable;
++  }
++
+ #ifdef __cplusplus
+ }
+ #endif /* __cplusplus */
diff --git a/deps/id3lib/patches/id3lib.cppheaders.patch b/deps/id3lib/patches/id3lib.cppheaders.patch
new file mode 100644
index 0000000..a9b45ab
--- /dev/null
+++ b/deps/id3lib/patches/id3lib.cppheaders.patch
@@ -0,0 +1,22 @@
+This patch imports the proper C++ headers
+--- a/include/id3/id3lib_strings.h
++++ b/include/id3/id3lib_strings.h
+@@ -30,6 +30,7 @@
+ #define _ID3LIB_STRINGS_H_
+ 
+ #include <string>
++#include <cstring>
+ 
+ #if (defined(__GNUC__) && (__GNUC__ >= 3) || (defined(_MSC_VER) && _MSC_VER > 1000))
+ namespace std
+--- a/include/id3/writers.h
++++ b/include/id3/writers.h
+@@ -30,7 +30,7 @@
+ 
+ #include "id3/writer.h"
+ #include "id3/id3lib_streams.h"
+-//#include <string.h>
++#include <cstring>
+ 
+ class ID3_CPP_EXPORT ID3_OStreamWriter : public ID3_Writer
+ {
diff --git a/deps/id3lib/patches/id3lib.manpages.patch b/deps/id3lib/patches/id3lib.manpages.patch
new file mode 100644
index 0000000..cebf3d4
--- /dev/null
+++ b/deps/id3lib/patches/id3lib.manpages.patch
@@ -0,0 +1,198 @@
+This patch adds debian-made man pages
+--- /dev/null
++++ b/doc/man/id3info.1
+@@ -0,0 +1,31 @@
++.TH ID3INFO 1 "May 2000" local "User Command"
++.SH NAME
++id3info \- Display id3 tag information.
++.SH SYNOPSIS
++.B id3info
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3info
++displays both the id3v1 and id3v2 tag information for a file.
++Id3info will not differentiate between the two types of tags.
++.SH OPTIONS
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3tag(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3tag.1
+@@ -0,0 +1,69 @@
++.TH ID3TAG 1 "May 2000" local "User Command"
++.SH NAME
++id3tag \- Tags an mp3 file with id3v1 and/or id3v2 tags.
++.SH SYNOPSIS
++.B id3tag
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I FILE
++.RB ] ...
++.br
++.SH DESCRIPTION
++.B Id3tag
++will render both types of tag by default.  Only the last
++tag type indicated in the option list will be used.  Non-
++rendered will remain unchanged in the original file.  Will
++also parse and convert Lyrics3 v2.0 frames, but will not
++render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.TP
++.B \-a, \-\-artist ARTIST
++Set the artist information
++.TP
++.B \-s, \-\-song SONG
++Set the song title information
++.TP
++.B \-A, \-\-album ALBUM
++Set the album title information
++.TP
++.B \-c, \-\-comment COMMENT
++Set the comment information
++.TP
++.B \-C, \-\-desc DESCRIPTION
++Set the comment description
++.TP
++.B \-g, \-\-genre num
++Set the genre number
++.TP
++.B \-y, \-\-year num
++Set the year
++.TP
++.B \-t, \-\-track num
++Set the track number
++.TP
++.B \-T, \-\-total num
++Set the total number of tracks on the album
++
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
++
+--- /dev/null
++++ b/doc/man/id3convert.1
+@@ -0,0 +1,47 @@
++.TH ID3CONVERT 1 "May 2000" local "User Command"
++.SH NAME
++id3convert \- Converts between id3v1 and id3v2 tags of an mp3 file.
++.SH SYNOPSIS
++.B id3convert
++.RB [
++.I OPTION
++.RB ]
++.RB [
++.I FILE
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3convert
++converts between id3v1 and id3v2 tags of an mp3 file. Id3convert will render
++both types of tag by default. Only the last tag type indicated in the option
++list will be used. Non-rendered tags will remain unchanged in the original
++file. Id3convert will also parse and convert Lyrics3 v2.0 frames, but will
++not render them.
++
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-s, \-\-strip
++Strip, rather than render, the tags
++.TP
++.B \-p, \-\-padding
++Use padding in the tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++
++.SH SEE ALSO
++id3tag(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
+--- /dev/null
++++ b/doc/man/id3cp.1
+@@ -0,0 +1,38 @@
++.TH ID3CP 1 "July 2001" local "User Command"
++.SH NAME
++id3cp \- Copies tags from one file to another.
++.SH SYNOPSIS
++.B id3cp
++.RB [
++.I OPTION
++.RB ] ...
++.RB [
++.I SOURCE
++.RB ]
++.RB [
++.I DEST
++.RB ]
++.br
++.SH DESCRIPTION
++.B Id3cp
++copies tags from SOURCE to DEST.
++.SH OPTIONS
++.TP
++.B \-1, \-\-v1tag
++Render only the id3v1 tag
++.TP
++.B \-2, \-\-v2tag
++Render only the id3v2 tag
++.TP
++.B \-h, \-\-help
++Display help and exit
++.TP
++.B \-v, \-\-version
++Display version information and exit
++.SH SEE ALSO
++id3convert(1), id3info(1), id3v2(1)
++.SH AUTHOR
++.B id3lib
++was originally designed and implemented by Dirk Mahoney and is
++maintained by Scott Thomas Haug <sth2@cs.wustl.edu>. Manual page written for
++Debian GNU/Linux by Robert Woodcock <rcw@debian.org>.
diff --git a/deps/id3lib/patches/id3lib.mkstemp.patch b/deps/id3lib/patches/id3lib.mkstemp.patch
new file mode 100644
index 0000000..36c8417
--- /dev/null
+++ b/deps/id3lib/patches/id3lib.mkstemp.patch
@@ -0,0 +1,54 @@
+This patch fixes an issues where temporary files were created in an insecure
+way.
+
+It was first intruduced in version 3.8.3-7 and fixes
+http://bugs.debian.org/438540
+--- a/src/tag_file.cpp
++++ b/src/tag_file.cpp
+@@ -242,8 +242,8 @@
+     strcpy(sTempFile, filename.c_str());
+     strcat(sTempFile, sTmpSuffix.c_str());
+ 
+-#if ((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
+-    // This section is for Windows folk && gcc 3.x folk
++#if !defined(HAVE_MKSTEMP)
++    // This section is for Windows folk
+     fstream tmpOut;
+     createFile(sTempFile, tmpOut);
+ 
+@@ -257,7 +257,7 @@
+       tmpOut.write((char *)tmpBuffer, nBytes);
+     }
+ 
+-#else //((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
++#else //!defined(HAVE_MKSTEMP)
+ 
+     // else we gotta make a temp file, copy the tag into it, copy the
+     // rest of the old file after the tag, delete the old file, rename
+@@ -270,7 +270,7 @@
+       //ID3_THROW_DESC(ID3E_NoFile, "couldn't open temp file");
+     }
+ 
+-    ofstream tmpOut(fd);
++    ofstream tmpOut(sTempFile);
+     if (!tmpOut)
+     {
+       tmpOut.close();
+@@ -285,14 +285,14 @@
+     uchar tmpBuffer[BUFSIZ];
+     while (file)
+     {
+-      file.read(tmpBuffer, BUFSIZ);
++      file.read((char *)tmpBuffer, BUFSIZ);
+       size_t nBytes = file.gcount();
+-      tmpOut.write(tmpBuffer, nBytes);
++      tmpOut.write((char *)tmpBuffer, nBytes);
+     }
+ 
+     close(fd); //closes the file
+ 
+-#endif ////((defined(__GNUC__) && __GNUC__ >= 3  ) || !defined(HAVE_MKSTEMP))
++#endif ////!defined(HAVE_MKSTEMP)
+ 
+     tmpOut.close();
+     file.close();
diff --git a/deps/id3lib/patches/id3lib.nullpointer_check.patch b/deps/id3lib/patches/id3lib.nullpointer_check.patch
new file mode 100644
index 0000000..d4ca5d2
--- /dev/null
+++ b/deps/id3lib/patches/id3lib.nullpointer_check.patch
@@ -0,0 +1,12 @@
+This patch adds a check for a null pointer
+--- a/src/header_tag.cpp
++++ b/src/header_tag.cpp
+@@ -54,7 +54,7 @@
+ {
+   size_t bytesUsed = ID3_TagHeader::SIZE;
+ 
+-  if (_info->is_extended)
++  if (_info && _info->is_extended)
+   {
+     bytesUsed += _info->extended_bytes;
+   }
diff --git a/deps/id3lib/patches/id3lib.utf8_writing.patch b/deps/id3lib/patches/id3lib.utf8_writing.patch
new file mode 100644
index 0000000..3d3f50f
--- /dev/null
+++ b/deps/id3lib/patches/id3lib.utf8_writing.patch
@@ -0,0 +1,38 @@
+Patch from 'Spoon' to fix issues with writing certain unicode characters
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++2006-02-17  Jerome Couderc
++
++    * Patch from Spoon to fix UTF-16 writing bug
++      http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++
+ 2003-03-02 Sunday 17:38   Thijmen Klok <thijmen@id3lib.org>
+ 
+ 	* THANKS (1.20): added more people 
+--- a/src/io_helpers.cpp
++++ b/src/io_helpers.cpp
+@@ -363,11 +363,22 @@
+     // Write the BOM: 0xFEFF
+     unicode_t BOM = 0xFEFF;
+     writer.writeChars((const unsigned char*) &BOM, 2);
++    // Patch from Spoon : 2004-08-25 14:17
++    //   http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++    // Wrong code
++    //for (size_t i = 0; i < size; i += 2)
++    //{
++    //  unicode_t ch = (data[i] << 8) | data[i+1];
++    //  writer.writeChars((const unsigned char*) &ch, 2);
++    //}
++    // Right code
++    unsigned char *pdata = (unsigned char *) data.c_str();
+     for (size_t i = 0; i < size; i += 2)
+     {
+-      unicode_t ch = (data[i] << 8) | data[i+1];
++      unicode_t ch = (pdata[i] << 8) | pdata[i+1];
+       writer.writeChars((const unsigned char*) &ch, 2);
+     }
++    // End patch
+   }
+   return writer.getCur() - beg;
+ }
diff --git a/deps/id3lib/patches/id3lib.vbr_stack_smash.patch b/deps/id3lib/patches/id3lib.vbr_stack_smash.patch
new file mode 100644
index 0000000..9bf33e9
--- /dev/null
+++ b/deps/id3lib/patches/id3lib.vbr_stack_smash.patch
@@ -0,0 +1,19 @@
+Description: Fix crashes when reading VBR MP3 file.
+Bug-Ubuntu: https://launchpad.net/bugs/444466
+Origin: upstream, http://sourceforge.net/tracker/?func=detail&aid=937707&group_id=979&atid=300979
+Forwarded: yes
+Author: Urs Fleisch
+
+Index: id3lib3.8.3-3.8.3/src/mp3_parse.cpp
+===================================================================
+--- id3lib3.8.3-3.8.3.orig/src/mp3_parse.cpp	2009-10-06 23:12:10.381250132 +0200
++++ id3lib3.8.3-3.8.3/src/mp3_parse.cpp	2009-10-06 23:14:09.545252591 +0200
+@@ -465,7 +465,7 @@
+   // from http://www.xingtech.com/developer/mp3/
+ 
+   const size_t VBR_HEADER_MIN_SIZE = 8;     // "xing" + flags are fixed
+-  const size_t VBR_HEADER_MAX_SIZE = 116;   // frames, bytes, toc and scale are optional
++  const size_t VBR_HEADER_MAX_SIZE = 120;   // frames, bytes, toc and scale are optional
+ 
+   if (mp3size >= vbr_header_offest + VBR_HEADER_MIN_SIZE) 
+   {
diff --git a/deps/id3lib/slack-desc b/deps/id3lib/slack-desc
new file mode 100644
index 0000000..7e7e50b
--- /dev/null
+++ b/deps/id3lib/slack-desc
@@ -0,0 +1,20 @@
+# 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------------------------------------------------------|
+id3lib: id3lib (id3 tag manipulation library)
+id3lib:
+id3lib: id3lib is a software library for manipulating ID3v1 and ID3v2 tags.
+id3lib: It provides a convenient interface for software developers to include
+id3lib: standards-compliant ID3v1/2 tagging capabilities in applications.
+id3lib: Features include identification of valid tags, automatic size
+id3lib: conversions, (re)synchronisation of tag frames, seamless tag
+id3lib: (de)compression, and optional padding facilities.
+id3lib:
+id3lib: Homepage: http://id3lib.sourceforge.net/
+id3lib:
+
diff --git a/deps/json-glib/json-glib.SlackBuild b/deps/json-glib/json-glib.SlackBuild
index f9a7066..4af8d2a 100755
--- a/deps/json-glib/json-glib.SlackBuild
+++ b/deps/json-glib/json-glib.SlackBuild
@@ -27,7 +27,7 @@ PKGNAM=json-glib
 VERSION=${VERSION:-1.2.8}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/libappindicator/libappindicator.SlackBuild b/deps/libappindicator/libappindicator.SlackBuild
index 2c11c95..089728a 100755
--- a/deps/libappindicator/libappindicator.SlackBuild
+++ b/deps/libappindicator/libappindicator.SlackBuild
@@ -27,7 +27,7 @@ PKGNAM=libappindicator
 VERSION=${VERSION:-12.10.0}
 BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild b/deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild
index 19a0b7c..0545da0 100755
--- a/deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild
+++ b/deps/libdbusmenu-gtk/libdbusmenu-gtk.SlackBuild
@@ -28,7 +28,7 @@ SRCNAM=libdbusmenu
 VERSION=${VERSION:-12.10.2}
 BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/libdmtx/libdmtx.SlackBuild b/deps/libdmtx/libdmtx.SlackBuild
index 951c4ef..222e167 100755
--- a/deps/libdmtx/libdmtx.SlackBuild
+++ b/deps/libdmtx/libdmtx.SlackBuild
@@ -27,7 +27,7 @@ PKGNAM=libdmtx
 VERSION=${VERSION:-0.7.4}
 BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/libindicator/libindicator.SlackBuild b/deps/libindicator/libindicator.SlackBuild
index 0ecc19d..e230431 100755
--- a/deps/libindicator/libindicator.SlackBuild
+++ b/deps/libindicator/libindicator.SlackBuild
@@ -27,7 +27,7 @@ PKGNAM=libindicator
 VERSION=${VERSION:-12.10.1}
 BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/libinput/libinput.SlackBuild b/deps/libinput/libinput.SlackBuild
index 209ed8a..e6663d3 100755
--- a/deps/libinput/libinput.SlackBuild
+++ b/deps/libinput/libinput.SlackBuild
@@ -30,7 +30,7 @@ BUILD=${BUILD:-1}
 # Support for (wacom) tablets requires libwacom as additional dependency:
 TABLET_SUPPORT=${TABLET_SUPPORT:-"YES"}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/libwacom/libwacom.SlackBuild b/deps/libwacom/libwacom.SlackBuild
index 9900b02..49cdc7f 100755
--- a/deps/libwacom/libwacom.SlackBuild
+++ b/deps/libwacom/libwacom.SlackBuild
@@ -27,7 +27,7 @@ PKGNAM=libwacom
 VERSION=${VERSION:-0.22}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/libxkbcommon/.url b/deps/libxkbcommon/.url
index 871f807..63f31ce 100644
--- a/deps/libxkbcommon/.url
+++ b/deps/libxkbcommon/.url
@@ -1,2 +1,2 @@
-http://xkbcommon.org/download/libxkbcommon-0.7.1.tar.xz
+https://xkbcommon.org/download/libxkbcommon-0.7.2.tar.xz
 
diff --git a/deps/libxkbcommon/libxkbcommon.SlackBuild b/deps/libxkbcommon/libxkbcommon.SlackBuild
index e21cf70..d80e2bf 100755
--- a/deps/libxkbcommon/libxkbcommon.SlackBuild
+++ b/deps/libxkbcommon/libxkbcommon.SlackBuild
@@ -23,45 +23,40 @@
 
 
 PKGNAM=libxkbcommon
-VERSION=${VERSION:-0.7.1}
+VERSION=${VERSION:-0.7.2}
 BUILD=${BUILD:-1}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-if [ -e $CWD/machine.conf ]; then
-  . $CWD/machine.conf ]
-elif [ -e /etc/slackbuild/machine.conf ]; then
-  . /etc/slackbuild/machine.conf ]
+# 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
+
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv5te"
+  LIBDIRSUFFIX=""
 else
-  # Automatically determine the architecture we're building on:
-  MARCH=$( uname -m )
-  if [ -z "$ARCH" ]; then
-    case "$MARCH" in
-      i?86)    export ARCH=i486 ;;
-      arm*)    export ARCH=arm ;;
-      # Unless $ARCH is already set, use uname -m for all other archs:
-      *)       export ARCH=$MARCH ;;
-    esac
-  fi
-  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
-  if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "s390" ]; then
-    SLKCFLAGS="-O2"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "x86_64" ]; then
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-  elif [ "$ARCH" = "arm" ]; then
-    SLKCFLAGS="-O2 -march=armv5te"
-    LIBDIRSUFFIX=""
-  else
-    SLKCFLAGS="-O2"
-    LIBDIRSUFFIX=""
-  fi
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 case "$ARCH" in
diff --git a/deps/lmdb/.url b/deps/lmdb/.url
index b29e6d0..497028b 100644
--- a/deps/lmdb/.url
+++ b/deps/lmdb/.url
@@ -1 +1 @@
-https://github.com/LMDB/lmdb/archive/LMDB_0.9.17.tar.gz
+https://github.com/LMDB/lmdb/archive/LMDB_0.9.21.tar.gz
diff --git a/deps/lmdb/lmdb.SlackBuild b/deps/lmdb/lmdb.SlackBuild
index 7ae93ae..a729ce4 100755
--- a/deps/lmdb/lmdb.SlackBuild
+++ b/deps/lmdb/lmdb.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2015  Eric Hameleers, Eindhoven, NL
+# Copyright 2015, 2017  Eric Hameleers, Eindhoven, NL
 # Copyright 2015  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
@@ -23,7 +23,7 @@
 
 
 PKGNAM=lmdb
-VERSION=${VERSION:-0.9.17}
+VERSION=${VERSION:-0.9.21}
 BUILD=${BUILD:-1}
 
 CWD=$(pwd)
@@ -68,7 +68,7 @@ rm -rf $PKG
 mkdir -p $PKG $TMP
 cd $TMP
 rm -rf ${PKGNAM}-LMDB_${VERSION}
-tar xvf $CWD/${PKGNAM}-LMDB_${VERSION}.tar.xz || exit 1
+tar xvf $CWD/${PKGNAM}-LMDB_${VERSION}.tar.?z* || exit 1
 cd ${PKGNAM}-LMDB_${VERSION} || exit 1
 
 # Fix a x86_64 installation issue:
diff --git a/deps/mlt/mlt.SlackBuild b/deps/mlt/mlt.SlackBuild
index 93d447e..6608b94 100755
--- a/deps/mlt/mlt.SlackBuild
+++ b/deps/mlt/mlt.SlackBuild
@@ -26,7 +26,7 @@
 
 PKGNAM=mlt
 VERSION=${VERSION:-6.4.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 PYTHONSITEPKG=$(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
 
@@ -78,6 +78,12 @@ cd $PKGNAM-$VERSION || exit 1
 # Fix compilation against Qt >= 5.7 (error "Qt requires C++11 support"):
 cat $CWD/patches/mlt_qt5.patch | patch -p1 --verbose || exit 1
 
+# Fix compilation against glibc 2.26:
+cat $CWD/patches/mlt_glibc226.patch | patch -p1 --verbose || exit 1
+
+# Prevent kdenlive from crashing on exit:
+cat $CWD/patches/mlt_repository_close.patch | patch -p1 --verbose || exit 1
+
 # Fix bogus permissions:
 chown -R root:root .
 find . \
diff --git a/deps/mlt/patches/mlt_glibc226.patch b/deps/mlt/patches/mlt_glibc226.patch
new file mode 100644
index 0000000..255a604
--- /dev/null
+++ b/deps/mlt/patches/mlt_glibc226.patch
@@ -0,0 +1,28 @@
+From 2377c8665f93f87aa86fabbfd8e596572aacdf6c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Mon, 7 Aug 2017 18:41:07 +0200
+Subject: [PATCH] mlt_property.h: Replace include xlocale.h by locale.h
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+xlocale.h was removed in glibc 2.26
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ src/framework/mlt_property.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/framework/mlt_property.h b/src/framework/mlt_property.h
+index 404d513f..156e0734 100644
+--- a/src/framework/mlt_property.h
++++ b/src/framework/mlt_property.h
+@@ -31,7 +31,7 @@
+ #endif
+ 
+ #if defined(__GLIBC__) || defined(__APPLE__) || (__FreeBSD_version >= 900506)
+-#include <xlocale.h>
++#include <locale.h>
+ #else
+ typedef char* locale_t;
+ #endif
diff --git a/deps/mlt/patches/mlt_repository_close.patch b/deps/mlt/patches/mlt_repository_close.patch
new file mode 100644
index 0000000..3711cce
--- /dev/null
+++ b/deps/mlt/patches/mlt_repository_close.patch
@@ -0,0 +1,25 @@
+From a3188e301b5a9a1f25dbb98a510e366363348e64 Mon Sep 17 00:00:00 2001
+From: Dan Dennedy <dan@dennedy.org>
+Date: Sun, 19 Feb 2017 12:50:59 -0800
+Subject: [PATCH] Allow Mlt::Repository to be deleted without bad side effect.
+
+mlt_repository_close() is run by mlt_factory_close() when called either
+directly, which requires all Mlt objects to be destroyed prior, or
+atexit().
+---
+ src/mlt++/MltRepository.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/mlt++/MltRepository.cpp b/src/mlt++/MltRepository.cpp
+index 47a598bc..45522e40 100644
+--- a/src/mlt++/MltRepository.cpp
++++ b/src/mlt++/MltRepository.cpp
+@@ -35,8 +35,6 @@ Repository::Repository( mlt_repository repository ) :
+ 
+ Repository::~Repository( )
+ {
+-	if ( instance )
+-		mlt_repository_close( instance );
+ 	instance = NULL;
+ }
+ 
diff --git a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
index 617c14e..27f441d 100755
--- a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
+++ b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
@@ -28,7 +28,7 @@ SRCNAM=phonon-backend-gstreamer
 VERSION=${VERSION:-4.9.0}
 BUILD=${BUILD:-2}
 
-NUMJOBS=${NUMJOBS:" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
 MARCH=$( uname -m )
diff --git a/deps/phonon-vlc/phonon-vlc.SlackBuild b/deps/phonon-vlc/phonon-vlc.SlackBuild
index ff82b52..81c85bd 100755
--- a/deps/phonon-vlc/phonon-vlc.SlackBuild
+++ b/deps/phonon-vlc/phonon-vlc.SlackBuild
@@ -28,7 +28,7 @@ SRCNAM=phonon-backend-vlc
 VERSION=${VERSION:-0.9.1}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j7 "}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/deps/poppler/.url b/deps/poppler/.url
index b1aadaa..2434ac9 100644
--- a/deps/poppler/.url
+++ b/deps/poppler/.url
@@ -1,2 +1,2 @@
-https://poppler.freedesktop.org/poppler-0.56.0.tar.xz
+https://poppler.freedesktop.org/poppler-0.57.0.tar.xz
 
diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild
index 8ac66db..9e63402 100755
--- a/deps/poppler/poppler.SlackBuild
+++ b/deps/poppler/poppler.SlackBuild
@@ -24,7 +24,7 @@
 # Modified 2016, 2017 by Eric Hameleers <alien@slackware.com>
 
 PKGNAM=poppler
-VERSION=${VERSION:-0.56.0}
+VERSION=${VERSION:-0.57.0}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -68,8 +68,8 @@ rm -rf ${PKGNAM}-${VERSION}
 tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1
 cd ${PKGNAM}-$VERSION || exit 1
 
-# This is needed for compilation with c++11 compiler:
-cat $CWD/patches/poppler_cpp11.patch | patch -p1 --verbose || exit 1
+## This is needed for compilation with c++11 compiler:
+#cat $CWD/patches/poppler_cpp11.patch | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
@@ -78,7 +78,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Adding " -std=c++11" to CXXFLAGS is needed for compiling against Qt 5.7:
+# Adding " -std=c++11" to CXXFLAGS is needed for compiling against Qt >= 5.7:
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS -std=c++11" \
 ./configure \
diff --git a/deps/qrencode/qrencode.SlackBuild b/deps/qrencode/qrencode.SlackBuild
index e2e5576..acb351f 100755
--- a/deps/qrencode/qrencode.SlackBuild
+++ b/deps/qrencode/qrencode.SlackBuild
@@ -27,7 +27,7 @@
 PKGNAM=qrencode
 VERSION=${VERSION:-3.4.4}
 BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
diff --git a/deps/qt5-webkit/.url b/deps/qt5-webkit/.url
index 2bdc680..0924d34 100644
--- a/deps/qt5-webkit/.url
+++ b/deps/qt5-webkit/.url
@@ -1 +1 @@
-http://download.qt.io/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz
+http://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz
diff --git a/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch b/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch
new file mode 100644
index 0000000..bddb6fc
--- /dev/null
+++ b/deps/qt5-webkit/patches/qt5-webkit.gcc7.patch
@@ -0,0 +1,34 @@
+diff -u -r webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h
+--- webkitgtk-2.16.5/Source/WTF/wtf/text/StringImpl.h	2017-02-20 17:20:15.000000000 +0100
++++ webkitgtk-2.16.5-gcc7/Source/WTF/wtf/text/StringImpl.h	2017-06-27 13:13:57.801527350 +0200
+@@ -581,29 +581,7 @@
+     // FIXME: Does this really belong in StringImpl?
+     template <typename T> static void copyChars(T* destination, const T* source, unsigned numCharacters)
+     {
+-        if (numCharacters == 1) {
+-            *destination = *source;
+-            return;
+-        }
+-
+-        if (numCharacters <= s_copyCharsInlineCutOff) {
+-            unsigned i = 0;
+-#if (CPU(X86) || CPU(X86_64))
+-            const unsigned charsPerInt = sizeof(uint32_t) / sizeof(T);
+-
+-            if (numCharacters > charsPerInt) {
+-                unsigned stopCount = numCharacters & ~(charsPerInt - 1);
+-
+-                const uint32_t* srcCharacters = reinterpret_cast<const uint32_t*>(source);
+-                uint32_t* destCharacters = reinterpret_cast<uint32_t*>(destination);
+-                for (unsigned j = 0; i < stopCount; i += charsPerInt, ++j)
+-                    destCharacters[j] = srcCharacters[j];
+-            }
+-#endif
+-            for (; i < numCharacters; ++i)
+-                destination[i] = source[i];
+-        } else
+-            memcpy(destination, source, numCharacters * sizeof(T));
++        memcpy(destination, source, numCharacters * sizeof(T));
+     }
+ 
+     ALWAYS_INLINE static void copyChars(UChar* destination, const LChar* source, unsigned numCharacters)
diff --git a/deps/qt5-webkit/patches/qt5-webkit.icu59.patch b/deps/qt5-webkit/patches/qt5-webkit.icu59.patch
new file mode 100644
index 0000000..3eb73b2
--- /dev/null
+++ b/deps/qt5-webkit/patches/qt5-webkit.icu59.patch
@@ -0,0 +1,80 @@
+Submitted by:            DJ Lucas (dj_AT_linuxfromscratch_DOT_org)
+Date:                    2017-04-29
+Initial Package Version: 5.8.0
+Upstream Status:         Unknown
+Origin:                  https://bugreports.qt.io/browse/QTBUG-35971
+Description:             Fixes build with icu-59.
+
+diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/JavaScriptCore/API/JSStringRef.h qtwebkit-opensource-src-5.8.0/Source/JavaScriptCore/API/JSStringRef.h
+--- qtwebkit-opensource-src-5.8.0-orig/Source/JavaScriptCore/API/JSStringRef.h	2016-12-10 10:32:34.000000000 -0600
++++ qtwebkit-opensource-src-5.8.0/Source/JavaScriptCore/API/JSStringRef.h	2017-04-29 17:03:35.280465079 -0500
+@@ -32,6 +32,7 @@
+ #include <stdbool.h>
+ #endif
+ #include <stddef.h> /* for size_t */
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -43,7 +44,7 @@ extern "C" {
+ @typedef JSChar
+ @abstract A Unicode character.
+ */
+-    typedef unsigned short JSChar;
++    typedef char16_t JSChar;
+ #else
+     typedef wchar_t JSChar;
+ #endif
+diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/Compiler.h qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/Compiler.h
+--- qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/Compiler.h	2016-12-10 10:32:34.000000000 -0600
++++ qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/Compiler.h	2017-04-29 17:03:35.280465079 -0500
+@@ -61,6 +61,7 @@
+ #define WTF_COMPILER_SUPPORTS_HAS_TRIVIAL_DESTRUCTOR __has_feature(has_trivial_destructor)
+ #define WTF_COMPILER_SUPPORTS_CXX_STRONG_ENUMS __has_feature(cxx_strong_enums)
+ #define WTF_COMPILER_SUPPORTS_CXX_REFERENCE_QUALIFIED_FUNCTIONS __has_feature(cxx_reference_qualified_functions)
++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES !defined(_LIBCPP_HAS_NO_UNICODE_CHARS)
+ 
+ #endif
+ 
+@@ -142,6 +143,7 @@
+ #define WTF_COMPILER_SUPPORTS_CXX_DELETED_FUNCTIONS 1
+ #endif
+ #if GCC_VERSION_AT_LEAST(4, 5, 0)
++#define WTF_COMPILER_SUPPORTS_CXX_NEW_CHAR_TYPES 1
+ #define WTF_COMPILER_SUPPORTS_CXX_EXPLICIT_CONVERSIONS 1
+ #endif
+ #if GCC_VERSION_AT_LEAST(4, 6, 0)
+diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/TypeTraits.h qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/TypeTraits.h
+--- qtwebkit-opensource-src-5.8.0-orig/Source/WTF/wtf/TypeTraits.h	2016-12-10 10:32:34.000000000 -0600
++++ qtwebkit-opensource-src-5.8.0/Source/WTF/wtf/TypeTraits.h	2017-04-29 17:03:35.280465079 -0500
+@@ -75,6 +75,10 @@ namespace WTF {
+ #if !COMPILER(MSVC) || defined(_NATIVE_WCHAR_T_DEFINED)
+     template<> struct IsInteger<wchar_t>            { static const bool value = true; };
+ #endif
++#if COMPILER_SUPPORTS(CXX_NEW_CHAR_TYPES)
++    template<> struct IsInteger<char16_t>           { static const bool value = true; };
++    template<> struct IsInteger<char32_t>           { static const bool value = true; };
++#endif
+ 
+     template<typename T> struct IsFloatingPoint     { static const bool value = false; };
+     template<> struct IsFloatingPoint<float>        { static const bool value = true; };
+diff -Naurp qtwebkit-opensource-src-5.8.0-orig/Source/WebKit2/Shared/API/c/WKString.h qtwebkit-opensource-src-5.8.0/Source/WebKit2/Shared/API/c/WKString.h
+--- qtwebkit-opensource-src-5.8.0-orig/Source/WebKit2/Shared/API/c/WKString.h	2016-12-10 10:32:34.000000000 -0600
++++ qtwebkit-opensource-src-5.8.0/Source/WebKit2/Shared/API/c/WKString.h	2017-04-29 17:03:35.280465079 -0500
+@@ -31,6 +31,7 @@
+ #ifndef __cplusplus
+ #include <stdbool.h>
+ #endif
++#include <uchar.h>
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -38,7 +39,7 @@ extern "C" {
+ 
+ #if !defined(WIN32) && !defined(_WIN32) \
+     && !((defined(__CC_ARM) || defined(__ARMCC__)) && !defined(__linux__)) /* RVCT */
+-    typedef unsigned short WKChar;
++    typedef char16_t WKChar;
+ #else
+     typedef wchar_t WKChar;
+ #endif
diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild
index 6b18728..4fccefa 100755
--- a/deps/qt5-webkit/qt5-webkit.SlackBuild
+++ b/deps/qt5-webkit/qt5-webkit.SlackBuild
@@ -22,10 +22,10 @@
 
 # Derived from the qt5.SlackBuild
 
-# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0 2016,2017 by Eric  Hameleers, Eindhoven, NL
+# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1, 5.9.0, 5.9.1 2016,2017 by Eric  Hameleers, Eindhoven, NL
 
 PKGNAM=qt5-webkit
-VERSION=${VERSION:-5.9.0}
+VERSION=${VERSION:-5.9.1}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
@@ -88,6 +88,16 @@ 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
 
+# Prevent crashes when compiled with gcc7:
+cat $CWD/patches/qt5-webkit.gcc7.patch | patch -p1 --verbose || exit 1
+
+## Prevent compile error against icu-59:
+#cat $CWD/patches/qt5-webkit.icu59.patch | patch -p1 --verbose || exit 1
+
+# Avoid literally thousands of unneeded warning messages (thanks BLFS):
+sed -e '/CONFIG/a QMAKE_CXXFLAGS += -Wno-expansion-to-defined' \
+    -i Tools/qmake/mkspecs/features/unix/default_pre.prf
+
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -111,7 +121,7 @@ export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PA
   
 mkdir build
 cd build
-  qmake-qt5 ..
+  qmake-qt5 ../WebKit.pro
   make || exit 1
   make install INSTALL_ROOT=$PKG || exit 1
 cd ..
diff --git a/deps/qt5/.url b/deps/qt5/.url
index 79507a2..cfb9ed5 100644
--- a/deps/qt5/.url
+++ b/deps/qt5/.url
@@ -1 +1 @@
-https://download.qt.io/archive/qt/5.9/5.9.0/single/qt-everywhere-opensource-src-5.9.0.tar.xz
+https://download.qt.io/archive/qt/5.9/5.9.1/single/qt-everywhere-opensource-src-5.9.1.tar.xz
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 34656dc..fc81c6f 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -50,9 +50,10 @@
 # Modifications for qt 5.7.0 2016 by Eric  Hameleers, Eindhoven, NL
 # Modifications for qt 5.7.1 2017 by Eric  Hameleers, Eindhoven, NL
 # Modifications for qt 5.9.0 2017 by Eric  Hameleers, Eindhoven, NL
+# Modifications for qt 5.9.1 2017 by Eric  Hameleers, Eindhoven, NL
 
 PKGNAM=qt5
-VERSION=${VERSION:-5.9.0}
+VERSION=${VERSION:-5.9.1}
 PKGSRC=$(echo $VERSION |cut -d- -f1)
 PKGVER=$(echo $VERSION |tr - _)
 BUILD=${BUILD:-1}
@@ -139,16 +140,6 @@ cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
 sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \
   -i qtbase/mkspecs/features/create_cmake.prf
 
-# Don't destroy foreign windows, QTBUG-61140:
-cd qtbase
-  cat $CWD/patches/qt5.qtbug-61140.patch | patch -p1 --verbose || exit 1
-cd -
-
-# Fix crashes with QtCurve, QTBUG-60558:
-cd qtbase
-  cat $CWD/patches/qt5.qtbug-60558.patch | patch -p1 --verbose || exit 1
-cd -
-
 if ! pkg-config --exists libpulse 2>/dev/null ; then
   # Forcibly disable pulseaudio in qtwebengine:
   cat $CWD/patches/qt5.pulseaudio.diff | patch -p1 --verbose || exit 1
diff --git a/deps/sip/.url b/deps/sip/.url
index 2cfb996..445277d 100644
--- a/deps/sip/.url
+++ b/deps/sip/.url
@@ -1,2 +1,2 @@
-https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.2/sip-4.19.2.tar.gz
+https://sourceforge.net/projects/pyqt/files/sip/sip-4.19.3/sip-4.19.3.tar.gz
 
diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild
index 7e3b0dc..57b365d 100755
--- a/deps/sip/sip.SlackBuild
+++ b/deps/sip/sip.SlackBuild
@@ -26,21 +26,20 @@
 
 
 PKGNAM=sip
-VERSION=${VERSION:-4.19.2}
+VERSION=${VERSION:-4.19.3}
 BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j7}
 
 # Automatically determine the architecture we're building on:
-MARCH=$( uname -m )
 if [ -z "$ARCH" ]; then
-  case "$MARCH" in
-    i?86)    export ARCH=i586 ;;
-    armv7hl) export ARCH=$MARCH ;;
-    arm*)    export ARCH=arm ;;
+  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:
-    *)       export ARCH=$MARCH ;;
+    *) ARCH=$(uname -m) ;;
   esac
+  export ARCH
 fi
 
 if [ "$ARCH" = "i586" ]; then
diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild
index 7fd2ab3..efd59e3 100755
--- a/deps/updates.SlackBuild
+++ b/deps/updates.SlackBuild
@@ -61,6 +61,8 @@ ALLDEPS=" \
   accountsservice \
   libburn \
   qtav \
+  ddcutil \
+  id3lib \
   "
   # Only needed when adding support for Wayland:
   #elogind \
diff --git a/deps/wayland/.url b/deps/wayland/.url
index 22ad4f9..f32621e 100644
--- a/deps/wayland/.url
+++ b/deps/wayland/.url
@@ -1,2 +1,2 @@
-https://wayland.freedesktop.org/releases/wayland-1.13.0.tar.xz
+https://wayland.freedesktop.org/releases/wayland-1.14.0.tar.xz
 
diff --git a/deps/wayland/wayland.SlackBuild b/deps/wayland/wayland.SlackBuild
index ca34b35..2563450 100755
--- a/deps/wayland/wayland.SlackBuild
+++ b/deps/wayland/wayland.SlackBuild
@@ -24,50 +24,45 @@
 
 
 PKGNAM=wayland
-VERSION=${VERSION:-1.13.0}
+VERSION=${VERSION:-1.14.0}
 BUILD=${BUILD:-1}
 
-NUMJOBS=${NUMJOBS:" -j4 "}
+NUMJOBS=${NUMJOBS:-" -j4 "}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
-if [ -e $CWD/machine.conf ]; then
-  . $CWD/machine.conf ]
-elif [ -e /etc/slackbuild/machine.conf ]; then
-  . /etc/slackbuild/machine.conf ]
+# 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
+
+# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "arm" ]; then
+  SLKCFLAGS="-O2 -march=armv5te"
+  LIBDIRSUFFIX=""
 else
-  # Automatically determine the architecture we're building on:
-  MARCH=$( uname -m )
-  if [ -z "$ARCH" ]; then
-    case "$MARCH" in
-      i?86)    export ARCH=i586 ;;
-      arm*)    export ARCH=arm ;;
-      # Unless $ARCH is already set, use uname -m for all other archs:
-      *)       export ARCH=$MARCH ;;
-    esac
-  fi
-  # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
-  if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "i586" ]; then
-    SLKCFLAGS="-O2 -march=i586 -mtune=i686"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "s390" ]; then
-    SLKCFLAGS="-O2"
-    LIBDIRSUFFIX=""
-  elif [ "$ARCH" = "x86_64" ]; then
-    SLKCFLAGS="-O2 -fPIC"
-    LIBDIRSUFFIX="64"
-  elif [ "$ARCH" = "arm" ]; then
-    SLKCFLAGS="-O2 -march=armv5te"
-    LIBDIRSUFFIX=""
-  else
-    SLKCFLAGS="-O2"
-    LIBDIRSUFFIX=""
-  fi
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
 case "$ARCH" in
-- 
cgit v1.2.3