From 780a8bb7752241f169bbbc7b48129ee489574f10 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 25 Jun 2017 12:33:35 +0200 Subject: Updated deps for upcoming KDE 5_17.06 On slackware-current, we switch to Qt 5.9 which is going to be a LTS release (Long Term Support). --- deps/.qt5_updates | 5 +- deps/OpenAL/.url | 2 +- deps/OpenAL/OpenAL.SlackBuild | 14 +++- deps/PyQt5/.url | 2 +- deps/PyQt5/PyQt5.SlackBuild | 10 ++- deps/grantlee/grantlee.SlackBuild | 9 ++- deps/libdbusmenu-qt5/.url | 1 + deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild | 22 +++--- deps/libdbusmenu-qt5/slack-desc | 2 +- deps/phonon/phonon.SlackBuild | 9 ++- deps/polkit-qt5-1/polkit-qt5-1.SlackBuild | 9 ++- deps/poppler/.url | 2 +- deps/poppler/poppler.SlackBuild | 2 +- deps/qca-qt5/qca-qt5.SlackBuild | 7 +- deps/qt-gstreamer/qt-gstreamer.SlackBuild | 9 ++- deps/qt5-webkit/.url | 2 +- deps/qt5-webkit/qt5-webkit.SlackBuild | 16 ++-- deps/qt5/.url | 2 +- deps/qt5/patches/qt5.mysql.h.diff | 7 +- deps/qt5/patches/qt5.qtbug-60558.patch | 32 ++++++++ deps/qt5/patches/qt5.qtbug-61140.patch | 101 ++++++++++++++++++++++++ deps/qt5/qt5.SlackBuild | 49 +++++------- deps/qtav/.url | 1 + deps/qtav/qtav.SlackBuild | 8 +- deps/wayland/.url | 2 +- deps/wayland/wayland.SlackBuild | 7 +- 26 files changed, 248 insertions(+), 84 deletions(-) create mode 100644 deps/libdbusmenu-qt5/.url create mode 100644 deps/qt5/patches/qt5.qtbug-60558.patch create mode 100644 deps/qt5/patches/qt5.qtbug-61140.patch create mode 100644 deps/qtav/.url diff --git a/deps/.qt5_updates b/deps/.qt5_updates index 83e0cb6..f221c63 100644 --- a/deps/.qt5_updates +++ b/deps/.qt5_updates @@ -1,2 +1,3 @@ -sni-qt qca-qt5 qt-gstreamer phonon PyQt5 polkit-qt5-1 grantlee poppler libdbusmenu-qt5 - +#sni-qt qca-qt5 qt-gstreamer phonon PyQt5 polkit-qt5-1 grantlee poppler libdbusmenu-qt5 +# 20170620 after qt5 & qt5-webkit: +OpenAL qt-gstreamer phonon PyQt5 polkit-qt5-1 grantlee poppler libdbusmenu-qt5 qca-qt5 qtav wayland diff --git a/deps/OpenAL/.url b/deps/OpenAL/.url index 4cdb0ea..1174201 100644 --- a/deps/OpenAL/.url +++ b/deps/OpenAL/.url @@ -1,2 +1,2 @@ -http://kcat.strangesoft.net/openal-releases/openal-soft-1.17.2.tar.bz2 +http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.0.tar.bz2 diff --git a/deps/OpenAL/OpenAL.SlackBuild b/deps/OpenAL/OpenAL.SlackBuild index 6d0b642..be1a359 100755 --- a/deps/OpenAL/OpenAL.SlackBuild +++ b/deps/OpenAL/OpenAL.SlackBuild @@ -25,7 +25,7 @@ PKGNAM=OpenAL SRCNAM=openal-soft -VERSION=${VERSION:-1.17.2} +VERSION=${VERSION:-1.18.0} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} @@ -42,7 +42,7 @@ else MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -52,6 +52,12 @@ else 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="" @@ -100,7 +106,9 @@ install -m0644 alsoftrc.sample $PKG/etc/openal/alsoft.conf.sample # Add documentation: mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a COPYING README env-vars.txt hrtf.txt $PKG/usr/doc/$PKGNAM-$VERSION || true +cp -a \ + COPYING ChangeLog README XCompile.txt docs/*.txt \ + $PKG/usr/doc/$PKGNAM-$VERSION || true chown -R root:root $PKG/usr/doc/$PKGNAM-$VERSION find $PKG/usr/doc -type f -exec chmod 644 {} \; diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url index 97531f1..ae0f121 100644 --- a/deps/PyQt5/.url +++ b/deps/PyQt5/.url @@ -1,2 +1,2 @@ -https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7.1/PyQt5_gpl-5.7.1.tar.gz +https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.8.2/PyQt5_gpl-5.8.2.tar.gz diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index d63e780..9da188a 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -27,8 +27,8 @@ # Modified by Eric Hameleers PKGNAM=PyQt5 -VERSION=${VERSION:-5.7.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.8.2} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -36,7 +36,7 @@ NUMJOBS=${NUMJOBS:--j7} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -50,6 +50,8 @@ PKG=$TMP/package-$PKGNAM if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" elif [ "$ARCH" = "x86_64" ]; then @@ -96,7 +98,7 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" \ mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION cp -a \ - GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS doc/* \ + ChangeLog LICENSE* NEWS README doc/* \ $PKG/usr/doc/$PKGNAM-$VERSION mkdir -p $PKG/install diff --git a/deps/grantlee/grantlee.SlackBuild b/deps/grantlee/grantlee.SlackBuild index b9445c8..a9e437e 100755 --- a/deps/grantlee/grantlee.SlackBuild +++ b/deps/grantlee/grantlee.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -26,7 +26,7 @@ PKGNAM=grantlee SRCNAM=grantlee VERSION=${VERSION:-5.1.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} @@ -34,7 +34,7 @@ NUMJOBS=${NUMJOBS:--j7} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -45,6 +45,9 @@ fi 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="" diff --git a/deps/libdbusmenu-qt5/.url b/deps/libdbusmenu-qt5/.url new file mode 100644 index 0000000..a85ab5b --- /dev/null +++ b/deps/libdbusmenu-qt5/.url @@ -0,0 +1 @@ +http://archive.ubuntu.com/ubuntu/pool/main/libd/libdbusmenu-qt/libdbusmenu-qt_0.9.3+16.04.20160218.orig.tar.gz diff --git a/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild b/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild index efec6bd..103e251 100755 --- a/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild +++ b/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010, 2011, 2012, 2014, 2015 Eric Hameleers, Eindhoven, The Netherlands +# Copyright 2010, 2011, 2012, 2014, 2015, 2017 Eric Hameleers, Eindhoven, The Netherlands # Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. @@ -30,8 +30,9 @@ # grep dbusmenu_qt_VERSION dbusmenu-qt/CMakeLists.txt PKGNAM=libdbusmenu-qt5 -VERSION=${VERSION:-r267_20140619} -BUILD=${BUILD:-3} +SRCNAM=libdbusmenu-qt +VERSION=${VERSION:-0.9.3+16.04.20160218} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -39,7 +40,7 @@ NUMJOBS=${NUMJOBS:--j7} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -50,6 +51,9 @@ fi 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="" @@ -68,9 +72,9 @@ PKG=$TMP/package-$PKGNAM 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 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/${SRCNAM}_${VERSION}.orig.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -105,10 +109,6 @@ cp -a \ COPYING NEWS README \ $PKG/usr/doc/$PKGNAM-$VERSION -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/doc -mv $PKG/usr/share/doc/dbusmenu-qt/* $PKG/usr/doc/$PKGNAM-$VERSION/doc -rm -rf $PKG/usr/share/doc - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc diff --git a/deps/libdbusmenu-qt5/slack-desc b/deps/libdbusmenu-qt5/slack-desc index 7591a5a..22f2f31 100644 --- a/deps/libdbusmenu-qt5/slack-desc +++ b/deps/libdbusmenu-qt5/slack-desc @@ -12,7 +12,7 @@ libdbusmenu-qt5: This library provides a Qt5 implementation of the DBusMenu prot libdbusmenu-qt5: The DBusMenu protocol makes it possible for applications to export libdbusmenu-qt5: and import their menus over DBus. libdbusmenu-qt5: -libdbusmenu-qt5: Homepage: http://people.canonical.com/~agateau/dbusmenu/ +libdbusmenu-qt5: Homepage: https://launchpad.net/libdbusmenu-qt libdbusmenu-qt5: libdbusmenu-qt5: libdbusmenu-qt5: diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild index c40cff1..feddec1 100755 --- a/deps/phonon/phonon.SlackBuild +++ b/deps/phonon/phonon.SlackBuild @@ -26,14 +26,14 @@ PKGNAM=phonon VERSION=${VERSION:-4.9.1} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -44,6 +44,9 @@ fi 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="" @@ -142,7 +145,7 @@ if [ -d $PKG/usr/man ]; then fi mkdir -p $PKG/usr/doc/phonon-$VERSION -cp -a phonon/{BUGS,IDEAS,TODO} $PKG/usr/doc/phonon-$VERSION +cp -a doc/{BUGS,IDEAS,TODO} $PKG/usr/doc/phonon-$VERSION find $PKG | xargs file | grep -e "executable" -e "shared object" \ | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild index a9b7303..39c97a6 100755 --- a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild +++ b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild @@ -20,19 +20,19 @@ # 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 by Eric Hameleers +# Modified 2014, 2015, 2016, 2017 by Eric Hameleers PKGNAM=polkit-qt5-1 VERSION=${VERSION:-50624e0_20160719git} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -43,6 +43,9 @@ fi 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="" diff --git a/deps/poppler/.url b/deps/poppler/.url index b4da1a6..b1aadaa 100644 --- a/deps/poppler/.url +++ b/deps/poppler/.url @@ -1,2 +1,2 @@ -https://poppler.freedesktop.org/poppler-0.53.0.tar.xz +https://poppler.freedesktop.org/poppler-0.56.0.tar.xz diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild index 3714d8e..8ac66db 100755 --- a/deps/poppler/poppler.SlackBuild +++ b/deps/poppler/poppler.SlackBuild @@ -24,7 +24,7 @@ # Modified 2016, 2017 by Eric Hameleers PKGNAM=poppler -VERSION=${VERSION:-0.53.0} +VERSION=${VERSION:-0.56.0} BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 6950592..dc8b76c 100755 --- a/deps/qca-qt5/qca-qt5.SlackBuild +++ b/deps/qca-qt5/qca-qt5.SlackBuild @@ -24,13 +24,13 @@ PKGNAM=qca-qt5 SRCNAM=qca VERSION=${VERSION:-2.1.3} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -41,6 +41,9 @@ fi 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="" diff --git a/deps/qt-gstreamer/qt-gstreamer.SlackBuild b/deps/qt-gstreamer/qt-gstreamer.SlackBuild index 2470b81..9fb80a2 100755 --- a/deps/qt-gstreamer/qt-gstreamer.SlackBuild +++ b/deps/qt-gstreamer/qt-gstreamer.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2014, 2015, 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2014, 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PKGNAM=qt-gstreamer VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} NUMJOBS=${NUMJOBS:--j7} @@ -32,7 +32,7 @@ NUMJOBS=${NUMJOBS:--j7} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; armv7hl) export ARCH=$MARCH ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: @@ -43,6 +43,9 @@ fi 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="" diff --git a/deps/qt5-webkit/.url b/deps/qt5-webkit/.url index fbb8678..2bdc680 100644 --- a/deps/qt5-webkit/.url +++ b/deps/qt5-webkit/.url @@ -1 +1 @@ -http://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz +http://download.qt.io/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild index 588e2c5..6b18728 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 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 2016,2017 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5-webkit -VERSION=${VERSION:-5.7.1} +VERSION=${VERSION:-5.9.0} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -33,7 +33,7 @@ NUMJOBS=${NUMJOBS:--j7} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -45,6 +45,10 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" SLKLDFLAGS="" @@ -131,9 +135,9 @@ sed -i \ 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 +## 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 diff --git a/deps/qt5/.url b/deps/qt5/.url index 350e58d..79507a2 100644 --- a/deps/qt5/.url +++ b/deps/qt5/.url @@ -1 +1 @@ -http://download.qt.io/official_releases/qt/5.7/5.7.1/single/qt-everywhere-opensource-src-5.7.1.tar.xz +https://download.qt.io/archive/qt/5.9/5.9.0/single/qt-everywhere-opensource-src-5.9.0.tar.xz diff --git a/deps/qt5/patches/qt5.mysql.h.diff b/deps/qt5/patches/qt5.mysql.h.diff index 41dc9d3..f1cf11b 100644 --- a/deps/qt5/patches/qt5.mysql.h.diff +++ b/deps/qt5/patches/qt5.mysql.h.diff @@ -1,7 +1,6 @@ -diff -Naur qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h ---- qt-everywhere-opensource-src-5.1.0.orig/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h 2013-07-02 07:09:52.000000000 +0000 -+++ qt-everywhere-opensource-src-5.1.0/qtbase/src/sql/drivers/mysql/qsql_mysql_p.h 2013-07-21 21:21:01.190172379 +0000 -@@ -60,7 +60,7 @@ +--- qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h.orig 2017-05-26 14:43:31.000000000 +0200 ++++ qt-everywhere-opensource-src-5.9.0/qtbase/src/plugins/sqldrivers/mysql/qsql_mysql_p.h 2017-06-17 22:11:34.211899826 +0200 +@@ -57,7 +57,7 @@ #include #endif diff --git a/deps/qt5/patches/qt5.qtbug-60558.patch b/deps/qt5/patches/qt5.qtbug-60558.patch new file mode 100644 index 0000000..2d03920 --- /dev/null +++ b/deps/qt5/patches/qt5.qtbug-60558.patch @@ -0,0 +1,32 @@ +https://github.com/qt/qtbase/commit/f45c6c18.patch + +From f45c6c180463ccb6620e1d273a264f14a1204a93 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Wed, 3 May 2017 14:08:50 -0700 +Subject: [PATCH] QInternal::unregisterCallback: don't crash on unregistering + during exit + +Task-number: QTBUG-60558 +Change-Id: Ica9894dc9b5e48278fd4fffd14bb34c6d98d2555 +Reviewed-by: Olivier Goffart (Woboq GmbH) +--- + src/corelib/global/qglobal.cpp | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp +index c37503f3db..22fc20d47e 100644 +--- a/src/corelib/global/qglobal.cpp ++++ b/src/corelib/global/qglobal.cpp +@@ -3988,8 +3988,10 @@ bool QInternal::registerCallback(Callback cb, qInternalCallback callback) + bool QInternal::unregisterCallback(Callback cb, qInternalCallback callback) + { + if (cb >= 0 && cb < QInternal::LastCallback) { +- QInternal_CallBackTable *cbt = global_callback_table(); +- return (bool) cbt->callbacks[cb].removeAll(callback); ++ if (global_callback_table.exists()) { ++ QInternal_CallBackTable *cbt = global_callback_table(); ++ return (bool) cbt->callbacks[cb].removeAll(callback); ++ } + } + return false; + } diff --git a/deps/qt5/patches/qt5.qtbug-61140.patch b/deps/qt5/patches/qt5.qtbug-61140.patch new file mode 100644 index 0000000..17468a9 --- /dev/null +++ b/deps/qt5/patches/qt5.qtbug-61140.patch @@ -0,0 +1,101 @@ +https://github.com/qt/qtbase/commit/744fd39e.patch + +From 744fd39e66b0b44e65a2505d674fa1cda8b205a4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= +Date: Fri, 2 Jun 2017 11:09:55 +0200 +Subject: [PATCH] xcb: Don't destroy foreign windows + +We can't rely on virtual dispatch in the destructor. + +Task-number: QTBUG-61140 +Change-Id: Ib1026caf126095778c24254775cb5a0bfecf3a38 +Reviewed-by: Fabian Vogt +Reviewed-by: Gatis Paeglis +--- + src/plugins/platforms/xcb/qxcbintegration.cpp | 18 +----------------- + src/plugins/platforms/xcb/qxcbwindow.cpp | 16 ++++++++++------ + src/plugins/platforms/xcb/qxcbwindow.h | 12 ++++++++++++ + 3 files changed, 23 insertions(+), 23 deletions(-) + +diff --git a/src/plugins/platforms/xcb/qxcbintegration.cpp b/src/plugins/platforms/xcb/qxcbintegration.cpp +index b414bee204..8e3ee20329 100644 +--- a/src/plugins/platforms/xcb/qxcbintegration.cpp ++++ b/src/plugins/platforms/xcb/qxcbintegration.cpp +@@ -214,25 +214,9 @@ QPlatformWindow *QXcbIntegration::createPlatformWindow(QWindow *window) const + return xcbWindow; + } + +-class QXcbForeignWindow : public QXcbWindow +-{ +-public: +- QXcbForeignWindow(QWindow *window, WId nativeHandle) +- : QXcbWindow(window) { m_window = nativeHandle; } +- ~QXcbForeignWindow() {} +- bool isForeignWindow() const override { return true; } +- +-protected: +- // No-ops +- void create() override {} +- void destroy() override {} +-}; +- + QPlatformWindow *QXcbIntegration::createForeignWindow(QWindow *window, WId nativeHandle) const + { +- QXcbWindow *xcbWindow = new QXcbForeignWindow(window, nativeHandle); +- xcbWindow->create(); +- return xcbWindow; ++ return new QXcbForeignWindow(window, nativeHandle); + } + + #ifndef QT_NO_OPENGL +diff --git a/src/plugins/platforms/xcb/qxcbwindow.cpp b/src/plugins/platforms/xcb/qxcbwindow.cpp +index 289d0720e7..d6c69d52ef 100644 +--- a/src/plugins/platforms/xcb/qxcbwindow.cpp ++++ b/src/plugins/platforms/xcb/qxcbwindow.cpp +@@ -597,13 +597,17 @@ QXcbWindow::~QXcbWindow() + } + + destroy(); ++} + +- if (isForeignWindow()) { +- if (connection()->mouseGrabber() == this) +- connection()->setMouseGrabber(Q_NULLPTR); +- if (connection()->mousePressWindow() == this) +- connection()->setMousePressWindow(Q_NULLPTR); +- } ++QXcbForeignWindow::~QXcbForeignWindow() ++{ ++ // Clear window so that destroy() does not affect it ++ m_window = 0; ++ ++ if (connection()->mouseGrabber() == this) ++ connection()->setMouseGrabber(nullptr); ++ if (connection()->mousePressWindow() == this) ++ connection()->setMousePressWindow(nullptr); + } + + void QXcbWindow::destroy() +diff --git a/src/plugins/platforms/xcb/qxcbwindow.h b/src/plugins/platforms/xcb/qxcbwindow.h +index 56628094ee..f38343b6c2 100644 +--- a/src/plugins/platforms/xcb/qxcbwindow.h ++++ b/src/plugins/platforms/xcb/qxcbwindow.h +@@ -278,6 +278,18 @@ public Q_SLOTS: + xcb_cursor_t m_currentBitmapCursor = XCB_CURSOR_NONE; + }; + ++class QXcbForeignWindow : public QXcbWindow ++{ ++public: ++ QXcbForeignWindow(QWindow *window, WId nativeHandle) ++ : QXcbWindow(window) { m_window = nativeHandle; } ++ ~QXcbForeignWindow(); ++ bool isForeignWindow() const override { return true; } ++ ++protected: ++ void create() override {} // No-op ++}; ++ + QT_END_NAMESPACE + + Q_DECLARE_METATYPE(QXcbWindow*) diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index 88908e1..34656dc 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -36,7 +36,7 @@ # Alternate method (we don't use this): # wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched # -# Modifications 2010, 2011, 2012, 2013, 2014, 2015, 2016 Eric Hameleers, Eindhoven, NL +# Modifications 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017 Eric Hameleers, Eindhoven, NL # qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4, are built from original nokia sources. # # Modifications for qt 5.2.0 2013 by Michael James, AU @@ -49,19 +49,20 @@ # Modifications for qt 5.6.1 2016 by Eric Hameleers, Eindhoven, NL # 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 PKGNAM=qt5 -VERSION=${VERSION:-5.7.1} +VERSION=${VERSION:-5.9.0} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) -BUILD=${BUILD:-3} +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 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -73,6 +74,10 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" SLKLDFLAGS="" @@ -119,12 +124,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix dangling symlinks, thanks Larry Hajali: -rm -f qtwebengine/src/3rdparty/chromium/third_party/mesa/src/src/gallium/state_trackers/d3d1x/w32api -rm -f qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/perf -ln -s ../../../../../tools/perf \ - qtwebengine/src/3rdparty/chromium/third_party/webrtc/tools/e2e_quality/audio/ - # 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 @@ -136,19 +135,18 @@ fi # Fix path to mysql header: cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 -## Don't depend on features that were only added in linux 4.5: -#cd qtwebengine -# cat $CWD/patches/qt5.glibc224.patch | patch -p1 --verbose || exit 1 -#cd - +# Fix missing private includes: QTBUG-37417 +sed -e '/CMAKE_NO_PRIVATE_INCLUDES\ \=\ true/d' \ + -i qtbase/mkspecs/features/create_cmake.prf -# Don't unload plugins in QPluginLoader (segfault in LXQT): +# Don't destroy foreign windows, QTBUG-61140: cd qtbase - cat $CWD/patches/qt5.qtbug-49061.patch | patch -p1 --verbose || exit 1 + cat $CWD/patches/qt5.qtbug-61140.patch | patch -p1 --verbose || exit 1 cd - -# Fix file chooser segfault on Gnome/Wayland: +# Fix crashes with QtCurve, QTBUG-60558: cd qtbase - cat $CWD/patches/qt5.qtbug-55583.patch | patch -p1 --verbose || exit 1 + cat $CWD/patches/qt5.qtbug-60558.patch | patch -p1 --verbose || exit 1 cd - if ! pkg-config --exists libpulse 2>/dev/null ; then @@ -190,7 +188,6 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -examplesdir /usr/doc/qt5-$PKGVER/examples \ -system-libpng \ -system-libjpeg \ - -system-pcre \ -system-sqlite \ -system-zlib \ -plugin-sql-mysql \ @@ -226,16 +223,12 @@ make install INSTALL_ROOT=$PKG || exit 1 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: +# Fix internal linking for Qt5WebEngineCore.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 + -e 's|-Wl,--start-group.* -Wl,--end-group||' \ + -e "s|-L${PWD}/qtwebengine/src/core/api/Release||" \ + $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/Qt5WebEngineCore.pc # Fix the path in prl files: find "$PKG/usr/lib${LIBDIRSUFFIX}" -type f -name '*.prl' \ diff --git a/deps/qtav/.url b/deps/qtav/.url new file mode 100644 index 0000000..91cdfc3 --- /dev/null +++ b/deps/qtav/.url @@ -0,0 +1 @@ +https://github.com/wang-bin/QtAV#tag=1.11.0 diff --git a/deps/qtav/qtav.SlackBuild b/deps/qtav/qtav.SlackBuild index 75119c0..5491f7c 100755 --- a/deps/qtav/qtav.SlackBuild +++ b/deps/qtav/qtav.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=qtav SRCNAM=QtAV VERSION=${VERSION:-1.11.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j4 "} CWD=$(pwd) @@ -37,7 +37,7 @@ PKG=$TMP/package-$PKGNAM # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$(uname -m)" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;; # Unless $ARCH is already set, use uname -m for all other archs: *) ARCH=$(uname -m) ;; @@ -49,6 +49,10 @@ if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" SLKLDFLAGS="" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + SLKLDFLAGS="" + LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" SLKLDFLAGS="-L/usr/lib64" diff --git a/deps/wayland/.url b/deps/wayland/.url index be77806..22ad4f9 100644 --- a/deps/wayland/.url +++ b/deps/wayland/.url @@ -1,2 +1,2 @@ -https://wayland.freedesktop.org/releases/wayland-1.12.0.tar.xz +https://wayland.freedesktop.org/releases/wayland-1.13.0.tar.xz diff --git a/deps/wayland/wayland.SlackBuild b/deps/wayland/wayland.SlackBuild index 0b05265..ca34b35 100755 --- a/deps/wayland/wayland.SlackBuild +++ b/deps/wayland/wayland.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=wayland -VERSION=${VERSION:-1.12.0} +VERSION=${VERSION:-1.13.0} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:" -j4 "} @@ -42,7 +42,7 @@ else MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$MARCH ;; @@ -52,6 +52,9 @@ else 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="" -- cgit v1.2.3