summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deps/PyQt5/.url2
-rwxr-xr-xdeps/PyQt5/PyQt5.SlackBuild36
-rw-r--r--deps/cryfs/.url2
-rwxr-xr-xdeps/cryfs/cryfs.SlackBuild6
-rw-r--r--deps/phonon-gstreamer/.url2
-rwxr-xr-xdeps/phonon-gstreamer/phonon-gstreamer.SlackBuild40
-rw-r--r--deps/phonon-vlc/.url2
-rwxr-xr-xdeps/phonon-vlc/phonon-vlc.SlackBuild35
-rw-r--r--deps/phonon/.deps1
-rw-r--r--deps/phonon/.url2
-rwxr-xr-xdeps/phonon/phonon.SlackBuild43
-rw-r--r--deps/polkit-qt5-1/.url1
-rwxr-xr-xdeps/polkit-qt5-1/polkit-qt5-1.SlackBuild49
-rw-r--r--deps/qt5-speech/.url2
-rwxr-xr-xdeps/qt5-speech/qt5-speech.SlackBuild4
-rw-r--r--deps/qt5/.deps1
-rw-r--r--deps/qt5/.url2
-rw-r--r--deps/qt5/patches/qt5.qtbug-76255.patch35
-rw-r--r--deps/qt5/patches/qt5.qtbug-77364.patch13
-rwxr-xr-xdeps/qt5/qt5.SlackBuild22
-rw-r--r--deps/wayland-protocols/.url4
-rwxr-xr-xdeps/wayland-protocols/wayland-protocols.SlackBuild21
22 files changed, 165 insertions, 160 deletions
diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url
index 8a44a65..0c86e33 100644
--- a/deps/PyQt5/.url
+++ b/deps/PyQt5/.url
@@ -1,2 +1,2 @@
-https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.12.3/PyQt5_gpl-5.12.3.tar.gz
+https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.13.0/PyQt5_gpl-5.13.0.tar.gz
diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild
index df9e97b..1010b94 100755
--- a/deps/PyQt5/PyQt5.SlackBuild
+++ b/deps/PyQt5/PyQt5.SlackBuild
@@ -26,16 +26,12 @@
# Modified by Robby Workman <rworkman@slackware.com>
# Modified by Eric Hameleers <alien@slackware.com>
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=PyQt5
-VERSION=${VERSION:-5.12.3}
+VERSION=${VERSION:-5.13.0}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j$(nproc) "}
-
-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
@@ -61,7 +57,20 @@ else
SLKCFLAGS="-O2"
fi
-PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null )
rm -rf $PKG
@@ -89,7 +98,7 @@ export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
-python configure.py \
+python2 configure.py \
--confirm-license \
--verbose \
--qsci-api \
@@ -103,7 +112,7 @@ make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1
mv $PKG/usr/bin/pyrcc5 $PKG/usr/bin/pyrcc5-py2
mv $PKG/usr/bin/pyuic5 $PKG/usr/bin/pyuic5-py2
mv $PKG/usr/bin/pylupdate5 $PKG/usr/bin/pylupdate5-py2
-rm -rf $PKG/$PYTHONLIB/${PKGNAM}/uic/port_v3/
+rm -rf $PKG/$PYTHON2LIB/${PKGNAM}/uic/port_v3/
python3 configure.py \
--confirm-license \
@@ -122,6 +131,13 @@ rm -rf $PKG/$PYTHON3LIB/${PKGNAM}/uic/port_v2/
find $PKG | xargs file | grep -e "executable" -e "shared object" \
| grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+# Remove rpaths:
+for file in $(find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : 2> /dev/null) ; do
+ if [ ! "$(patchelf --print-rpath $file 2> /dev/null)" = "" ]; then
+ patchelf --remove-rpath $file
+ fi
+done
+
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
ChangeLog LICENSE* NEWS README doc/* \
diff --git a/deps/cryfs/.url b/deps/cryfs/.url
index 4654f9c..fea16bf 100644
--- a/deps/cryfs/.url
+++ b/deps/cryfs/.url
@@ -1 +1 @@
-https://github.com/cryfs/cryfs/releases/download/0.10.1/cryfs-0.10.1.tar.xz
+https://github.com/cryfs/cryfs/releases/download/0.10.2/cryfs-0.10.2.tar.xz
diff --git a/deps/cryfs/cryfs.SlackBuild b/deps/cryfs/cryfs.SlackBuild
index 352c7df..38f68c6 100755
--- a/deps/cryfs/cryfs.SlackBuild
+++ b/deps/cryfs/cryfs.SlackBuild
@@ -27,8 +27,8 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cryfs
-VERSION=${VERSION:-0.10.1}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-0.10.2}
+BUILD=${BUILD:-1}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -81,7 +81,7 @@ cd $TMP
rm -rf $PKGNAM-$VERSION
mkdir $PKGNAM-$VERSION
cd $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
# Fix bogus permissions:
chown -R root:root .
diff --git a/deps/phonon-gstreamer/.url b/deps/phonon-gstreamer/.url
index 4172160..d2d9cee 100644
--- a/deps/phonon-gstreamer/.url
+++ b/deps/phonon-gstreamer/.url
@@ -1,2 +1,2 @@
-http://download.kde.org/stable/phonon/phonon-backend-gstreamer/4.9.0/phonon-backend-gstreamer-4.9.0.tar.xz
+http://download.kde.org/stable/phonon/phonon-backend-gstreamer/4.10.0/phonon-backend-gstreamer-4.10.0.tar.xz
diff --git a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
index 13b1e4e..bad913e 100755
--- a/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
+++ b/deps/phonon-gstreamer/phonon-gstreamer.SlackBuild
@@ -27,10 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=phonon-gstreamer
SRCNAM=phonon-backend-gstreamer
-VERSION=${VERSION:-4.9.0}
-BUILD=${BUILD:-2}
-
-NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
+VERSION=${VERSION:-4.10.0}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
MARCH=$( uname -m )
@@ -69,15 +67,17 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
+cd $SRCNAM-$VERSION || exit 1
chown -R root:root .
find . \
@@ -87,8 +87,9 @@ find . \
-exec chmod 644 {} \;
echo Building ...
-mkdir -p build
-cd build
+# Qt5 is the only supported version of Qt as of 4.10.0:
+mkdir -p build-qt5
+cd build-qt5
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
@@ -104,27 +105,6 @@ cd build
make DESTDIR=$PKG install
cd -
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
- mkdir -p build-qt5
- cd build-qt5
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DPHONON_BUILD_PHONON4QT5=ON \
- ..
- make $NUMJOBS
- make DESTDIR=$PKG install
- cd -
-fi
-
# Add documentation:
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
diff --git a/deps/phonon-vlc/.url b/deps/phonon-vlc/.url
index 9353df9..fab73be 100644
--- a/deps/phonon-vlc/.url
+++ b/deps/phonon-vlc/.url
@@ -1,2 +1,2 @@
-https://download.kde.org/stable/phonon/phonon-backend-vlc/0.10.2/phonon-backend-vlc-0.10.2.tar.xz
+https://download.kde.org/stable/phonon/phonon-backend-vlc/0.11.0/phonon-backend-vlc-0.11.0.tar.xz
diff --git a/deps/phonon-vlc/phonon-vlc.SlackBuild b/deps/phonon-vlc/phonon-vlc.SlackBuild
index d5c2a2e..6c84cff 100755
--- a/deps/phonon-vlc/phonon-vlc.SlackBuild
+++ b/deps/phonon-vlc/phonon-vlc.SlackBuild
@@ -27,11 +27,9 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=phonon-vlc
SRCNAM=phonon-backend-vlc
-VERSION=${VERSION:-0.10.2}
+VERSION=${VERSION:-0.11.0}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
-
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
@@ -68,6 +66,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -75,7 +75,7 @@ rm -rf $PKG
mkdir -p $TMP $PKG
cd $TMP
rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
cd $SRCNAM-$VERSION || exit 1
chown -R root:root .
@@ -86,8 +86,10 @@ find . \
-exec chmod 644 {} \;
echo Building ...
-mkdir -p build
-cd build
+
+# Qt5 is the only supported Qt as if 0.11.0:
+mkdir -p build-qt5
+cd build-qt5
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
@@ -103,27 +105,6 @@ cd build
make DESTDIR=$PKG install
cd -
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
- mkdir -p build-qt5
- cd build-qt5
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
- -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DSYSCONF_INSTALL_DIR=/etc \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DPHONON_BUILD_PHONON4QT5=ON \
- ..
- make $NUMJOBS
- make DESTDIR=$PKG install
- cd -
-fi
-
# Add documentation:
mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
cp -a \
diff --git a/deps/phonon/.deps b/deps/phonon/.deps
new file mode 100644
index 0000000..bc90dbd
--- /dev/null
+++ b/deps/phonon/.deps
@@ -0,0 +1 @@
+extra-cmake-modules
diff --git a/deps/phonon/.url b/deps/phonon/.url
index fdf4e32..ae5d0bf 100644
--- a/deps/phonon/.url
+++ b/deps/phonon/.url
@@ -1 +1 @@
-https://download.kde.org/stable/phonon/4.10.2/phonon-4.10.2.tar.xz.sig
+https://download.kde.org/stable/phonon/4.11.0/phonon-4.11.0.tar.xz
diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild
index 6104457..51893a8 100755
--- a/deps/phonon/phonon.SlackBuild
+++ b/deps/phonon/phonon.SlackBuild
@@ -27,11 +27,9 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=phonon
-VERSION=${VERSION:-4.10.2}
+VERSION=${VERSION:-4.11.0}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
-
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
@@ -43,10 +41,7 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
+if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
@@ -71,6 +66,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-phonon
@@ -95,8 +92,9 @@ else
DOPULSE="OFF"
fi
-mkdir build
-cd build
+# Qt5 is the only supported version as of 4.11.0:
+mkdir build-qt5
+cd build-qt5
cmake \
-DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
-DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -107,37 +105,12 @@ cd build
-DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
-DWITH_QZeitgeist=BOOL:OFF \
-DWITH_PulseAudio=BOOL:${DOPULSE} \
+ -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
..
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
cd -
-# Conditional build of Qt5 support:
-if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
- mkdir build-qt5
- cd build-qt5
- cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DMAN_INSTALL_DIR=/usr/man \
- -DLIB_SUFFIX=${LIBDIRSUFFIX} \
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT:BOOL=ON \
- -DPHONON_QT_PLUGIN_INSTALL_DIR=/usr/lib$LIBDIRSUFFIX/qt/plugins/designer \
- -DWITH_QZeitgeist=BOOL:OFF \
- -DWITH_PulseAudio=BOOL:${DOPULSE} \
- -DPHONON_BUILD_PHONON4QT5=ON \
- -D__KDE_HAVE_GCC_VISIBILITY=NO \
- -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt5 \
- ..
- make $NUMJOBS || make || exit 1
- make install DESTDIR=$PKG || exit 1
- cd -
-fi
-
-# PyQT won't find the header files otherwise:
-sed -i -e 's#{includedir}$#& -I\${includedir}/phonon#' $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/phonon.pc
-
# Compress and link manpages, if any:
if [ -d $PKG/usr/man ]; then
( cd $PKG/usr/man
diff --git a/deps/polkit-qt5-1/.url b/deps/polkit-qt5-1/.url
new file mode 100644
index 0000000..2be4684
--- /dev/null
+++ b/deps/polkit-qt5-1/.url
@@ -0,0 +1 @@
+https://download.kde.org/stable/polkit-qt-1/polkit-qt-1-0.113.0.tar.xz
diff --git a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild
index 39c97a6..951071e 100755
--- a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild
+++ b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild
@@ -20,14 +20,20 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# Modified 2014, 2015, 2016, 2017 by Eric Hameleers <alien@slackware.com>
+# Modified 2014, 2015, 2016, 2017, 2019 by Eric Hameleers <alien@slackware.com>
+cd $(dirname $0) ; CWD=$(pwd)
+
PKGNAM=polkit-qt5-1
-VERSION=${VERSION:-50624e0_20160719git}
-BUILD=${BUILD:-3}
+SRCNAM=polkit-qt-1
+VERSION=${VERSION:-0.113.0}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
-NUMJOBS=${NUMJOBS:--j7}
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -40,14 +46,19 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=$ARCH -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
- SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ SLKCFLAGS="-O2 -march=$ARCH -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
@@ -61,20 +72,16 @@ else
fi
# Avoid a version number in .la files:
-if [ -d /usr/lib${LIBDIRSUFFIX}/qt ]; then
- QTDIR=/usr/lib${LIBDIRSUFFIX}/qt
+if [ -d /usr/lib${LIBDIRSUFFIX}/qt5 ]; then
+ QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5
fi
-CWD=$(pwd)
-TMP=${TMP:-/tmp}
-PKG=$TMP/package-$PKGNAM
-
rm -rf $PKG
mkdir -p $TMP $PKG/usr
cd $TMP
-rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1
-cd $PKGNAM-$VERSION || exit 1
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1
+cd $SRCNAM-$VERSION || exit 1
chown -R root:root .
find . \
@@ -83,9 +90,7 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Autodetects the Qt version to use, preferring Qt 5 over Qt 4.
-# You can force a Qt 4 build passing -DUSE_QT4:bool=ON to CMake.
-
+# Support for Qt4 was removed in 0.113.0:
mkdir -p build
cd build
cmake \
diff --git a/deps/qt5-speech/.url b/deps/qt5-speech/.url
index c279fad..9080e41 100644
--- a/deps/qt5-speech/.url
+++ b/deps/qt5-speech/.url
@@ -1 +1 @@
-https://download.qt.io/official_releases/qt/5.13/5.13.0/submodules/qtspeech-everywhere-src-5.13.0.tar.xz
+https://download.qt.io/official_releases/qt/5.13/5.13.1/submodules/qtspeech-everywhere-src-5.13.1.tar.xz
diff --git a/deps/qt5-speech/qt5-speech.SlackBuild b/deps/qt5-speech/qt5-speech.SlackBuild
index 9782148..5bbd32c 100755
--- a/deps/qt5-speech/qt5-speech.SlackBuild
+++ b/deps/qt5-speech/qt5-speech.SlackBuild
@@ -25,11 +25,11 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=qt5-speech
-SRCVER=${SRCVER:-"5.13.0"}
+SRCVER=${SRCVER:-"5.13.1"}
VERSION=$(echo $SRCVER | tr - _)
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-"-j$(nproc)"}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/deps/qt5/.deps b/deps/qt5/.deps
index c276ccc..d1eaacd 100644
--- a/deps/qt5/.deps
+++ b/deps/qt5/.deps
@@ -1,3 +1,2 @@
OpenAL
libxkbcommon
-woff2
diff --git a/deps/qt5/.url b/deps/qt5/.url
index 6563ae9..63b180a 100644
--- a/deps/qt5/.url
+++ b/deps/qt5/.url
@@ -1 +1 @@
-https://download.qt.io/official_releases/qt/5.13/5.13.0/single/qt-everywhere-src-5.13.0.tar.xz
+https://download.qt.io/official_releases/qt/5.13/5.13.1/single/qt-everywhere-src-5.13.1.tar.xz
diff --git a/deps/qt5/patches/qt5.qtbug-76255.patch b/deps/qt5/patches/qt5.qtbug-76255.patch
new file mode 100644
index 0000000..678913c
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-76255.patch
@@ -0,0 +1,35 @@
+From cc32a691936f37eaaec618a71edd62f896009c9d Mon Sep 17 00:00:00 2001
+From: Joerg Bornemann <joerg.bornemann@qt.io>
+Date: Fri, 06 Sep 2019 10:54:44 +0200
+Subject: [PATCH] Fix CMake config files for -libdir different from "lib"
+
+When Qt was configured with -libdir different from "lib", one could not
+build with CMake whenever a static lib was pulled in (e.g. uitools).
+
+Do not hard-code "/lib" but use the correct variable also for static
+libraries.
+
+Fixes: QTBUG-76255
+Change-Id: I28c6861752e29e461247628d2b1f8a9ec32f0790
+Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
+Reviewed-by: Fabian Vogt <fabian@ritter-vogt.de>
+---
+
+diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+index d4fd057..f4a34d6 100644
+--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
++++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+@@ -53,7 +53,11 @@
+ set(_lib_deps)
+ set(_link_flags)
+
+- get_filename_component(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/lib\" ABSOLUTE)
++!!IF isEmpty(CMAKE_LIB_DIR_IS_ABSOLUTE)
++ set(_qt5_install_libs \"${_qt5$${CMAKE_MODULE_NAME}_install_prefix}/$${CMAKE_LIB_DIR}\")
++!!ELSE
++ set(_qt5_install_libs \"$${CMAKE_LIB_DIR}\")
++!!ENDIF
+
+ if(EXISTS \"${prl_file_location}\")
+ file(STRINGS \"${prl_file_location}\" _prl_strings REGEX \"QMAKE_PRL_LIBS_FOR_CMAKE[ \\t]*=\")
+
diff --git a/deps/qt5/patches/qt5.qtbug-77364.patch b/deps/qt5/patches/qt5.qtbug-77364.patch
new file mode 100644
index 0000000..088856c
--- /dev/null
+++ b/deps/qt5/patches/qt5.qtbug-77364.patch
@@ -0,0 +1,13 @@
+diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
+index 04290a4ce1..27773d5762 100644
+--- a/src/widgets/kernel/qwidget.cpp
++++ b/src/widgets/kernel/qwidget.cpp
+@@ -6446,7 +6446,7 @@ void QWidget::setFocusProxy(QWidget * w)
+
+ if (changingAppFocusWidget) {
+ QWidget *newDeepestFocusProxy = d_func()->deepestFocusProxy();
+- QApplicationPrivate::focus_widget = newDeepestFocusProxy ? newDeepestFocusProxy : this;
++ QApplicationPrivate::setFocusWidget(newDeepestFocusProxy ? newDeepestFocusProxy : this, Qt::NoFocusReason);
+ }
+ }
+
diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild
index 529aa78..079c1a1 100755
--- a/deps/qt5/qt5.SlackBuild
+++ b/deps/qt5/qt5.SlackBuild
@@ -63,17 +63,16 @@
# Modifications for qt 5.12.1 2019 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.12.3 2019 by Eric Hameleers, Eindhoven, NL
# Modifications for qt 5.13.0 2019 by Eric Hameleers, Eindhoven, NL
+# Modifications for qt 5.13.1 2019 by Eric Hameleers, Eindhoven, NL
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=qt5
-VERSION=${VERSION:-5.13.0}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-5.13.1}
+BUILD=${BUILD:-1}
PKGSRC=$(echo $VERSION |cut -d- -f1)
PKGVER=$(echo $VERSION |tr - _)
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$(uname -m)" in
@@ -128,6 +127,8 @@ case "$ARCH" in
*) TARGET=$ARCH-slackware-linux ;;
esac
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
TMP=${TMP:-/tmp}
PKG=$TMP/package-${PKGNAM}
@@ -157,15 +158,14 @@ fi
# Fix path to mysql header:
cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1
-# Fix freezes in KWin on hybrid NVIDIA systems (also solved in KWin 5.16.2):
+# Fix keyboard input in webengine:
cd qtbase
- cat $CWD/patches/qtbase-qxcbwindow.patch | patch -p1 --verbose || exit 1
+ cat $CWD/patches/qt5.qtbug-77364.patch | patch -p1 --verbose || exit 1
cd - 1>/dev/null
-# Change the default compression back to zlib for backwards compatibility,
-# QTBUG-76521:
+# Fix hardcoded lib/ dir on x86_64:
cd qtbase
- cat $CWD/patches/qtbase-zlib-compression.patch | patch -p1 --verbose || exit 1
+ cat $CWD/patches/qt5.qtbug-76255.patch | patch -p1 --verbose || exit 1
cd - 1>/dev/null
# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui
@@ -177,10 +177,6 @@ cd qtbase
| patch -p1 --verbose || exit 1
cd - 1>/dev/null
-# More quoting is needed (QTBUG-76244) to fix the error in kjsembed (at least):
-# "Error:string sub-command REGEX, mode REPLACE needs at least 6 arguments total to command."
-cat $CWD/patches/qt5.qt5uitoolsconfig.patch | patch -p1 --verbose || exit 1
-
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/wayland-protocols/.url b/deps/wayland-protocols/.url
index 45e2e88..b501805 100644
--- a/deps/wayland-protocols/.url
+++ b/deps/wayland-protocols/.url
@@ -1,3 +1,3 @@
-https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz
-https://wayland.freedesktop.org/releases/wayland-protocols-1.12.tar.xz.sig
+https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz
+https://wayland.freedesktop.org/releases/wayland-protocols-1.18.tar.xz.sig
diff --git a/deps/wayland-protocols/wayland-protocols.SlackBuild b/deps/wayland-protocols/wayland-protocols.SlackBuild
index 9e94b93..044da9f 100755
--- a/deps/wayland-protocols/wayland-protocols.SlackBuild
+++ b/deps/wayland-protocols/wayland-protocols.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA
-# Copyright 2017 Eric Hameleers, Eindhoven, NL
+# Copyright 2017, 2019 Eric Hameleers, Eindhoven, NL
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -22,14 +22,14 @@
# SUCH DAMAGE.
# -----------------------------------------------------------------------------
+cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=wayland-protocols
-VERSION=${VERSION:-1.12}
+VERSION=${VERSION:-1.18}
BUILD=${BUILD:-1}
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -44,12 +44,17 @@ if [ -z "$ARCH" ]; then
export ARCH
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
# Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX:
if [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
- LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i586" ]; then
- SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ SLKCFLAGS="-O2 -march=${ARCH} -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"