From 0e6b923de220dc8d2068abe1e9ecd3ec779492e6 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 20 Mar 2020 10:44:13 +0100 Subject: Deps: removed packages that were added to Slackware distro today Moved to Slackware: PyQt, PyQt5, QScintilla, gpgme, sip. --- deps/PyQt/.url | 1 - deps/PyQt/PyQt.SlackBuild | 140 ------ deps/PyQt/PyQt.phonon.diff | 11 - deps/PyQt/slack-desc | 19 - deps/PyQt5/.deps | 3 - deps/PyQt5/.url | 2 - deps/PyQt5/PyQt5.SlackBuild | 151 ------ deps/PyQt5/patches/pyqt-qt5.11.patch | 17 - deps/PyQt5/patches/pyqt-support-new-qt.patch | 12 - deps/PyQt5/patches/pyqt5-cura-crash.patch | 559 --------------------- deps/PyQt5/patches/pyqt5-python2-crash.patch | 13 - deps/PyQt5/slack-desc | 19 - deps/QScintilla/.url | 1 - deps/QScintilla/QScintilla.SlackBuild | 219 -------- .../patches/QScintilla_qsciscintillabase_qurl.diff | 11 - deps/QScintilla/slack-desc | 19 - deps/alldeps.SlackBuild | 6 - deps/gpgme/.url | 1 - deps/gpgme/gpgme.SlackBuild | 133 ----- deps/gpgme/patches/gpgme-1.8.0_libsuffix.patch | 30 -- deps/gpgme/slack-desc | 19 - deps/sip/.url | 2 - deps/sip/patches/PyQt4_sip_regression.patch | 71 --- deps/sip/sip.SlackBuild | 189 ------- deps/sip/slack-desc | 19 - deps/updates.SlackBuild | 6 - 26 files changed, 1673 deletions(-) delete mode 100644 deps/PyQt/.url delete mode 100755 deps/PyQt/PyQt.SlackBuild delete mode 100644 deps/PyQt/PyQt.phonon.diff delete mode 100644 deps/PyQt/slack-desc delete mode 100644 deps/PyQt5/.deps delete mode 100644 deps/PyQt5/.url delete mode 100755 deps/PyQt5/PyQt5.SlackBuild delete mode 100644 deps/PyQt5/patches/pyqt-qt5.11.patch delete mode 100644 deps/PyQt5/patches/pyqt-support-new-qt.patch delete mode 100644 deps/PyQt5/patches/pyqt5-cura-crash.patch delete mode 100644 deps/PyQt5/patches/pyqt5-python2-crash.patch delete mode 100644 deps/PyQt5/slack-desc delete mode 100644 deps/QScintilla/.url delete mode 100755 deps/QScintilla/QScintilla.SlackBuild delete mode 100644 deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff delete mode 100644 deps/QScintilla/slack-desc delete mode 100644 deps/gpgme/.url delete mode 100755 deps/gpgme/gpgme.SlackBuild delete mode 100644 deps/gpgme/patches/gpgme-1.8.0_libsuffix.patch delete mode 100644 deps/gpgme/slack-desc delete mode 100644 deps/sip/.url delete mode 100644 deps/sip/patches/PyQt4_sip_regression.patch delete mode 100755 deps/sip/sip.SlackBuild delete mode 100644 deps/sip/slack-desc (limited to 'deps') diff --git a/deps/PyQt/.url b/deps/PyQt/.url deleted file mode 100644 index 8e479e7..0000000 --- a/deps/PyQt/.url +++ /dev/null @@ -1 +0,0 @@ -http://sourceforge.net/projects/pyqt/files/PyQt4/PyQt-4.12.3/PyQt4_gpl_x11-4.12.3.tar.gz diff --git a/deps/PyQt/PyQt.SlackBuild b/deps/PyQt/PyQt.SlackBuild deleted file mode 100755 index 957a94e..0000000 --- a/deps/PyQt/PyQt.SlackBuild +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/sh - -# Slackware build script for PyQt - -# Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011, 2017, 2018 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. - -# Modified by Robby Workman -# Modified by Eric Hameleers - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=PyQt -VERSION=${VERSION:-4.12.3} -BUILD=${BUILD:-1} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - 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) ;; - esac - export ARCH -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -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-$(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 -mkdir -p $TMP $PKG $OUTPUT -cd $TMP - -rm -rf ${PKGNAM}4_gpl_x11-$VERSION -tar xvf $CWD/${PKGNAM}4_gpl_x11-$VERSION.tar.?z || exit 1 -cd ${PKGNAM}4_gpl_x11-$VERSION || exit 1 - -# Fix phonon detection: -cat $CWD/$PKGNAM.phonon.diff | patch -p1 --verbose || exit 1 - -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 {} \; - -# This avoids compiling a version number into KDE's .la files: -export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt -export QT4DIR=/usr/lib${LIBDIRSUFFIX}/qt - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" - -python3 configure.py \ - --confirm-license \ - --qsci-api \ - --verbose -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 -make clean - -mv $PKG/usr/bin/pyuic4 $PKG/usr/bin/pyuic4-py3 -rm -rf $PKG/$PYTHON3LIB/${PKGNAM}4/uic/port_v2/ - -python2 configure.py \ - --confirm-license \ - --qsci-api \ - --verbose - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - -rm -rf $PKG/$PYTHON2LIB/${PKGNAM}4/uic/port_v3/ - -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 \ - GPL_EXCEPTION*.TXT LICENSE.* NEWS OPENSOURCE-NOTICE.TXT README THANKS doc/* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz - diff --git a/deps/PyQt/PyQt.phonon.diff b/deps/PyQt/PyQt.phonon.diff deleted file mode 100644 index feda650..0000000 --- a/deps/PyQt/PyQt.phonon.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- PyQt-x11-gpl-4.6.2/configure.py.orig 2010-01-08 23:39:46.000000000 +0100 -+++ PyQt-x11-gpl-4.6.2/configure.py 2010-01-08 23:45:18.000000000 +0100 -@@ -451,7 +451,7 @@ - generate_code("QtXmlPatterns") - - if "phonon" in pyqt_modules: -- generate_code("phonon") -+ generate_code("phonon", extra_include_dirs=["/usr/include/phonon"]) - - if "QtAssistant" in pyqt_modules: - generate_code("QtAssistant") diff --git a/deps/PyQt/slack-desc b/deps/PyQt/slack-desc deleted file mode 100644 index e8cf45a..0000000 --- a/deps/PyQt/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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 ':'. - - |-----handy-ruler------------------------------------------------------| -PyQt: PyQt (Python bindings for Qt) -PyQt: -PyQt: PyQt is a set of Python bindings for the Qt application framework and -PyQt: runs on all platforms supported by Qt. -PyQt: -PyQt: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/ -PyQt: -PyQt: -PyQt: -PyQt: -PyQt: diff --git a/deps/PyQt5/.deps b/deps/PyQt5/.deps deleted file mode 100644 index 64526d1..0000000 --- a/deps/PyQt5/.deps +++ /dev/null @@ -1,3 +0,0 @@ -python-enum34 -qt5 -sip diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url deleted file mode 100644 index eac8894..0000000 --- a/deps/PyQt5/.url +++ /dev/null @@ -1,2 +0,0 @@ -https://www.riverbankcomputing.com/static/Downloads/PyQt5/5.13.2/PyQt5-5.13.2.tar.gz - diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild deleted file mode 100755 index 8552e19..0000000 --- a/deps/PyQt5/PyQt5.SlackBuild +++ /dev/null @@ -1,151 +0,0 @@ -#!/bin/sh - -# Slackware build script for PyQt - -# Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011, 2015, 2016, 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. - -# Modified by Robby Workman -# Modified by Eric Hameleers - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=PyQt5 -VERSION=${VERSION:-5.13.2} -BUILD=${BUILD:-2} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - 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) ;; - esac - export ARCH -fi - -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 - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -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-$(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 -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf ${PKGNAM}-$VERSION -tar xvf $CWD/${PKGNAM}-$VERSION.tar.?z* || exit 1 -cd ${PKGNAM}-$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 \) \ - -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -# This avoids compiling a version number into KDE's .la files: -export QTDIR=/usr/lib${LIBDIRSUFFIX}/qt5 -export QT5DIR=/usr/lib${LIBDIRSUFFIX}/qt5 - -export CFLAGS="$SLKCFLAGS" -export CXXFLAGS="$SLKCFLAGS" - -python2 configure.py \ - --confirm-license \ - --verbose \ - --qsci-api \ - -q /usr/bin/qmake-qt5 \ - || exit 1 - -make $NUMJOBS || make || exit 1 -# INSTALL_ROOT is needed for QtDesigner, the other Makefiles use DESTDIR -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/$PYTHON2LIB/${PKGNAM}/uic/port_v3/ - -python3 configure.py \ - --confirm-license \ - --verbose \ - --qsci-api \ - -q /usr/bin/qmake-qt5 \ - || exit 1 - -make $NUMJOBS || make || exit 1 -# INSTALL_ROOT is needed for QtDesigner, the other Makefiles use DESTDIR -make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 -make clean - -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/* \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz - diff --git a/deps/PyQt5/patches/pyqt-qt5.11.patch b/deps/PyQt5/patches/pyqt-qt5.11.patch deleted file mode 100644 index 96c8a51..0000000 --- a/deps/PyQt5/patches/pyqt-qt5.11.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Fabian Vogt -Subject: QTest::waitForEvents() is internal only - -Must not be used, got removed with Qt 5.11. - -Index: PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip -=================================================================== ---- PyQt5_gpl-5.10.1.orig/sip/QtTest/qtestmouse.sip -+++ PyQt5_gpl-5.10.1/sip/QtTest/qtestmouse.sip -@@ -41,7 +41,6 @@ namespace QTest - void mousePress(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier = 0, QPoint pos = QPoint(), int delay = -1); - void mouseEvent(QTest::MouseAction action, QWidget *widget, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); -- void waitForEvents() /ReleaseGIL/; - void mouseEvent(QTest::MouseAction action, QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier, QPoint pos, int delay = -1); - void mousePress(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); - void mouseRelease(QWindow *window, Qt::MouseButton button, Qt::KeyboardModifiers modifier = Qt::KeyboardModifiers(), QPoint pos = QPoint(), int delay = -1); diff --git a/deps/PyQt5/patches/pyqt-support-new-qt.patch b/deps/PyQt5/patches/pyqt-support-new-qt.patch deleted file mode 100644 index 1464384..0000000 --- a/deps/PyQt5/patches/pyqt-support-new-qt.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru a/sip/QtCore/QtCoremod.sip b/sip/QtCore/QtCoremod.sip ---- a/sip/QtCore/QtCoremod.sip 2016-12-25 18:56:11.000000000 +0100 -+++ b/sip/QtCore/QtCoremod.sip 2017-01-24 12:03:50.707514377 +0100 -@@ -22,7 +22,7 @@ - - %Module(name=PyQt5.QtCore, call_super_init=True, default_VirtualErrorHandler=PyQt5, keyword_arguments="Optional", use_limited_api=True) - --%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1} -+%Timeline {Qt_5_0_0 Qt_5_0_1 Qt_5_0_2 Qt_5_1_0 Qt_5_1_1 Qt_5_2_0 Qt_5_2_1 Qt_5_3_0 Qt_5_3_1 Qt_5_3_2 Qt_5_4_0 Qt_5_4_1 Qt_5_4_2 Qt_5_5_0 Qt_5_5_1 Qt_5_6_0 Qt_5_6_1 Qt_5_6_2 Qt_5_6_3 Qt_5_6_4 Qt_5_6_5 Qt_5_6_6 Qt_5_6_7 Qt_5_6_8 Qt_5_6_9 Qt_5_7_0 Qt_5_7_1 Qt_5_8_0 Qt_5_8_1 Qt_5_9_0 Qt_5_9_1 Qt_5_9_2 Qt_5_9_3 Qt_5_9_99 Qt_5_10_0 Qt_5_10_1 Qt_5_11_0} - - %Platforms {WS_X11 WS_WIN WS_MACX} - diff --git a/deps/PyQt5/patches/pyqt5-cura-crash.patch b/deps/PyQt5/patches/pyqt5-cura-crash.patch deleted file mode 100644 index 9b79407..0000000 --- a/deps/PyQt5/patches/pyqt5-cura-crash.patch +++ /dev/null @@ -1,559 +0,0 @@ -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquick_register_type.cpp PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquick_register_type.cpp ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquick_register_type.cpp 2018-02-27 11:43:52.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquick_register_type.cpp 2018-03-29 03:32:17.000000000 +0200 -@@ -22,6 +22,8 @@ - #include "qpyquickframebufferobject.h" - #include "qpyquickitem.h" - #include "qpyquickpainteditem.h" -+#include "qpyquickview.h" -+#include "qpyquickwindow.h" - - #include "sipAPIQtQuick.h" - -@@ -30,6 +32,9 @@ - const QMetaObject *mo, const QByteArray &ptr_name, - const QByteArray &list_name, QQmlPrivate::RegisterType **rtp) - { -+ // Make sure the types are tested in the right order (ie. more specific -+ // types first). -+ - #if QT_VERSION >= 0x050200 - if (PyType_IsSubtype(py_type, sipTypeAsPyTypeObject(sipType_QQuickFramebufferObject))) - return ((*rtp = QPyQuickFramebufferObject::addType(py_type, mo, ptr_name, list_name)) ? sipErrorNone : sipErrorFail); -@@ -41,6 +46,12 @@ - if (PyType_IsSubtype(py_type, sipTypeAsPyTypeObject(sipType_QQuickItem))) - return ((*rtp = QPyQuickItem::addType(py_type, mo, ptr_name, list_name)) ? sipErrorNone : sipErrorFail); - -+ if (PyType_IsSubtype(py_type, sipTypeAsPyTypeObject(sipType_QQuickView))) -+ return ((*rtp = QPyQuickView::addType(py_type, mo, ptr_name, list_name)) ? sipErrorNone : sipErrorFail); -+ -+ if (PyType_IsSubtype(py_type, sipTypeAsPyTypeObject(sipType_QQuickWindow))) -+ return ((*rtp = QPyQuickWindow::addType(py_type, mo, ptr_name, list_name)) ? sipErrorNone : sipErrorFail); -+ - // We don't recognise the type. - return sipErrorContinue; - } -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickview.cpp PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickview.cpp ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickview.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickview.cpp 2018-03-29 03:32:17.000000000 +0200 -@@ -0,0 +1,155 @@ -+// This is the implementation of the QPyQuickWindow classes. -+// -+// Copyright (c) 2018 Riverbank Computing Limited -+// -+// This file is part of PyQt5. -+// -+// This file may be used under the terms of the GNU General Public License -+// version 3.0 as published by the Free Software Foundation and appearing in -+// the file LICENSE included in the packaging of this file. Please review the -+// following information to ensure the GNU General Public License version 3.0 -+// requirements will be met: http://www.gnu.org/copyleft/gpl.html. -+// -+// If you do not wish to use this file under the terms of the GPL version 3.0 -+// then you may purchase a commercial license. For more information contact -+// info@riverbankcomputing.com. -+// -+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+#include -+ -+#include -+ -+#include "qpyquickview.h" -+ -+#include "sipAPIQtQuick.h" -+ -+ -+// The maximum number of Python QQuickView types. -+const int NrOfQuickViewTypes = 20; -+ -+// The list of registered Python types. -+static QList pyqt_types; -+ -+// The registration data for the canned types. -+static QQmlPrivate::RegisterType canned_types[NrOfQuickViewTypes]; -+ -+ -+#define QPYQUICKVIEW_INIT(n) \ -+ case n##U: \ -+ QPyQuickView##n::staticMetaObject = *mo; \ -+ rt->typeId = qRegisterNormalizedMetaType(ptr_name); \ -+ rt->listId = qRegisterNormalizedMetaType >(list_name); \ -+ rt->objectSize = sizeof(QPyQuickView##n); \ -+ rt->create = QQmlPrivate::createInto; \ -+ rt->metaObject = mo; \ -+ rt->attachedPropertiesFunction = QQmlPrivate::attachedPropertiesFunc(); \ -+ rt->attachedPropertiesMetaObject = QQmlPrivate::attachedPropertiesMetaObject(); \ -+ rt->parserStatusCast = QQmlPrivate::StaticCastSelector::cast(); \ -+ rt->valueSourceCast = QQmlPrivate::StaticCastSelector::cast(); \ -+ rt->valueInterceptorCast = QQmlPrivate::StaticCastSelector::cast(); \ -+ break -+ -+ -+// The ctor. -+QPyQuickView::QPyQuickView(QWindow *parent) : sipQQuickView(parent) -+{ -+} -+ -+ -+// Add a new Python type and return its number. -+QQmlPrivate::RegisterType *QPyQuickView::addType(PyTypeObject *type, -+ const QMetaObject *mo, const QByteArray &ptr_name, -+ const QByteArray &list_name) -+{ -+ int type_nr = pyqt_types.size(); -+ -+ // Check we have a spare canned type. -+ if (type_nr >= NrOfQuickViewTypes) -+ { -+ PyErr_Format(PyExc_TypeError, -+ "a maximum of %d QQuickView types may be registered with QML", -+ NrOfQuickViewTypes); -+ return 0; -+ } -+ -+ pyqt_types.append(type); -+ -+ QQmlPrivate::RegisterType *rt = &canned_types[type_nr]; -+ -+ // Initialise those members that depend on the C++ type. -+ switch (type_nr) -+ { -+ QPYQUICKVIEW_INIT(0); -+ QPYQUICKVIEW_INIT(1); -+ QPYQUICKVIEW_INIT(2); -+ QPYQUICKVIEW_INIT(3); -+ QPYQUICKVIEW_INIT(4); -+ QPYQUICKVIEW_INIT(5); -+ QPYQUICKVIEW_INIT(6); -+ QPYQUICKVIEW_INIT(7); -+ QPYQUICKVIEW_INIT(8); -+ QPYQUICKVIEW_INIT(9); -+ QPYQUICKVIEW_INIT(10); -+ QPYQUICKVIEW_INIT(11); -+ QPYQUICKVIEW_INIT(12); -+ QPYQUICKVIEW_INIT(13); -+ QPYQUICKVIEW_INIT(14); -+ QPYQUICKVIEW_INIT(15); -+ QPYQUICKVIEW_INIT(16); -+ QPYQUICKVIEW_INIT(17); -+ QPYQUICKVIEW_INIT(18); -+ QPYQUICKVIEW_INIT(19); -+ } -+ -+ return rt; -+} -+ -+ -+// Create the Python instance. -+void QPyQuickView::createPyObject(QWindow *parent) -+{ -+ SIP_BLOCK_THREADS -+ -+ // Assume C++ owns everything. -+ PyObject *obj = sipConvertFromNewPyType(this, pyqt_types.at(typeNr()), -+ NULL, &sipPySelf, "D", parent, sipType_QWindow, NULL); -+ -+ if (!obj) -+ pyqt5_qtquick_err_print(); -+ -+ SIP_UNBLOCK_THREADS -+} -+ -+ -+// The canned type implementations. -+#define QPYQUICKVIEW_IMPL(n) \ -+QPyQuickView##n::QPyQuickView##n(QWindow *parent) : QPyQuickView(parent) \ -+{ \ -+ createPyObject(parent); \ -+} \ -+QMetaObject QPyQuickView##n::staticMetaObject -+ -+ -+QPYQUICKVIEW_IMPL(0); -+QPYQUICKVIEW_IMPL(1); -+QPYQUICKVIEW_IMPL(2); -+QPYQUICKVIEW_IMPL(3); -+QPYQUICKVIEW_IMPL(4); -+QPYQUICKVIEW_IMPL(5); -+QPYQUICKVIEW_IMPL(6); -+QPYQUICKVIEW_IMPL(7); -+QPYQUICKVIEW_IMPL(8); -+QPYQUICKVIEW_IMPL(9); -+QPYQUICKVIEW_IMPL(10); -+QPYQUICKVIEW_IMPL(11); -+QPYQUICKVIEW_IMPL(12); -+QPYQUICKVIEW_IMPL(13); -+QPYQUICKVIEW_IMPL(14); -+QPYQUICKVIEW_IMPL(15); -+QPYQUICKVIEW_IMPL(16); -+QPYQUICKVIEW_IMPL(17); -+QPYQUICKVIEW_IMPL(18); -+QPYQUICKVIEW_IMPL(19); -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickview.h PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickview.h ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickview.h 1970-01-01 01:00:00.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickview.h 2018-03-29 03:32:17.000000000 +0200 -@@ -0,0 +1,87 @@ -+// This is the definition of the QPyQuickView classes. -+// -+// Copyright (c) 2018 Riverbank Computing Limited -+// -+// This file is part of PyQt5. -+// -+// This file may be used under the terms of the GNU General Public License -+// version 3.0 as published by the Free Software Foundation and appearing in -+// the file LICENSE included in the packaging of this file. Please review the -+// following information to ensure the GNU General Public License version 3.0 -+// requirements will be met: http://www.gnu.org/copyleft/gpl.html. -+// -+// If you do not wish to use this file under the terms of the GPL version 3.0 -+// then you may purchase a commercial license. For more information contact -+// info@riverbankcomputing.com. -+// -+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+#ifndef _QPYQUICKVIEW_H -+#define _QPYQUICKVIEW_H -+ -+ -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include "sipAPIQtQuick.h" -+ -+ -+class QPyQuickView : public sipQQuickView -+{ -+public: -+ QPyQuickView(QWindow *parent = 0); -+ -+ virtual int typeNr() const = 0; -+ -+ static QQmlPrivate::RegisterType *addType(PyTypeObject *type, -+ const QMetaObject *mo, const QByteArray &ptr_name, -+ const QByteArray &list_name); -+ void createPyObject(QWindow *parent); -+ -+private: -+ QPyQuickView(const QPyQuickView &); -+}; -+ -+ -+// The canned type declarations. -+#define QPYQUICKVIEW_DECL(n) \ -+class QPyQuickView##n : public QPyQuickView \ -+{ \ -+public: \ -+ QPyQuickView##n(QWindow *parent = 0); \ -+ static QMetaObject staticMetaObject; \ -+ virtual int typeNr() const {return n##U;} \ -+private: \ -+ QPyQuickView##n(const QPyQuickView##n &); \ -+} -+ -+ -+QPYQUICKVIEW_DECL(0); -+QPYQUICKVIEW_DECL(1); -+QPYQUICKVIEW_DECL(2); -+QPYQUICKVIEW_DECL(3); -+QPYQUICKVIEW_DECL(4); -+QPYQUICKVIEW_DECL(5); -+QPYQUICKVIEW_DECL(6); -+QPYQUICKVIEW_DECL(7); -+QPYQUICKVIEW_DECL(8); -+QPYQUICKVIEW_DECL(9); -+QPYQUICKVIEW_DECL(10); -+QPYQUICKVIEW_DECL(11); -+QPYQUICKVIEW_DECL(12); -+QPYQUICKVIEW_DECL(13); -+QPYQUICKVIEW_DECL(14); -+QPYQUICKVIEW_DECL(15); -+QPYQUICKVIEW_DECL(16); -+QPYQUICKVIEW_DECL(17); -+QPYQUICKVIEW_DECL(18); -+QPYQUICKVIEW_DECL(19); -+ -+ -+#endif -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickwindow.cpp PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickwindow.cpp ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickwindow.cpp 1970-01-01 01:00:00.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickwindow.cpp 2018-03-29 03:32:17.000000000 +0200 -@@ -0,0 +1,155 @@ -+// This is the implementation of the QPyQuickWindow classes. -+// -+// Copyright (c) 2018 Riverbank Computing Limited -+// -+// This file is part of PyQt5. -+// -+// This file may be used under the terms of the GNU General Public License -+// version 3.0 as published by the Free Software Foundation and appearing in -+// the file LICENSE included in the packaging of this file. Please review the -+// following information to ensure the GNU General Public License version 3.0 -+// requirements will be met: http://www.gnu.org/copyleft/gpl.html. -+// -+// If you do not wish to use this file under the terms of the GPL version 3.0 -+// then you may purchase a commercial license. For more information contact -+// info@riverbankcomputing.com. -+// -+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+#include -+ -+#include -+ -+#include "qpyquickwindow.h" -+ -+#include "sipAPIQtQuick.h" -+ -+ -+// The maximum number of Python QQuickWindow types. -+const int NrOfQuickWindowTypes = 20; -+ -+// The list of registered Python types. -+static QList pyqt_types; -+ -+// The registration data for the canned types. -+static QQmlPrivate::RegisterType canned_types[NrOfQuickWindowTypes]; -+ -+ -+#define QPYQUICKWINDOW_INIT(n) \ -+ case n##U: \ -+ QPyQuickWindow##n::staticMetaObject = *mo; \ -+ rt->typeId = qRegisterNormalizedMetaType(ptr_name); \ -+ rt->listId = qRegisterNormalizedMetaType >(list_name); \ -+ rt->objectSize = sizeof(QPyQuickWindow##n); \ -+ rt->create = QQmlPrivate::createInto; \ -+ rt->metaObject = mo; \ -+ rt->attachedPropertiesFunction = QQmlPrivate::attachedPropertiesFunc(); \ -+ rt->attachedPropertiesMetaObject = QQmlPrivate::attachedPropertiesMetaObject(); \ -+ rt->parserStatusCast = QQmlPrivate::StaticCastSelector::cast(); \ -+ rt->valueSourceCast = QQmlPrivate::StaticCastSelector::cast(); \ -+ rt->valueInterceptorCast = QQmlPrivate::StaticCastSelector::cast(); \ -+ break -+ -+ -+// The ctor. -+QPyQuickWindow::QPyQuickWindow(QWindow *parent) : sipQQuickWindow(parent) -+{ -+} -+ -+ -+// Add a new Python type and return its number. -+QQmlPrivate::RegisterType *QPyQuickWindow::addType(PyTypeObject *type, -+ const QMetaObject *mo, const QByteArray &ptr_name, -+ const QByteArray &list_name) -+{ -+ int type_nr = pyqt_types.size(); -+ -+ // Check we have a spare canned type. -+ if (type_nr >= NrOfQuickWindowTypes) -+ { -+ PyErr_Format(PyExc_TypeError, -+ "a maximum of %d QQuickWindow types may be registered with QML", -+ NrOfQuickWindowTypes); -+ return 0; -+ } -+ -+ pyqt_types.append(type); -+ -+ QQmlPrivate::RegisterType *rt = &canned_types[type_nr]; -+ -+ // Initialise those members that depend on the C++ type. -+ switch (type_nr) -+ { -+ QPYQUICKWINDOW_INIT(0); -+ QPYQUICKWINDOW_INIT(1); -+ QPYQUICKWINDOW_INIT(2); -+ QPYQUICKWINDOW_INIT(3); -+ QPYQUICKWINDOW_INIT(4); -+ QPYQUICKWINDOW_INIT(5); -+ QPYQUICKWINDOW_INIT(6); -+ QPYQUICKWINDOW_INIT(7); -+ QPYQUICKWINDOW_INIT(8); -+ QPYQUICKWINDOW_INIT(9); -+ QPYQUICKWINDOW_INIT(10); -+ QPYQUICKWINDOW_INIT(11); -+ QPYQUICKWINDOW_INIT(12); -+ QPYQUICKWINDOW_INIT(13); -+ QPYQUICKWINDOW_INIT(14); -+ QPYQUICKWINDOW_INIT(15); -+ QPYQUICKWINDOW_INIT(16); -+ QPYQUICKWINDOW_INIT(17); -+ QPYQUICKWINDOW_INIT(18); -+ QPYQUICKWINDOW_INIT(19); -+ } -+ -+ return rt; -+} -+ -+ -+// Create the Python instance. -+void QPyQuickWindow::createPyObject(QWindow *parent) -+{ -+ SIP_BLOCK_THREADS -+ -+ // Assume C++ owns everything. -+ PyObject *obj = sipConvertFromNewPyType(this, pyqt_types.at(typeNr()), -+ NULL, &sipPySelf, "D", parent, sipType_QWindow, NULL); -+ -+ if (!obj) -+ pyqt5_qtquick_err_print(); -+ -+ SIP_UNBLOCK_THREADS -+} -+ -+ -+// The canned type implementations. -+#define QPYQUICKWINDOW_IMPL(n) \ -+QPyQuickWindow##n::QPyQuickWindow##n(QWindow *parent) : QPyQuickWindow(parent) \ -+{ \ -+ createPyObject(parent); \ -+} \ -+QMetaObject QPyQuickWindow##n::staticMetaObject -+ -+ -+QPYQUICKWINDOW_IMPL(0); -+QPYQUICKWINDOW_IMPL(1); -+QPYQUICKWINDOW_IMPL(2); -+QPYQUICKWINDOW_IMPL(3); -+QPYQUICKWINDOW_IMPL(4); -+QPYQUICKWINDOW_IMPL(5); -+QPYQUICKWINDOW_IMPL(6); -+QPYQUICKWINDOW_IMPL(7); -+QPYQUICKWINDOW_IMPL(8); -+QPYQUICKWINDOW_IMPL(9); -+QPYQUICKWINDOW_IMPL(10); -+QPYQUICKWINDOW_IMPL(11); -+QPYQUICKWINDOW_IMPL(12); -+QPYQUICKWINDOW_IMPL(13); -+QPYQUICKWINDOW_IMPL(14); -+QPYQUICKWINDOW_IMPL(15); -+QPYQUICKWINDOW_IMPL(16); -+QPYQUICKWINDOW_IMPL(17); -+QPYQUICKWINDOW_IMPL(18); -+QPYQUICKWINDOW_IMPL(19); -diff -ur --new-file PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickwindow.h PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickwindow.h ---- PyQt5_gpl-5.10.1/qpy/QtQuick/qpyquickwindow.h 1970-01-01 01:00:00.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/qpy/QtQuick/qpyquickwindow.h 2018-03-29 03:32:17.000000000 +0200 -@@ -0,0 +1,87 @@ -+// This is the definition of the QPyQuickWindow classes. -+// -+// Copyright (c) 2018 Riverbank Computing Limited -+// -+// This file is part of PyQt5. -+// -+// This file may be used under the terms of the GNU General Public License -+// version 3.0 as published by the Free Software Foundation and appearing in -+// the file LICENSE included in the packaging of this file. Please review the -+// following information to ensure the GNU General Public License version 3.0 -+// requirements will be met: http://www.gnu.org/copyleft/gpl.html. -+// -+// If you do not wish to use this file under the terms of the GPL version 3.0 -+// then you may purchase a commercial license. For more information contact -+// info@riverbankcomputing.com. -+// -+// This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -+// WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -+ -+ -+#ifndef _QPYQUICKWINDOW_H -+#define _QPYQUICKWINDOW_H -+ -+ -+#include -+ -+#include -+#include -+#include -+#include -+ -+#include "sipAPIQtQuick.h" -+ -+ -+class QPyQuickWindow : public sipQQuickWindow -+{ -+public: -+ QPyQuickWindow(QWindow *parent = 0); -+ -+ virtual int typeNr() const = 0; -+ -+ static QQmlPrivate::RegisterType *addType(PyTypeObject *type, -+ const QMetaObject *mo, const QByteArray &ptr_name, -+ const QByteArray &list_name); -+ void createPyObject(QWindow *parent); -+ -+private: -+ QPyQuickWindow(const QPyQuickWindow &); -+}; -+ -+ -+// The canned type declarations. -+#define QPYQUICKWINDOW_DECL(n) \ -+class QPyQuickWindow##n : public QPyQuickWindow \ -+{ \ -+public: \ -+ QPyQuickWindow##n(QWindow *parent = 0); \ -+ static QMetaObject staticMetaObject; \ -+ virtual int typeNr() const {return n##U;} \ -+private: \ -+ QPyQuickWindow##n(const QPyQuickWindow##n &); \ -+} -+ -+ -+QPYQUICKWINDOW_DECL(0); -+QPYQUICKWINDOW_DECL(1); -+QPYQUICKWINDOW_DECL(2); -+QPYQUICKWINDOW_DECL(3); -+QPYQUICKWINDOW_DECL(4); -+QPYQUICKWINDOW_DECL(5); -+QPYQUICKWINDOW_DECL(6); -+QPYQUICKWINDOW_DECL(7); -+QPYQUICKWINDOW_DECL(8); -+QPYQUICKWINDOW_DECL(9); -+QPYQUICKWINDOW_DECL(10); -+QPYQUICKWINDOW_DECL(11); -+QPYQUICKWINDOW_DECL(12); -+QPYQUICKWINDOW_DECL(13); -+QPYQUICKWINDOW_DECL(14); -+QPYQUICKWINDOW_DECL(15); -+QPYQUICKWINDOW_DECL(16); -+QPYQUICKWINDOW_DECL(17); -+QPYQUICKWINDOW_DECL(18); -+QPYQUICKWINDOW_DECL(19); -+ -+ -+#endif -diff -ur --new-file PyQt5_gpl-5.10.1/sip/QtQuick/qquickview.sip PyQt5_gpl-5.10.2.dev1803281228/sip/QtQuick/qquickview.sip ---- PyQt5_gpl-5.10.1/sip/QtQuick/qquickview.sip 2018-02-27 11:43:53.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/sip/QtQuick/qquickview.sip 2018-03-29 03:32:18.000000000 +0200 -@@ -20,7 +20,7 @@ - // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - --class QQuickView : QQuickWindow -+class QQuickView : QQuickWindow /ExportDerived/ - { - %TypeHeaderCode - #include -diff -ur --new-file PyQt5_gpl-5.10.1/sip/QtQuick/qquickwindow.sip PyQt5_gpl-5.10.2.dev1803281228/sip/QtQuick/qquickwindow.sip ---- PyQt5_gpl-5.10.1/sip/QtQuick/qquickwindow.sip 2018-02-27 11:43:53.000000000 +0100 -+++ PyQt5_gpl-5.10.2.dev1803281228/sip/QtQuick/qquickwindow.sip 2018-03-29 03:32:18.000000000 +0200 -@@ -20,7 +20,7 @@ - // WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - - --class QQuickWindow : QWindow -+class QQuickWindow : QWindow /ExportDerived/ - { - %TypeHeaderCode - #include diff --git a/deps/PyQt5/patches/pyqt5-python2-crash.patch b/deps/PyQt5/patches/pyqt5-python2-crash.patch deleted file mode 100644 index 14462f7..0000000 --- a/deps/PyQt5/patches/pyqt5-python2-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/PyQt5/slack-desc b/deps/PyQt5/slack-desc deleted file mode 100644 index 3f764f0..0000000 --- a/deps/PyQt5/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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 ':'. - - |-----handy-ruler------------------------------------------------------| -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: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/ -PyQt5: diff --git a/deps/QScintilla/.url b/deps/QScintilla/.url deleted file mode 100644 index e0ef390..0000000 --- a/deps/QScintilla/.url +++ /dev/null @@ -1 +0,0 @@ -https://www.riverbankcomputing.com/static/Downloads/QScintilla/2.11.4/QScintilla-2.11.4.tar.gz diff --git a/deps/QScintilla/QScintilla.SlackBuild b/deps/QScintilla/QScintilla.SlackBuild deleted file mode 100755 index 62f0e60..0000000 --- a/deps/QScintilla/QScintilla.SlackBuild +++ /dev/null @@ -1,219 +0,0 @@ -#!/bin/sh - -# Slackware build script for QScintilla - -# Copyright 2008 Robby Workman Northport, AL, USA -# Copyright 2008, 2009, 2010, 2011, 2012, 2018, 2019 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. - -# Modified 2018, 2019 by Eric Hameleers (add Qt5 support) - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=QScintilla -VERSION=${VERSION:-2.11.4} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -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=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) ;; - esac - 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 - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" - LIBDIRSUFFIX="" -else - SLKCFLAGS="-O2" - LIBDIRSUFFIX="" -fi - -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 compilation: -cat $CWD/patches/QScintilla_qsciscintillabase_qurl.diff | patch -p1 --verbose || exit 1 - -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 {} \; - -# Define QMAKEFEATURES to that we can re-use already built libs -# without spamming the harddisk: -export QMAKEFEATURES=${PWD}/Qt4Qt5/features/ - -# Conditional build of Qt5 support: -if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then - echo "-- Compiling Qt5 support --" - # QT5 support first: - cd Qt4Qt5 - echo "-- >> Qt4Qt5 --" - qmake-qt5 \ - -o Makefile \ - QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \ - qscintilla.pro || exit 1 - make $NUMJOBS || exit 1 - make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - cd - - - cd designer-Qt4Qt5 - echo "-- >> designer-Qt4Qt5 --" - qmake-qt5 \ - -o Makefile \ - INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \ - QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \ - designer.pro || exit 1 - make $NUMJOBS || exit 1 - make install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - cd - - - cd Python - echo "-- >> Python --" - python3 configure.py \ - --verbose \ - --qmake /usr/bin/qmake-qt5 \ - --pyqt=PyQt5 \ - -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ - || exit 1 - make || exit 1 - make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - - make clean || exit 1 - - python2 configure.py \ - --verbose \ - --qmake /usr/bin/qmake-qt5 \ - --pyqt=PyQt5 \ - -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ - || exit 1 - make || exit 1 - make -j1 install DESTDIR=$PKG INSTALL_ROOT=$PKG || exit 1 - cd - - - # In order to compile Qt4 support next, clean up first: - make clean -C Qt4Qt5 || exit 1 - make clean -C designer-Qt4Qt5 || exit 1 - make clean -C Python || exit 1 -fi - -# QT4 support: -echo "-- Compiling Qt4 support --" -cd Qt4Qt5 - echo "-- >> Qt4Qt5 --" - qmake \ - -o Makefile \ - QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \ - qscintilla.pro || exit 1 - make $NUMJOBS || exit 1 - make install INSTALL_ROOT=$PKG || exit 1 -cd - - -cd designer-Qt4Qt5 - echo "-- >> designer-Qt4Qt5 --" - qmake \ - -o Makefile \ - INCLUDEPATH+=../Qt4Qt5 QMAKE_LIBDIR+=../Qt4Qt5 \ - QMAKE_CFLAGS+="$SLKCFLAGS" \ - QMAKE_CXXFLAGS+="$SLKCFLAGS -std=c++11" \ - designer.pro || exit 1 - make $NUMJOBS || exit 1 - make install INSTALL_ROOT=$PKG || exit 1 -cd - - -cd Python - echo "-- >> Python --" - python3 configure.py \ - --verbose \ - --qmake /usr/bin/qmake \ - -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ - || exit 1 - make -j1 || exit 1 - make -j1 install INSTALL_ROOT=$PKG || exit 1 - - make clean || exit 1 - - python2 configure.py \ - --verbose \ - --qmake /usr/bin/qmake \ - -n ../Qt4Qt5/ -o ../Qt4Qt5/ -c \ - || exit 1 - make -j1 || exit 1 - make -j1 install INSTALL_ROOT=$PKG || exit 1 -cd - - -# Link the shared qt4 libraries into /usr/lib${LIBDIRSUFFIX}: -( cd $PKG/usr/lib${LIBDIRSUFFIX} - for file in $(ls -1 qt/lib/*.so* 2>/dev/null) ; do - ln -sf $file . - done -) - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - LICENSE NEWS README* \ - doc/html-Qt4Qt5 doc/Scintilla \ - $PKG/usr/doc/$PKGNAM-$VERSION - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff b/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff deleted file mode 100644 index 9720a4b..0000000 --- a/deps/QScintilla/patches/QScintilla_qsciscintillabase_qurl.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- QScintilla_gpl-2.11.1/Qt4Qt5/qsciscintillabase.cpp.orig -+++ QScintilla_gpl-2.11.1/Qt4Qt5/qsciscintillabase.cpp -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - - #include "SciAccessibility.h" - #include "ScintillaQt.h" - diff --git a/deps/QScintilla/slack-desc b/deps/QScintilla/slack-desc deleted file mode 100644 index cb3fdd3..0000000 --- a/deps/QScintilla/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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 ':'. - - |-----handy-ruler--------------------------------------------------| -QScintilla: QScintilla (Qt port of the Scintilla C++ editor control) -QScintilla: -QScintilla: QScintilla includes features especially useful when editing and -QScintilla: debugging source code. These include support for syntax styling, -QScintilla: error indicators, code completion, and call tips. The selection -QScintilla: margin can contain markers like those used in debuggers to -QScintilla: indicate breakpoints and the current line. Styling choices are -QScintilla: more open than with many editors, allowing the use of -QScintilla: proportional fonts, bold and italics, multiple foreground and -QScintilla: background colours, and multiple fonts. -QScintilla: diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild index bfd5c57..62f7fc9 100755 --- a/deps/alldeps.SlackBuild +++ b/deps/alldeps.SlackBuild @@ -17,7 +17,6 @@ ALLDEPS=" \ extra-cmake-modules \ md4c \ sni-qt \ - wayland \ qjson \ phonon \ phonon-gstreamer \ @@ -30,10 +29,6 @@ ALLDEPS=" \ dotconf \ flite \ speech-dispatcher \ - sip \ - PyQt \ - PyQt5 \ - QScintilla \ qca-qt5 \ libdbusmenu-qt5 \ polkit-qt-1 \ @@ -50,7 +45,6 @@ ALLDEPS=" \ hack-font-ttf \ noto-font-ttf \ noto-cjk-font-ttf \ - gpgme \ lensfun \ opencv \ dvdauthor \ diff --git a/deps/gpgme/.url b/deps/gpgme/.url deleted file mode 100644 index 9497cc0..0000000 --- a/deps/gpgme/.url +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100755 index 4d72555..0000000 --- a/deps/gpgme/gpgme.SlackBuild +++ /dev/null @@ -1,133 +0,0 @@ -#!/bin/bash - -# Copyright 2006-2009 Robby Workman, Northport, AL, 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 -# 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. - -# Modified 2017, 2018, 2019 by Eric Hameleers - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=gpgme -VERSION=${VERSION:-1.13.1} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-"-j$(nproc)"} - -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=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) ;; - esac - 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 -if [ "$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" -else - SLKCFLAGS="-O2" - 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 - -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 {} \; - -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ - --sysconfdir=/etc \ - --infodir=/usr/info \ - --docdir=/usr/doc/gpgme-$VERSION \ - --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 - -# Don't ship .la files: -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -rm $PKG/usr/info/dir -gzip -9 $PKG/usr/info/* - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - AUTHORS COPYING* INSTALL NEWS README* THANKS TODO VERSION \ - $PKG/usr/doc/$PKGNAM-$VERSION - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz - diff --git a/deps/gpgme/patches/gpgme-1.8.0_libsuffix.patch b/deps/gpgme/patches/gpgme-1.8.0_libsuffix.patch deleted file mode 100644 index a62cc55..0000000 --- a/deps/gpgme/patches/gpgme-1.8.0_libsuffix.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Heiko Becker -Date: Wed, 16 Nov 2016 22:09:45 +0000 (+0100) -Subject: Remove a forgotten instance of @libsuffix@ -X-Git-Url: http://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=commitdiff_plain;h=572c1aac107125ce62230251713349348373db5a - -Remove a forgotten instance of @libsuffix@ - -* lang/cpp/src/GpgmeppConfig.cmake.in.in: Remove a forgotten -instance of @libsuffix@. --- - -b2c07bd47bd608afa5cc819b60a7b5bb8c9dd96a removed @libsuffix@ from -cmake config files, but missed one instance. - -Signed-off-by: Heiko Becker ---- - -diff --git a/lang/cpp/src/GpgmeppConfig.cmake.in.in b/lang/cpp/src/GpgmeppConfig.cmake.in.in -index 928d19f..cbe9713 100644 ---- a/lang/cpp/src/GpgmeppConfig.cmake.in.in -+++ b/lang/cpp/src/GpgmeppConfig.cmake.in.in -@@ -63,7 +63,7 @@ add_library(Gpgmepp SHARED IMPORTED) - - set_target_properties(Gpgmepp PROPERTIES - INTERFACE_INCLUDE_DIRECTORIES "@resolved_includedir@/gpgme++;@resolved_includedir@" -- INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme@libsuffix@;@LIBASSUAN_LIBS@" -+ INTERFACE_LINK_LIBRARIES "pthread;@resolved_libdir@/libgpgme.so;@LIBASSUAN_LIBS@" - IMPORTED_LOCATION "@resolved_libdir@/libgpgmepp.so" - ) - diff --git a/deps/gpgme/slack-desc b/deps/gpgme/slack-desc deleted file mode 100644 index 3436b08..0000000 --- a/deps/gpgme/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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 ':'. - - |-----handy-ruler------------------------------------------------------| -gpgme: gpgme (GnuPG Made Easy) -gpgme: -gpgme: GPGME (GnuPG Made Easy) is a C language library that allows to add -gpgme: support for cryptography to a program. It is designed to make access -gpgme: to public key crypto engines like GnuPG or GpgSM easier for -gpgme: applications. GPGME provides a high-level crypto API for encryption, -gpgme: decryption, signing, signature verification and key management. -gpgme: -gpgme: GPGME uses GnuPG and GpgSM as its backends to support OpenPGP and the -gpgme: Cryptographic Message Syntax (CMS). -gpgme: diff --git a/deps/sip/.url b/deps/sip/.url deleted file mode 100644 index ef7b01f..0000000 --- a/deps/sip/.url +++ /dev/null @@ -1,2 +0,0 @@ -https://www.riverbankcomputing.com/static/Downloads/sip/4.19.20/sip-4.19.20.tar.gz - diff --git a/deps/sip/patches/PyQt4_sip_regression.patch b/deps/sip/patches/PyQt4_sip_regression.patch deleted file mode 100644 index e656ff4..0000000 --- a/deps/sip/patches/PyQt4_sip_regression.patch +++ /dev/null @@ -1,71 +0,0 @@ -# HG changeset patch -# User Phil Thompson -# Date 1550579387 0 -# Node ID 7bd4d19479adc46c40e8d43629aaac871fae6cd7 -# Parent 4ab117a13343cd8d8f5804600936f445fb2d59ef -Fixed a code generation regression specific to PyQt4. - -diff -r 4ab117a13343 -r 7bd4d19479ad sipgen/gencode.c ---- a/sipgen/gencode.c Tue Feb 12 09:27:11 2019 +0000 -+++ b/sipgen/gencode.c Tue Feb 19 12:29:47 2019 +0000 -@@ -295,7 +295,7 @@ - static int emptyIfaceFile(sipSpec *pt, ifaceFileDef *iff); - static void declareLimitedAPI(int py_debug, moduleDef *mod, FILE *fp); - static int generatePluginSignalsTable(sipSpec *pt, classDef *cd, -- const char *pyqt_prefix, FILE *fp); -+ int pyqt_version, FILE *fp); - static int generatePyQt5ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp); - static int generatePyQt4ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp); - static void generateGlobalFunctionTableEntries(sipSpec *pt, moduleDef *mod, -@@ -15542,7 +15542,7 @@ - * Generate the PyQt4/5 signals table. - */ - static int generatePluginSignalsTable(sipSpec *pt, classDef *cd, -- const char *pyqt_prefix, FILE *fp) -+ int pyqt_version, FILE *fp) - { - int is_signals = FALSE; - -@@ -15586,8 +15586,8 @@ - "\n" - "\n" - "/* Define this type's signals. */\n" --"static const %sQtSignal signals_%C[] = {\n" -- , pyqt_prefix, classFQCName(cd)); -+"static const pyqt%dQtSignal signals_%C[] = {\n" -+ , pyqt_version, classFQCName(cd)); - } - - /* -@@ -15628,9 +15628,9 @@ - - if (is_signals) - prcode(fp, --" {SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR}\n" -+" {SIP_NULLPTR, SIP_NULLPTR, SIP_NULLPTR, %s}\n" - "};\n" -- ); -+ , (pyqt_version == 5 ? "SIP_NULLPTR" : "0")); - } - - return is_signals; -@@ -15643,7 +15643,7 @@ - */ - static int generatePyQt5ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp) - { -- int is_signals = generatePluginSignalsTable(pt, cd, "pyqt5", fp); -+ int is_signals = generatePluginSignalsTable(pt, cd, 5, fp); - - prcode(fp, - "\n" -@@ -15696,7 +15696,7 @@ - */ - static int generatePyQt4ClassPlugin(sipSpec *pt, classDef *cd, FILE *fp) - { -- int is_signals = generatePluginSignalsTable(pt, cd, "pyqt4", fp); -+ int is_signals = generatePluginSignalsTable(pt, cd, 4, fp); - - prcode(fp, - "\n" - - diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild deleted file mode 100755 index 923ac6c..0000000 --- a/deps/sip/sip.SlackBuild +++ /dev/null @@ -1,189 +0,0 @@ -#!/bin/sh - -# Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011, 2017, 2018, 2019 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. - -# Modified by Robby Workman -# Modified by Eric Hameleers - -cd $(dirname $0) ; CWD=$(pwd) - -PKGNAM=sip -VERSION=${VERSION:-4.19.20} -BUILD=${BUILD:-2} - -NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} - -# Automatically determine the architecture we're building on: -if [ -z "$ARCH" ]; then - case "$(uname -m)" in - 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) ;; - esac - 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-$(echo $VERSION | tr - _)-$ARCH-$BUILD.txz" - exit 0 -fi - -if [ "$ARCH" = "i586" ]; then - SLKCFLAGS="-O2 -march=i586 -mtune=i686" -elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" -elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" -elif [ "$ARCH" = "armv7hl" ]; then - SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" -else - SLKCFLAGS="-O2" -fi - -PYTHON2VER=$(python2 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null) -PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' 2>/dev/null ) - -PYTHON3VER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d. 2>/dev/null) -PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' 2>/dev/null ) - -TMP=${TMP:-/tmp} -PKG=$TMP/package-$PKGNAM - -rm -rf $PKG -mkdir -p $TMP $PKG $OUTPUT -cd $TMP -rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 -cd $PKGNAM-$VERSION || exit 1 - -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 {} \+ - -python2 configure.py \ - -b "/usr/bin" \ - -d "$PYTHON2LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add the PyQt4 private sip module: -make clean -python2 configure.py \ - --sip-module PyQt4.sip \ - --no-tools \ - -b "/usr/bin" \ - -d "$PYTHON2LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add the PyQt5 private sip module: -make clean -python2 configure.py \ - --sip-module PyQt5.sip \ - --no-tools \ - -b "/usr/bin" \ - -d "$PYTHON2LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" \ - || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Rename to avoid a clash: -mv $PKG/usr/bin/sip $PKG/usr/bin/sip2 - -make clean - -python3 configure.py \ - -b "/usr/bin" \ - -d "$PYTHON3LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add the PyQt4 private sip module: -make clean -python3 configure.py \ - --sip-module PyQt4.sip \ - --no-tools \ - -b "/usr/bin" \ - -d "$PYTHON3LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Add the PyQt5 private sip module: -make clean -python3 configure.py \ - --sip-module PyQt5.sip \ - --no-tools \ - -b "/usr/bin" \ - -d "$PYTHON3LIB" \ - CFLAGS="$SLKCFLAGS" \ - CXXFLAGS="$SLKCFLAGS" || exit 1 -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Rename to avoid a clash: -mv $PKG/usr/bin/sip $PKG/usr/bin/sip3 - -# Create a symbolic link 'sip' pointing to the sip3 binary: -ln -s sip3 $PKG/usr/bin/sip - -find $PKG | xargs file | grep -e "executable" -e "shared object" \ - | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null - -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION -cp -a \ - LICENSE* COPYING* ChangeLog NEWS README TODO doc/* \ - $PKG/usr/doc/$PKGNAM-$VERSION -chown -R root:root $PKG/usr/doc - -# If there's a ChangeLog, installing at least part of the recent history -# is useful, but don't let it get totally out of control: -if [ -r ChangeLog ]; then - DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION) - cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog - touch -r ChangeLog $DOCSDIR/ChangeLog -fi - -mkdir -p $PKG/install -cat $CWD/slack-desc > $PKG/install/slack-desc - -cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$(echo $VERSION |tr - _)-$ARCH-$BUILD.txz - diff --git a/deps/sip/slack-desc b/deps/sip/slack-desc deleted file mode 100644 index 69e52db..0000000 --- a/deps/sip/slack-desc +++ /dev/null @@ -1,19 +0,0 @@ -# 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 ':'. - - |-----handy-ruler------------------------------------------------------| -sip: sip (a tool for generating Python bindings) -sip: -sip: SIP is a tool that makes it very easy to create Python bindings for -sip: C and C++ libraries. It was originally developed to create PyQt, -sip: the Python bindings for the Qt toolkit, but can be used to create -sip: bindings for any C or C++ library. -sip: -sip: Homepage: http://www.riverbankcomputing.co.uk/software/sip/ -sip: -sip: -sip: diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild index 36d806c..31a796e 100755 --- a/deps/updates.SlackBuild +++ b/deps/updates.SlackBuild @@ -17,7 +17,6 @@ ALLDEPS=" \ extra-cmake-modules \ md4c \ sni-qt \ - wayland \ qca-qt5 \ libdbusmenu-qt5 \ phonon \ @@ -31,10 +30,6 @@ ALLDEPS=" \ dotconf \ flite \ speech-dispatcher \ - sip \ - PyQt \ - PyQt5 \ - QScintilla \ polkit-qt5-1 \ grantlee \ grantlee-qt4 \ @@ -48,7 +43,6 @@ ALLDEPS=" \ hack-font-ttf \ noto-font-ttf \ noto-cjk-font-ttf \ - gpgme \ lensfun \ opencv \ dvdauthor \ -- cgit v1.2.3