From 69943897d83f3e147c57039b087059b01727a0f3 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 9 May 2019 16:00:45 +0200 Subject: Deps: update qt5 and also update/rebuild the 'deps' programs using it --- deps/PyQt5/.url | 2 +- deps/PyQt5/PyQt5.SlackBuild | 4 ++-- deps/PyQt5/slack-desc | 4 ++-- deps/gpgme/.url | 2 +- deps/gpgme/gpgme.SlackBuild | 14 ++++--------- deps/libxkbcommon/.url | 2 +- deps/libxkbcommon/libxkbcommon.SlackBuild | 2 +- deps/qca-qt5/.url | 2 +- deps/qca-qt5/qca-qt5.SlackBuild | 9 +++----- deps/qt5-speech/.url | 2 +- deps/qt5-speech/qt5-speech.SlackBuild | 7 +++++-- deps/qt5-webkit/qt5-webkit.SlackBuild | 2 +- deps/qt5/.url | 2 +- .../qt5.qtbase_cmake_isystem_includes.patch | 14 +++++++++++++ deps/qt5/qt5.SlackBuild | 24 +++++++++++++++------- deps/sip/.url | 2 +- deps/sip/sip.SlackBuild | 8 ++++---- 17 files changed, 60 insertions(+), 42 deletions(-) create mode 100644 deps/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url index 4bf101b..6fd7b38 100644 --- a/deps/PyQt5/.url +++ b/deps/PyQt5/.url @@ -1,2 +1,2 @@ -https://www.riverbankcomputing.com/static/Downloads/PyQt5/PyQt5_gpl-5.12.tar.gz +https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.12.1/PyQt5_gpl-5.12.1.tar.gz diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index 395155a..066e1b8 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -27,8 +27,8 @@ # Modified by Eric Hameleers PKGNAM=PyQt5 -VERSION=${VERSION:-5.12} -BUILD=${BUILD:-2} +VERSION=${VERSION:-5.12.1} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} diff --git a/deps/PyQt5/slack-desc b/deps/PyQt5/slack-desc index 9c1fd74..3f764f0 100644 --- a/deps/PyQt5/slack-desc +++ b/deps/PyQt5/slack-desc @@ -10,8 +10,8 @@ PyQt5: PyQt5 (Python bindings for Qt) PyQt5: PyQt5: PyQt5 is a set of Python bindings for Trolltech's Qt5 application PyQt5: framework and runs on all platforms supported by Qt5. -PyQt5: -PyQt5: +PyQt5: +PyQt5: PyQt5: PyQt5: PyQt5: diff --git a/deps/gpgme/.url b/deps/gpgme/.url index fa15d27..98cd491 100644 --- a/deps/gpgme/.url +++ b/deps/gpgme/.url @@ -1 +1 @@ -https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.12.0.tar.bz2 +https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.13.0.tar.bz2 diff --git a/deps/gpgme/gpgme.SlackBuild b/deps/gpgme/gpgme.SlackBuild index d9fe9f3..ed23454 100755 --- a/deps/gpgme/gpgme.SlackBuild +++ b/deps/gpgme/gpgme.SlackBuild @@ -21,21 +21,14 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2017 by Eric Hameleers +# Modified 2017, 2018, 2019 by Eric Hameleers cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gpgme -VERSION=${VERSION:-1.12.0} +VERSION=${VERSION:-1.13.0} BUILD=${BUILD:-1} -# Find out the default python version: -if [ $( python -c 'import sys ; print sys.version_info[0]' ) -eq 3 ]; then - MYPY="python" -else - MYPY="python2" -fi - NUMJOBS=${NUMJOBS:-"-j$(nproc)"} TMP=${TMP:-/tmp} @@ -100,11 +93,12 @@ CXXFLAGS="$SLKCFLAGS" \ --sysconfdir=/etc \ --infodir=/usr/info \ --docdir=/usr/doc/gpgme-$VERSION \ - --enable-languages="cl cpp $MYPY qt" \ --disable-gpgsm-test \ --build=$TARGET \ --host=$TARGET \ || exit 1 + # Leave this out, then it will enable all bindings (also python 2 and 3): + #--enable-languages="cl cpp $MYPY qt" \ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 diff --git a/deps/libxkbcommon/.url b/deps/libxkbcommon/.url index 5c4d34e..9c97562 100644 --- a/deps/libxkbcommon/.url +++ b/deps/libxkbcommon/.url @@ -1,2 +1,2 @@ -https://xkbcommon.org/download/libxkbcommon-0.8.3.tar.xz +https://xkbcommon.org/download/libxkbcommon-0.8.4.tar.xz diff --git a/deps/libxkbcommon/libxkbcommon.SlackBuild b/deps/libxkbcommon/libxkbcommon.SlackBuild index 0ccf3e5..e44da4f 100755 --- a/deps/libxkbcommon/libxkbcommon.SlackBuild +++ b/deps/libxkbcommon/libxkbcommon.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libxkbcommon -VERSION=${VERSION:-0.8.3} +VERSION=${VERSION:-0.8.4} BUILD=${BUILD:-1} TMP=${TMP:-/tmp} diff --git a/deps/qca-qt5/.url b/deps/qca-qt5/.url index f3dd020..7087fa2 100644 --- a/deps/qca-qt5/.url +++ b/deps/qca-qt5/.url @@ -1,2 +1,2 @@ -https://download.kde.org/stable/qca/2.1.3/src/qca-2.1.3.tar.xz +https://download.kde.org/stable/qca/2.2.1/qca-2.2.1.tar.xz diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 3519d31..9187549 100755 --- a/deps/qca-qt5/qca-qt5.SlackBuild +++ b/deps/qca-qt5/qca-qt5.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015, 2016, 2017, 2018 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2016, 2017, 2018, 2019 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,8 +23,8 @@ PKGNAM=qca-qt5 SRCNAM=qca -VERSION=${VERSION:-2.1.3} -BUILD=${BUILD:-3} +VERSION=${VERSION:-2.2.1} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} # Automatically determine the architecture we're building on: @@ -63,9 +63,6 @@ rm -rf $SRCNAM-$VERSION tar xvf $CWD/$SRCNAM-$VERSION.tar.?z* || exit 1 cd $SRCNAM-$VERSION || exit 1 -# Patch for openssl-1.1 compatibility: -cat $CWD/patches/qca_openssl11.patch | patch -p1 --verbose || exit 1 - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/deps/qt5-speech/.url b/deps/qt5-speech/.url index a7b90df..ae886bd 100644 --- a/deps/qt5-speech/.url +++ b/deps/qt5-speech/.url @@ -1 +1 @@ -https://download.qt.io/official_releases/qt/5.12/5.12.1/submodules/qtspeech-everywhere-src-5.12.1.tar.xz +https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz diff --git a/deps/qt5-speech/qt5-speech.SlackBuild b/deps/qt5-speech/qt5-speech.SlackBuild index 6f909a6..41884a7 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.12.1"} +SRCVER=${SRCVER:-"5.12.3"} VERSION=$(echo $SRCVER | tr - _) BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} +NUMJOBS=${NUMJOBS:-"-j$(nproc)"} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -101,6 +101,9 @@ cd build make install INSTALL_ROOT=$PKG || exit 1 cd .. +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + # Strip binaries the Slackware way: find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild index b352f5c..144b95d 100755 --- a/deps/qt5-webkit/qt5-webkit.SlackBuild +++ b/deps/qt5-webkit/qt5-webkit.SlackBuild @@ -27,7 +27,7 @@ PKGNAM=qt5-webkit SRCVER=${SRCVER:-"5.212.0-alpha2"} VERSION=$(echo $SRCVER | tr - _) -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:-"-j$(nproc)"} diff --git a/deps/qt5/.url b/deps/qt5/.url index 91a8b0c..43c00d1 100644 --- a/deps/qt5/.url +++ b/deps/qt5/.url @@ -1 +1 @@ -https://download.qt.io/official_releases/qt/5.12/5.12.1/single/qt-everywhere-src-5.12.1.tar.xz +https://download.qt.io/official_releases/qt/5.12/5.12.3/single/qt-everywhere-src-5.12.3.tar.xz diff --git a/deps/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch b/deps/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch new file mode 100644 index 0000000..ff00e63 --- /dev/null +++ b/deps/qt5/patches/qt5.qtbase_cmake_isystem_includes.patch @@ -0,0 +1,14 @@ +diff -up qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in +--- qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in.foo 2019-04-30 15:18:24.886346423 -0500 ++++ qtbase-everywhere-src-5.12.1/src/gui/Qt5GuiConfigExtras.cmake.in 2019-04-30 15:19:48.303873296 -0500 +@@ -66,8 +66,10 @@ unset(_GL_INCDIRS) + # Don\'t check for existence of the "_qt5gui_OPENGL_INCLUDE_DIR" because it is + # optional. + ++if (NOT ${_qt5gui_OPENGL_INCLUDE_DIR} STREQUAL "/usr/include") + list(APPEND Qt5Gui_INCLUDE_DIRS ${_qt5gui_OPENGL_INCLUDE_DIR}) + set_property(TARGET Qt5::Gui APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES ${_qt5gui_OPENGL_INCLUDE_DIR}) ++endif() + + unset(_qt5gui_OPENGL_INCLUDE_DIR CACHE) + diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index d257bd0..9ee003d 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -61,11 +61,12 @@ # Modifications for qt 5.11.2 2018 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.11.3 2018 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.12.1 2019 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.12.3 2019 by Eric Hameleers, Eindhoven, NL cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5 -VERSION=${VERSION:-5.12.1} +VERSION=${VERSION:-5.12.3} BUILD=${BUILD:-1} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) @@ -160,14 +161,23 @@ cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 # cat $CWD/patches/qt5.webengine_gcc8.patch | patch -p1 --verbose || exit 1 #cd - 1>/dev/null -# QSyntaxHighlighter: cancel delayed highlight if done manually: -cd qtbase - cat $CWD/patches/qt5.delayed_highlight.patch | patch -p1 --verbose || exit 1 -cd - 1>/dev/null +## QSyntaxHighlighter: cancel delayed highlight if done manually: +#cd qtbase +# cat $CWD/patches/qt5.delayed_highlight.patch | patch -p1 --verbose || exit 1 +#cd - 1>/dev/null + +## Fix regression in QPlainTextEdit updating (QTBUG-69310): +#cd qtbase +# cat $CWD/patches/qt5.qtbug-69310.patch | patch -p1 --verbose || exit 1 +#cd - 1>/dev/null -# Fix regression in QPlainTextEdit updating (QTBUG-69310): +# CMake generates wrong -isystem /usr/include compilations flags with Qt5::Gui +# and for it breaks KWin compilation with: +# /usr/include/c++/9.1.0/cstdlib:75:15: fatal error: stdlib.h: No such file or directory +# See also https://bugzilla.redhat.com/1704474 cd qtbase - cat $CWD/patches/qt5.qtbug-69310.patch | patch -p1 --verbose || exit 1 + cat $CWD/patches/qt5.qtbase_cmake_isystem_includes.patch \ + | patch -p1 --verbose || exit 1 cd - 1>/dev/null if ! pkg-config --exists libpulse 2>/dev/null ; then diff --git a/deps/sip/.url b/deps/sip/.url index 1970e74..f0cf6f7 100644 --- a/deps/sip/.url +++ b/deps/sip/.url @@ -1,2 +1,2 @@ -https://www.riverbankcomputing.com/static/Downloads/sip/sip-4.19.14.tar.gz +https://www.riverbankcomputing.com/static/Downloads/sip/4.19.16/sip-4.19.16.tar.gz diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild index 38e620a..daf29eb 100755 --- a/deps/sip/sip.SlackBuild +++ b/deps/sip/sip.SlackBuild @@ -26,8 +26,8 @@ PKGNAM=sip -VERSION=${VERSION:-4.19.14} -BUILD=${BUILD:-2} +VERSION=${VERSION:-4.19.16} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} @@ -71,8 +71,8 @@ rm -rf $PKGNAM-$VERSION tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 cd $PKGNAM-$VERSION || exit 1 -# Get PyQt4 to compile: -cat $CWD/patches/PyQt4_sip_regression.patch | patch -p1 --verbose || exit 1 +## Get PyQt4 to compile: +#cat $CWD/patches/PyQt4_sip_regression.patch | patch -p1 --verbose || exit 1 chown -R root:root . find . \ -- cgit v1.2.3