From ee9ede434f07e220655e03a84da4aec7ba32975d Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 11 Jul 2019 23:51:51 +0200 Subject: Deps: qt5 update requires rebuilds/updates of other packages --- deps/PyQt5/.url | 2 +- deps/PyQt5/PyQt5.SlackBuild | 6 +++++- deps/PyQt5/patches/pyqt5-python2-crash.patch | 13 +++++++++++++ deps/gpgme/.url | 2 +- deps/gpgme/gpgme.SlackBuild | 4 ++-- deps/qt5-speech/.url | 2 +- deps/qt5-speech/qt5-speech.SlackBuild | 2 +- deps/sip/.url | 2 +- deps/sip/sip.SlackBuild | 2 +- 9 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 deps/PyQt5/patches/pyqt5-python2-crash.patch diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url index 6fd7b38..8a44a65 100644 --- a/deps/PyQt5/.url +++ b/deps/PyQt5/.url @@ -1,2 +1,2 @@ -https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.12.1/PyQt5_gpl-5.12.1.tar.gz +https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.12.3/PyQt5_gpl-5.12.3.tar.gz diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index 066e1b8..df9e97b 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -27,7 +27,7 @@ # Modified by Eric Hameleers PKGNAM=PyQt5 -VERSION=${VERSION:-5.12.1} +VERSION=${VERSION:-5.12.3} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} @@ -71,6 +71,10 @@ rm -rf ${PKGNAM}_gpl-$VERSION tar xvf $CWD/${PKGNAM}_gpl-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}_gpl-$VERSION || exit 1 +# Remove code that is unneeded if Qt is not bundled and crashes on python2 +# https://www.riverbankcomputing.com/pipermail/pyqt/2019-July/041896.html +cat $CWD/patches/pyqt5-python2-crash.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/PyQt5/patches/pyqt5-python2-crash.patch b/deps/PyQt5/patches/pyqt5-python2-crash.patch new file mode 100644 index 0000000..14462f7 --- /dev/null +++ b/deps/PyQt5/patches/pyqt5-python2-crash.patch @@ -0,0 +1,13 @@ +diff -ur PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in +--- PyQt5_gpl-5.12.3/qpy/QtCore/qpycore_post_init.cpp.in 2019-06-25 14:41:02.000000000 +0200 ++++ PyQt5_gpl-5.12.3b/qpy/QtCore/qpycore_post_init.cpp.in 2019-07-01 17:06:34.882644535 +0200 +@@ -151,8 +151,4 @@ + // initialised first (at least for Windows) and this is the only way to + // guarantee things are done in the right order. + PyQtSlotProxy::mutex = new QMutex(QMutex::Recursive); +- +- // Load the embedded qt.conf file if there is a bundled copy of Qt. +- if (!qpycore_qt_conf()) +- Py_FatalError("PyQt5.QtCore: Unable to embed qt.conf"); + } + diff --git a/deps/gpgme/.url b/deps/gpgme/.url index 98cd491..9497cc0 100644 --- a/deps/gpgme/.url +++ b/deps/gpgme/.url @@ -1 +1 @@ -https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.13.0.tar.bz2 +https://www.gnupg.org/ftp/gcrypt/gpgme/gpgme-1.13.1.tar.bz2 diff --git a/deps/gpgme/gpgme.SlackBuild b/deps/gpgme/gpgme.SlackBuild index ed23454..2e8356a 100755 --- a/deps/gpgme/gpgme.SlackBuild +++ b/deps/gpgme/gpgme.SlackBuild @@ -1,7 +1,7 @@ #!/bin/bash # Copyright 2006-2009 Robby Workman, Northport, AL, USA -# Copyright 2007, 2008, 2009, 2010, 2016, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2007, 2008, 2009, 2010, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gpgme -VERSION=${VERSION:-1.13.0} +VERSION=${VERSION:-1.13.1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-"-j$(nproc)"} diff --git a/deps/qt5-speech/.url b/deps/qt5-speech/.url index ae886bd..c279fad 100644 --- a/deps/qt5-speech/.url +++ b/deps/qt5-speech/.url @@ -1 +1 @@ -https://download.qt.io/official_releases/qt/5.12/5.12.3/submodules/qtspeech-everywhere-src-5.12.3.tar.xz +https://download.qt.io/official_releases/qt/5.13/5.13.0/submodules/qtspeech-everywhere-src-5.13.0.tar.xz diff --git a/deps/qt5-speech/qt5-speech.SlackBuild b/deps/qt5-speech/qt5-speech.SlackBuild index 41884a7..9782148 100755 --- a/deps/qt5-speech/qt5-speech.SlackBuild +++ b/deps/qt5-speech/qt5-speech.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=qt5-speech -SRCVER=${SRCVER:-"5.12.3"} +SRCVER=${SRCVER:-"5.13.0"} VERSION=$(echo $SRCVER | tr - _) BUILD=${BUILD:-1} diff --git a/deps/sip/.url b/deps/sip/.url index f0cf6f7..202b19a 100644 --- a/deps/sip/.url +++ b/deps/sip/.url @@ -1,2 +1,2 @@ -https://www.riverbankcomputing.com/static/Downloads/sip/4.19.16/sip-4.19.16.tar.gz +https://www.riverbankcomputing.com/static/Downloads/sip/4.19.17/sip-4.19.17.tar.gz diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild index daf29eb..c79e22f 100755 --- a/deps/sip/sip.SlackBuild +++ b/deps/sip/sip.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=sip -VERSION=${VERSION:-4.19.16} +VERSION=${VERSION:-4.19.17} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:-" -j$(nproc) "} -- cgit v1.2.3