From 3a9a6b03fe2e098d803f3db020a884a266f1b059 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Fri, 27 Jan 2017 10:44:40 +0100 Subject: deps: support the new and changed requirements for KDE 5_17.01 New: - libdmtx - libwacom - qrencode Upgraded: - PyQt - libinput - qt5 - qt5-webkit - sip --- deps/PyQt5/.url | 2 +- deps/PyQt5/PyQt5.SlackBuild | 8 +- deps/alldeps.SlackBuild | 3 + deps/libdmtx/.url | 1 + deps/libdmtx/libdmtx.SlackBuild | 138 ++++++++++++++++++++++++++++++++ deps/libdmtx/slack-desc | 19 +++++ deps/libinput/.url | 2 +- deps/libinput/libinput.SlackBuild | 6 +- deps/libwacom/.url | 2 + deps/libwacom/libwacom.SlackBuild | 139 +++++++++++++++++++++++++++++++++ deps/libwacom/slack-desc | 19 +++++ deps/qca-qt5/qca-qt5.SlackBuild | 4 +- deps/qrencode/.url | 1 + deps/qrencode/qrencode.SlackBuild | 127 ++++++++++++++++++++++++++++++ deps/qrencode/slack-desc | 19 +++++ deps/qt5-webkit/.url | 2 +- deps/qt5-webkit/qt5-webkit.SlackBuild | 7 +- deps/qt5/.url | 2 +- deps/qt5/patches/qt5.qtbug-49061.patch | 80 +++++++++++++++++++ deps/qt5/patches/qt5.qtbug-55583.patch | 41 ++++++++++ deps/qt5/qt5.SlackBuild | 28 +++---- deps/sip/.url | 2 + deps/sip/sip.SlackBuild | 110 ++++++++++++++++++++++++++ deps/sip/slack-desc | 19 +++++ deps/updates.SlackBuild | 4 + 25 files changed, 749 insertions(+), 36 deletions(-) create mode 100644 deps/libdmtx/.url create mode 100755 deps/libdmtx/libdmtx.SlackBuild create mode 100644 deps/libdmtx/slack-desc create mode 100644 deps/libwacom/.url create mode 100755 deps/libwacom/libwacom.SlackBuild create mode 100644 deps/libwacom/slack-desc create mode 100644 deps/qrencode/.url create mode 100755 deps/qrencode/qrencode.SlackBuild create mode 100644 deps/qrencode/slack-desc create mode 100644 deps/qt5/patches/qt5.qtbug-49061.patch create mode 100644 deps/qt5/patches/qt5.qtbug-55583.patch create mode 100644 deps/sip/.url create mode 100755 deps/sip/sip.SlackBuild create mode 100644 deps/sip/slack-desc diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url index a73d338..97531f1 100644 --- a/deps/PyQt5/.url +++ b/deps/PyQt5/.url @@ -1,2 +1,2 @@ -https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7/PyQt5_gpl-5.7.tar.gz +https://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.7.1/PyQt5_gpl-5.7.1.tar.gz diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index b0b39b3..090be75 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -3,7 +3,7 @@ # Slackware build script for PyQt # Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011, 2015, 2016 Patrick J. Volkerding, Sebeka, MN, USA +# 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 @@ -27,7 +27,7 @@ # Modified by Eric Hameleers PKGNAM=PyQt5 -VERSION=${VERSION:-5.7} +VERSION=${VERSION:-5.7.1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -67,10 +67,6 @@ rm -rf ${PKGNAM}_gpl-$VERSION tar xvf $CWD/${PKGNAM}_gpl-$VERSION.tar.?z* || exit 1 cd ${PKGNAM}_gpl-$VERSION || exit 1 -## The additional include path was removed due to this line, -## resulting in "fatal error: dbus/dbus-arch-deps.h: No such file or directory" -#sed -i '/target_config.dbus_inc_dirs = \[\]/d' configure.py - chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild index b5201f0..a28c38d 100755 --- a/deps/alldeps.SlackBuild +++ b/deps/alldeps.SlackBuild @@ -17,6 +17,7 @@ ALLDEPS=" \ extra-cmake-modules \ ninja \ sni-qt \ + libwacom \ libinput \ libxkbcommon \ wayland \ @@ -43,6 +44,8 @@ ALLDEPS=" \ libappindicator \ cfitsio \ lmdb \ + libdmtx \ + qrencode \ libproxy \ telepathy \ hack-font-ttf \ diff --git a/deps/libdmtx/.url b/deps/libdmtx/.url new file mode 100644 index 0000000..90b25d8 --- /dev/null +++ b/deps/libdmtx/.url @@ -0,0 +1 @@ +https://sourceforge.net/projects/libdmtx/files/libdmtx/0.7.4/libdmtx-0.7.4.tar.gz/download diff --git a/deps/libdmtx/libdmtx.SlackBuild b/deps/libdmtx/libdmtx.SlackBuild new file mode 100755 index 0000000..951c4ef --- /dev/null +++ b/deps/libdmtx/libdmtx.SlackBuild @@ -0,0 +1,138 @@ +#!/bin/sh +# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2017 Eric Hameleers, Eindhoven, NL +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS 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. +# ----------------------------------------------------------------------------- + + +PKGNAM=libdmtx +VERSION=${VERSION:-0.7.4} +BUILD=${BUILD:-2} + +NUMJOBS=${NUMJOBS:" -j4 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ -e $CWD/machine.conf ]; then + . $CWD/machine.conf ] +elif [ -e /etc/slackbuild/machine.conf ]; then + . /etc/slackbuild/machine.conf ] +else + # Automatically determine the architecture we're building on: + MARCH=$( uname -m ) + if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac + fi + # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: + if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" + elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv5te" + LIBDIRSUFFIX="" + else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + fi +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 + +# Make sure ownerships and permissions are sane: +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 {} \; + +# Configure: +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --enable-static=no \ + --build=$TARGET \ + || exit 1 + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + AUTHORS ChangeLog KNOWNBUG LICENSE NEWS README* TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Add a description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Create the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/deps/libdmtx/slack-desc b/deps/libdmtx/slack-desc new file mode 100644 index 0000000..e9ffd92 --- /dev/null +++ b/deps/libdmtx/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libdmtx: libdmtx (library for reading and writing Data Matrix 2D barcodes) +libdmtx: +libdmtx: libdmtx is open source software for reading and writing Data Matrix +libdmtx: barcodes. +libdmtx: Data Matrix barcodes are two-dimensional symbols that hold a dense +libdmtx: pattern of data with built-in error correction. +libdmtx: +libdmtx: +libdmtx: +libdmtx: Homepage: http://libdmtx.sourceforge.net/ +libdmtx: diff --git a/deps/libinput/.url b/deps/libinput/.url index bed45d5..9460ebe 100644 --- a/deps/libinput/.url +++ b/deps/libinput/.url @@ -1,2 +1,2 @@ -https://www.freedesktop.org/software/libinput/libinput-1.3.3.tar.xz +https://www.freedesktop.org/software/libinput/libinput-1.5.4.tar.xz diff --git a/deps/libinput/libinput.SlackBuild b/deps/libinput/libinput.SlackBuild index 03879eb..209ed8a 100755 --- a/deps/libinput/libinput.SlackBuild +++ b/deps/libinput/libinput.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh # Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2016 Eric Hameleers, Eindhoven, NL +# Copyright 2016, 2017 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Permission to use, copy, modify, and distribute this software for @@ -24,11 +24,11 @@ PKGNAM=libinput -VERSION=${VERSION:-1.3.3} +VERSION=${VERSION:-1.5.4} BUILD=${BUILD:-1} # Support for (wacom) tablets requires libwacom as additional dependency: -TABLET_SUPPORT=${TABLET_SUPPORT:-"NO"} +TABLET_SUPPORT=${TABLET_SUPPORT:-"YES"} NUMJOBS=${NUMJOBS:" -j4 "} diff --git a/deps/libwacom/.url b/deps/libwacom/.url new file mode 100644 index 0000000..b289c17 --- /dev/null +++ b/deps/libwacom/.url @@ -0,0 +1,2 @@ +https://sourceforge.net/projects/linuxwacom/files/libwacom/libwacom-0.22.tar.bz2 + diff --git a/deps/libwacom/libwacom.SlackBuild b/deps/libwacom/libwacom.SlackBuild new file mode 100755 index 0000000..9900b02 --- /dev/null +++ b/deps/libwacom/libwacom.SlackBuild @@ -0,0 +1,139 @@ +#!/bin/sh +# Copyright 2016 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2016 Eric Hameleers, Eindhoven, NL +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS 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. +# ----------------------------------------------------------------------------- + + +PKGNAM=libwacom +VERSION=${VERSION:-0.22} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:" -j4 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +if [ -e $CWD/machine.conf ]; then + . $CWD/machine.conf ] +elif [ -e /etc/slackbuild/machine.conf ]; then + . /etc/slackbuild/machine.conf ] +else + # Automatically determine the architecture we're building on: + MARCH=$( uname -m ) + if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac + fi + # Set CFLAGS/CXXFLAGS and LIBDIRSUFFIX: + if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" + LIBDIRSUFFIX="" + elif [ "$ARCH" = "s390" ]; then + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + elif [ "$ARCH" = "x86_64" ]; then + SLKCFLAGS="-O2 -fPIC" + LIBDIRSUFFIX="64" + elif [ "$ARCH" = "arm" ]; then + SLKCFLAGS="-O2 -march=armv5te" + LIBDIRSUFFIX="" + else + SLKCFLAGS="-O2" + LIBDIRSUFFIX="" + fi +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.bz2 || exit 1 +cd $PKGNAM-$VERSION || exit 1 + +# Make sure ownerships and permissions are sane: +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 {} \; + +# Configure: +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --sysconfdir=/etc \ + --localstatedir=/var \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --disable-static \ + --build=$TARGET + +# Build and install: +make $NUMJOBS || make || exit 1 +make install DESTDIR=$PKG || exit 1 + +# Strip binaries: +find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ + grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Compress and link manpages, if any: +if [ -d $PKG/usr/man ]; then + ( cd $PKG/usr/man + for manpagedir in $(find . -type d -name "man*") ; do + ( cd $manpagedir + for eachpage in $( find . -type l -maxdepth 1) ; do + ln -s $( readlink $eachpage ).gz $eachpage.gz + rm $eachpage + done + gzip -9 *.? + ) + done + ) +fi + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING NEWS README \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Add a description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Create the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz + diff --git a/deps/libwacom/slack-desc b/deps/libwacom/slack-desc new file mode 100644 index 0000000..428dd7a --- /dev/null +++ b/deps/libwacom/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +libwacom: libwacom (library to identify Wacom tablets and their features) +libwacom: +libwacom: The Linux Wacom Project manages the libraries, configuration, +libwacom: and diagnostic tools for Wacom tablets running under Linux. +libwacom: It also maintains updated Linux kernel drivers and Xorg/XFree86 +libwacom: XInput drivers. +libwacom: +libwacom: +libwacom: +libwacom: Home Page: http://linuxwacom.sourceforge.net/ +libwacom: diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 26e8990..55ff47d 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 Eric Hameleers, Eindhoven, NL +# Copyright 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=qca-qt5 SRCNAM=qca VERSION=${VERSION:-2.1.1} -BUILD=${BUILD:-5} +BUILD=${BUILD:-6} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: diff --git a/deps/qrencode/.url b/deps/qrencode/.url new file mode 100644 index 0000000..17eab4d --- /dev/null +++ b/deps/qrencode/.url @@ -0,0 +1 @@ +http://fukuchi.org/works/qrencode/qrencode-3.4.4.tar.gz diff --git a/deps/qrencode/qrencode.SlackBuild b/deps/qrencode/qrencode.SlackBuild new file mode 100755 index 0000000..e2e5576 --- /dev/null +++ b/deps/qrencode/qrencode.SlackBuild @@ -0,0 +1,127 @@ +#!/bin/sh + +# Copyright 2017 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2014, 2017 Eric Hameleers, Eindhoven, NL +# All rights reserved. +# +# Permission to use, copy, modify, and distribute this software for +# any purpose with or without fee is hereby granted, provided that +# the above copyright notice and this permission notice appear in all +# copies. +# +# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR +# CONTRIBUTORS 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. +# ----------------------------------------------------------------------------- + + +PKGNAM=qrencode +VERSION=${VERSION:-3.4.4} +BUILD=${BUILD:-1} +NUMJOBS=${NUMJOBS:" -j4 "} + +CWD=$(pwd) +TMP=${TMP:-/tmp} +PKG=$TMP/package-$PKGNAM + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + i?86) export ARCH=i486 ;; + armv7hl) export ARCH=$MARCH ;; + armv6hl) export ARCH=$MARCH ;; + arm*) export ARCH=arm ;; + # Unless $ARCH is already set, use uname -m for all other archs: + *) export ARCH=$MARCH ;; + esac +fi + +case "$ARCH" in + i486) SLKCFLAGS="-O2 -march=i486 -mtune=i686" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + x86_64) SLKCFLAGS="-O2 -fPIC" + SLKLDFLAGS="-L/usr/lib64"; LIBDIRSUFFIX="64" + ;; + armv7hl) SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + armv6hl) SLKCFLAGS="-O2 -march=armv6 -mfpu=vfp -mfloat-abi=hard" + SLKLDFLAGS=""; LIBDIRSUFFIX="" + ;; + *) SLKCFLAGS=${SLKCFLAGS:-"O2"} + SLKLDFLAGS=${SLKLDFLAGS:-""}; LIBDIRSUFFIX=${LIBDIRSUFFIX:-""} + ;; +esac + +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.gz || exit 1 +cd $PKGNAM-$VERSION || exit 1 +chown -R root:root . +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \; + +LDFLAGS="$SLKLDFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +CFLAGS="$SLKCFLAGS" \ +./configure \ + --prefix=/usr \ + --libdir=/usr/lib${LIBDIRSUFFIX} \ + --mandir=/usr/man \ + --docdir=/usr/doc/$PKGNAM-$VERSION \ + --localstatedir=/var \ + --sysconfdir=/etc \ + --without-tests \ + --program-prefix= \ + --program-suffix= \ + --build=$TARGET + +# Build and install: +make $NUMJOBS || make || exit 1 +make DESTDIR=$PKG install || exit 1 + +# Add documentation: +mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +cp -a \ + COPYING ChangeLog NEWS README TODO \ + $PKG/usr/doc/$PKGNAM-$VERSION + +# Compress the man page(s): +if [ -d $PKG/usr/man ]; then + find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \; + for i in $(find $PKG/usr/man -type l -name "*.?") ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done +fi + +# Strip binaries (if any): +find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ + | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true + +# Add a package description: +mkdir -p $PKG/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +# Build the package: +cd $PKG +/sbin/makepkg -l y -c n $TMP/${PKGNAM}-${VERSION}-${ARCH}-${BUILD}.txz + diff --git a/deps/qrencode/slack-desc b/deps/qrencode/slack-desc new file mode 100644 index 0000000..fb67fee --- /dev/null +++ b/deps/qrencode/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 ':' except on otherwise blank lines. + + |-----handy-ruler------------------------------------------------------| +qrencode: qrencode (library for encoding data into QR Code) +qrencode: +qrencode: Libqrencode is a library for encoding data in a QR Code symbol, +qrencode: a kind of 2D symbology that can be scanned by handy terminals such as +qrencode: a mobile phone with CCD. +qrencode: The capacity of QR Code is up to 7000 digits or 4000 characters, +qrencode: and has high robustness. +qrencode: +qrencode: +qrencode: qrencode home: http://fukuchi.org/works/qrencode/index.en.html +qrencode: diff --git a/deps/qt5-webkit/.url b/deps/qt5-webkit/.url index 46f309b..fbb8678 100644 --- a/deps/qt5-webkit/.url +++ b/deps/qt5-webkit/.url @@ -1 +1 @@ -http://download.qt.io/community_releases/5.6/5.6.1/qtwebkit-opensource-src-5.6.1.tar.xz +http://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz diff --git a/deps/qt5-webkit/qt5-webkit.SlackBuild b/deps/qt5-webkit/qt5-webkit.SlackBuild index 59e9b9b..588e2c5 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 2016 by Eric Hameleers, Eindhoven, NL +# Modifications for qt5-webkit 5.6.0, 5.6.1, 5.7.0, 5.7.1 2016,2017 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5-webkit -VERSION=${VERSION:-5.7.0} +VERSION=${VERSION:-5.7.1} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -84,9 +84,6 @@ echo "Extracting qtwebkit-opensource-src-$VERSION.tar.xz" tar xf $CWD/qtwebkit-opensource-src-$VERSION.tar.xz || exit 1 cd qtwebkit-opensource-src-$VERSION || exit 1 -## Fix linking to pthread: -#cat $CWD/patches/qt5-webkit.pthread.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/.url b/deps/qt5/.url index 34da870..350e58d 100644 --- a/deps/qt5/.url +++ b/deps/qt5/.url @@ -1 +1 @@ -http://download.qt.io/official_releases/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.tar.gz +http://download.qt.io/official_releases/qt/5.7/5.7.1/single/qt-everywhere-opensource-src-5.7.1.tar.xz diff --git a/deps/qt5/patches/qt5.qtbug-49061.patch b/deps/qt5/patches/qt5.qtbug-49061.patch new file mode 100644 index 0000000..d006edb --- /dev/null +++ b/deps/qt5/patches/qt5.qtbug-49061.patch @@ -0,0 +1,80 @@ +# +# https://github.com/qt/qtbase/commit/494376f9.patch +# +From 494376f980e96339b6f1eff7c41336ca4d853065 Mon Sep 17 00:00:00 2001 +From: Thiago Macieira +Date: Thu, 12 Nov 2015 10:14:51 -0800 +Subject: [PATCH] Stop unloading plugins in QPluginLoader and QFactoryLoader + +QPluginLoader hasn't unloaded in its destructor since Qt 5.0, but we +missed the equivalent code in QFactoryLoader (which bypasses +QPluginLoader). Besides, QPluginLoader::unload() was still doing +unloading, which it won't anymore. + +Not unloading plugins is Qt's policy, as decided during the 5.0 +development process and reaffirmed now in 5.6. This is due to static +data in plugins leaking out and remaining in use past the unloading of +the plugin, causing crashes. + +This does not affect QLibrary and QLibrary::unload(). Those are meant +for non-Qt loadable modules, so unloading them may be safe. + +Task-number: QTBUG-49061 +Discussed-on: http://lists.qt-project.org/pipermail/development/2015-November/023681.html +Change-Id: I461e9fc7199748faa187ffff1416070f138df8db +Reviewed-by: Simon Hausmann +Reviewed-by: Lars Knoll +--- + src/corelib/plugin/qfactoryloader.cpp | 6 ++++-- + src/corelib/plugin/qpluginloader.cpp | 5 +++-- + 2 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp +index 53b38c3..c820d53 100644 +--- a/src/corelib/plugin/qfactoryloader.cpp ++++ b/src/corelib/plugin/qfactoryloader.cpp +@@ -203,10 +203,12 @@ void QFactoryLoader::update() + ++keyUsageCount; + } + } +- if (keyUsageCount || keys.isEmpty()) ++ if (keyUsageCount || keys.isEmpty()) { ++ library->setLoadHints(QLibrary::PreventUnloadHint); // once loaded, don't unload + d->libraryList += library; +- else ++ } else { + library->release(); ++ } + } + } + #else +diff --git a/src/corelib/plugin/qpluginloader.cpp b/src/corelib/plugin/qpluginloader.cpp +index 62067c7..4752f69 100644 +--- a/src/corelib/plugin/qpluginloader.cpp ++++ b/src/corelib/plugin/qpluginloader.cpp +@@ -154,6 +154,7 @@ QPluginLoader::QPluginLoader(const QString &fileName, QObject *parent) + : QObject(parent), d(0), did_load(false) + { + setFileName(fileName); ++ setLoadHints(QLibrary::PreventUnloadHint); + } + + /*! +@@ -348,7 +349,7 @@ static QString locatePlugin(const QString& fileName) + void QPluginLoader::setFileName(const QString &fileName) + { + #if defined(QT_SHARED) +- QLibrary::LoadHints lh; ++ QLibrary::LoadHints lh = QLibrary::PreventUnloadHint; + if (d) { + lh = d->loadHints(); + d->release(); +@@ -394,7 +395,7 @@ QString QPluginLoader::errorString() const + \brief Give the load() function some hints on how it should behave. + + You can give hints on how the symbols in the plugin are +- resolved. By default, none of the hints are set. ++ resolved. By default since Qt 5.7, QLibrary::PreventUnloadHint is set. + + See the documentation of QLibrary::loadHints for a complete + description of how this property works. diff --git a/deps/qt5/patches/qt5.qtbug-55583.patch b/deps/qt5/patches/qt5.qtbug-55583.patch new file mode 100644 index 0000000..804f538 --- /dev/null +++ b/deps/qt5/patches/qt5.qtbug-55583.patch @@ -0,0 +1,41 @@ +# +# https://github.com/qt/qtbase/commit/84ea00d4.patch +# +From 84ea00d47049d882f2fabf1446ec6c6eb5fe3038 Mon Sep 17 00:00:00 2001 +From: J-P Nurmi +Date: Tue, 6 Dec 2016 16:30:31 +0100 +Subject: [PATCH] QGtk3Dialog: don't crash on Wayland + +Check if it's an X11 window before calling XSetTransientForHint(). +No transient parent will be set for GTK+ dialogs on Wayland. That +has to be implemented separately. + +Task-number: QTBUG-55583 +Change-Id: Iabc2a72681c8157bb2f2fe500892853aa397106b +Reviewed-by: Dmitry Shachnev +Reviewed-by: Shawn Rutledge +--- + src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp +index ba5089a..699b058 100644 +--- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp ++++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.cpp +@@ -135,10 +135,12 @@ bool QGtk3Dialog::show(Qt::WindowFlags flags, Qt::WindowModality modality, QWind + + GdkWindow *gdkWindow = gtk_widget_get_window(gtkWidget); + if (parent) { +- GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow); +- XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay), +- gdk_x11_window_get_xid(gdkWindow), +- parent->winId()); ++ if (GDK_IS_X11_WINDOW(gdkWindow)) { ++ GdkDisplay *gdkDisplay = gdk_window_get_display(gdkWindow); ++ XSetTransientForHint(gdk_x11_display_get_xdisplay(gdkDisplay), ++ gdk_x11_window_get_xid(gdkWindow), ++ parent->winId()); ++ } + } + + if (modality != Qt::NonModal) { diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index 089c09e..7326328 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -48,12 +48,13 @@ # Modifications for qt 5.6.0 2016 by Eric Hameleers, Eindhoven, NL # 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 PKGNAM=qt5 -VERSION=${VERSION:-5.7.0} +VERSION=${VERSION:-5.7.1} PKGSRC=$(echo $VERSION |cut -d- -f1) PKGVER=$(echo $VERSION |tr - _) -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -135,24 +136,19 @@ fi # Fix path to mysql header: cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 -# Fix UNSIGNED values in QMYSQL: -cd qtbase - cat $CWD/patches/qt5.qtbug-53237.patch | patch -p1 --verbose || exit 1 -cd - +## 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 freetype engine performance: +# Don't unload plugins in QPluginLoader (segfault in LXQT): cd qtbase - cat $CWD/patches/qt5.qtbug-49452.patch | patch -p1 --verbose || exit 1 + cat $CWD/patches/qt5.qtbug-49061.patch | patch -p1 --verbose || exit 1 cd - -# 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 crash on exit when using default property aliases with layouts: -cd qtdeclarative - cat $CWD/patches/qt5.qtbug-51927.patch | patch -p1 --verbose || exit 1 +# Fix file chooser segfault on Gnome/Wayland: +cd qtbase + cat $CWD/patches/qt5.qtbug-55583.patch | patch -p1 --verbose || exit 1 cd - if ! pkg-config --exists libpulse 2>/dev/null ; then diff --git a/deps/sip/.url b/deps/sip/.url new file mode 100644 index 0000000..906282f --- /dev/null +++ b/deps/sip/.url @@ -0,0 +1,2 @@ +https://sourceforge.net/projects/pyqt/files/sip/sip-4.19/sip-4.19.tar.gz + diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild new file mode 100755 index 0000000..02722b3 --- /dev/null +++ b/deps/sip/sip.SlackBuild @@ -0,0 +1,110 @@ +#!/bin/sh + +# Copyright 2008 Aleksandar Samardzic +# Copyright 2008, 2009, 2010, 2011 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 + + +PKGNAM=sip +VERSION=${VERSION:-4.19} +BUILD=${BUILD:-1} + +NUMJOBS=${NUMJOBS:--j7} + +# Automatically determine the architecture we're building on: +MARCH=$( uname -m ) +if [ -z "$ARCH" ]; then + case "$MARCH" in + 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: + *) export ARCH=$MARCH ;; + esac +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 + +PYTHONVER=$(python -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.) +PYTHONLIB=$( python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib()' ) + +CWD=$(pwd) +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 {} \; + +python configure.py \ + -b "/usr/bin" \ + -d "$PYTHONLIB" \ + -e "/usr/include/python$PYTHONVER" \ + CFLAGS="$SLKCFLAGS" \ + CXXFLAGS="$SLKCFLAGS" + +make $NUMJOBS || make || exit 1 +make install DESTDIR=$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 + +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 new file mode 100644 index 0000000..d2fae24 --- /dev/null +++ b/deps/sip/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------------------------------------------------------| +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 7246243..e0c30c4 100755 --- a/deps/updates.SlackBuild +++ b/deps/updates.SlackBuild @@ -18,6 +18,7 @@ ALLDEPS=" \ ninja \ sni-qt \ OpenAL \ + libwacom \ libinput \ libxkbcommon \ wayland \ @@ -28,6 +29,7 @@ ALLDEPS=" \ qt-gstreamer \ phonon \ phonon-gstreamer \ + sip \ PyQt5 \ polkit-qt5-1 \ grantlee \ @@ -39,6 +41,8 @@ ALLDEPS=" \ libappindicator \ cfitsio \ lmdb \ + libdmtx \ + qrencode \ libproxy \ telepathy \ hack-font-ttf \ -- cgit v1.2.3