From 30f51193f42e1a02f3ba9a16706bd037b9ffe93c Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Thu, 19 Mar 2020 22:01:05 +0000 Subject: Thu Mar 19 22:01:05 UTC 2020 ap/ghostscript-9.52-x86_64-1.txz: Upgraded. l/PyQt5-5.13.2-x86_64-1.txz: Added. l/QScintilla-2.11.4-x86_64-3.txz: Rebuilt. Added PyQt5 support. Thanks to alienBOB. l/sip-4.19.21-x86_64-2.txz: Rebuilt. Recompiled to pick up Qt5 support. n/gpgme-1.13.1-x86_64-3.txz: Rebuilt. Added Qt5 bindings. Thanks to alienBOB. --- source/ap/ghostscript/ghostscript.url | 2 +- source/l/PyQt5/PyQt5.SlackBuild | 160 +++++++++++++++++++++++ source/l/PyQt5/patches/pyqt5-python2-crash.patch | 13 ++ source/l/PyQt5/slack-desc | 19 +++ source/l/QScintilla/QScintilla.SlackBuild | 20 +-- source/l/sip/sip.SlackBuild | 2 +- source/n/gpgme/gpgme.SlackBuild | 5 +- 7 files changed, 206 insertions(+), 15 deletions(-) create mode 100755 source/l/PyQt5/PyQt5.SlackBuild create mode 100644 source/l/PyQt5/patches/pyqt5-python2-crash.patch create mode 100644 source/l/PyQt5/slack-desc (limited to 'source') diff --git a/source/ap/ghostscript/ghostscript.url b/source/ap/ghostscript/ghostscript.url index 687efb23e..6b8fdf3d7 100644 --- a/source/ap/ghostscript/ghostscript.url +++ b/source/ap/ghostscript/ghostscript.url @@ -1 +1 @@ -https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs951/ghostscript-9.51.tar.xz +https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/ghostscript-9.52.tar.xz diff --git a/source/l/PyQt5/PyQt5.SlackBuild b/source/l/PyQt5/PyQt5.SlackBuild new file mode 100755 index 000000000..3e7d703ad --- /dev/null +++ b/source/l/PyQt5/PyQt5.SlackBuild @@ -0,0 +1,160 @@ +#!/bin/sh + +# Slackware build script for PyQt + +# Copyright 2008 Aleksandar Samardzic +# Copyright 2008, 2009, 2010, 2011, 2015, 2016, 2017, 2020 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:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +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" = "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 +zcat $CWD/patches/pyqt5-python2-crash.patch.gz | 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" + +## I see no reason at this point to include python2 support. We'll see later if +## we can get away with that or not... +#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/ +#make clean + +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 + +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* \ + $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/${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/source/l/PyQt5/patches/pyqt5-python2-crash.patch b/source/l/PyQt5/patches/pyqt5-python2-crash.patch new file mode 100644 index 000000000..14462f756 --- /dev/null +++ b/source/l/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/source/l/PyQt5/slack-desc b/source/l/PyQt5/slack-desc new file mode 100644 index 000000000..bd72b7e8d --- /dev/null +++ b/source/l/PyQt5/slack-desc @@ -0,0 +1,19 @@ +# 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 Qt5) +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: Homepage: http://www.riverbankcomputing.co.uk/software/pyqt/ +PyQt5: +PyQt5: +PyQt5: +PyQt5: +PyQt5: diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild index 22e042a1a..3895c5b38 100755 --- a/source/l/QScintilla/QScintilla.SlackBuild +++ b/source/l/QScintilla/QScintilla.SlackBuild @@ -29,7 +29,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=QScintilla VERSION=${VERSION:-$(echo ${PKGNAM}-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -132,15 +132,15 @@ if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then 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 + ## No Qt5 python2 support! + #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: diff --git a/source/l/sip/sip.SlackBuild b/source/l/sip/sip.SlackBuild index 9863095ab..c722f9ed2 100755 --- a/source/l/sip/sip.SlackBuild +++ b/source/l/sip/sip.SlackBuild @@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} diff --git a/source/n/gpgme/gpgme.SlackBuild b/source/n/gpgme/gpgme.SlackBuild index 7ec11f06b..ef7caaac1 100755 --- a/source/n/gpgme/gpgme.SlackBuild +++ b/source/n/gpgme/gpgme.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=gpgme VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -77,7 +77,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Don't build qt binding which requires qt5: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ @@ -85,7 +84,7 @@ CXXFLAGS="$SLKCFLAGS" \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ --infodir=/usr/info \ - --enable-languages="cl cpp python" \ + --enable-languages="cl cpp python qt" \ --docdir=/usr/doc/gpgme-$VERSION \ --build=$ARCH-slackware-linux \ --host=$ARCH-slackware-linux || exit 1 -- cgit v1.2.3