From 05cfb17141c0e632cc8f776af1d1f1ab1eac8c76 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Thu, 21 Jul 2016 12:39:25 +0200 Subject: deps: updated for KDE 5_16.07 --- deps/PyQt5/.url | 2 + deps/PyQt5/PyQt5.SlackBuild | 13 ++-- deps/grantlee/.url | 2 + deps/grantlee/grantlee.SlackBuild | 4 +- deps/grantlee/slack-desc | 2 +- deps/phonon/phonon.SlackBuild | 2 +- deps/polkit-qt5-1/polkit-qt5-1.SlackBuild | 6 +- deps/qca-qt5/qca-qt5.SlackBuild | 2 +- deps/qt-gstreamer/qt-gstreamer.SlackBuild | 4 +- deps/qt-gstreamer0/qt-gstreamer0.SlackBuild | 4 +- deps/qt5/.url | 2 +- deps/qt5/qt5.SlackBuild | 45 ++++++------ deps/sip/sip.SlackBuild | 110 ---------------------------- deps/sip/slack-desc | 19 ----- deps/sni-qt/.url | 2 + deps/sni-qt/sni-qt.SlackBuild | 4 +- deps/updates.SlackBuild | 1 - 17 files changed, 53 insertions(+), 171 deletions(-) create mode 100644 deps/PyQt5/.url create mode 100644 deps/grantlee/.url delete mode 100755 deps/sip/sip.SlackBuild delete mode 100644 deps/sip/slack-desc create mode 100644 deps/sni-qt/.url diff --git a/deps/PyQt5/.url b/deps/PyQt5/.url new file mode 100644 index 0000000..2be86e4 --- /dev/null +++ b/deps/PyQt5/.url @@ -0,0 +1,2 @@ +http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-5.6/PyQt5_gpl-5.6.tar.gz + diff --git a/deps/PyQt5/PyQt5.SlackBuild b/deps/PyQt5/PyQt5.SlackBuild index 3ac8812..7252b86 100755 --- a/deps/PyQt5/PyQt5.SlackBuild +++ b/deps/PyQt5/PyQt5.SlackBuild @@ -27,8 +27,7 @@ # Modified by Eric Hameleers PKGNAM=PyQt5 -SRCNAM=PyQt -VERSION=${VERSION:-5.5.1} +VERSION=${VERSION:-5.6} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -64,9 +63,13 @@ fi rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP -rm -rf $SRCNAM-gpl-$VERSION -tar xvf $CWD/$SRCNAM-gpl-$VERSION.tar.?z* || exit 1 -cd $SRCNAM-gpl-$VERSION || exit 1 +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 . \ diff --git a/deps/grantlee/.url b/deps/grantlee/.url new file mode 100644 index 0000000..09d105e --- /dev/null +++ b/deps/grantlee/.url @@ -0,0 +1,2 @@ +http://downloads.grantlee.org/grantlee-5.1.0.tar.gz + diff --git a/deps/grantlee/grantlee.SlackBuild b/deps/grantlee/grantlee.SlackBuild index 0888f9e..27f1e41 100755 --- a/deps/grantlee/grantlee.SlackBuild +++ b/deps/grantlee/grantlee.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2015 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # @@ -25,7 +25,7 @@ # Used to be called 'grantlee-qt5' PKGNAM=grantlee SRCNAM=grantlee -VERSION=${VERSION:-5.0.0} +VERSION=${VERSION:-5.1.0} BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} diff --git a/deps/grantlee/slack-desc b/deps/grantlee/slack-desc index c719c89..710b1eb 100644 --- a/deps/grantlee/slack-desc +++ b/deps/grantlee/slack-desc @@ -15,5 +15,5 @@ grantlee: the data they contain, opening the door for theming. grantlee: grantlee: grantlee: -grantlee: Homepage: http://gitorious.org/grantlee/ +grantlee: Homepage: https://github.com/steveire/grantlee grantlee: diff --git a/deps/phonon/phonon.SlackBuild b/deps/phonon/phonon.SlackBuild index aa5a620..b3eecd9 100755 --- a/deps/phonon/phonon.SlackBuild +++ b/deps/phonon/phonon.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=phonon VERSION=${VERSION:-4.9.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} diff --git a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild index 80f6aa8..99f92a3 100755 --- a/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild +++ b/deps/polkit-qt5-1/polkit-qt5-1.SlackBuild @@ -20,12 +20,12 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# Modified 2014, 2015 by Eric Hameleers +# Modified 2014, 2015, 2016 by Eric Hameleers PKGNAM=polkit-qt5-1 -VERSION=${VERSION:-3882e11_20140802git} -BUILD=${BUILD:-3} +VERSION=${VERSION:-50624e0_20160719git} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} diff --git a/deps/qca-qt5/qca-qt5.SlackBuild b/deps/qca-qt5/qca-qt5.SlackBuild index 45ed3a7..2b73fcf 100755 --- a/deps/qca-qt5/qca-qt5.SlackBuild +++ b/deps/qca-qt5/qca-qt5.SlackBuild @@ -24,7 +24,7 @@ PKGNAM=qca-qt5 SRCNAM=qca VERSION=${VERSION:-2.1.1} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: diff --git a/deps/qt-gstreamer/qt-gstreamer.SlackBuild b/deps/qt-gstreamer/qt-gstreamer.SlackBuild index cc904ed..62e17f7 100755 --- a/deps/qt-gstreamer/qt-gstreamer.SlackBuild +++ b/deps/qt-gstreamer/qt-gstreamer.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2014, 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2014, 2015 Eric Hameleers, Eindhoven, NL +# Copyright 2014, 2015, 2016 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ PKGNAM=qt-gstreamer VERSION=${VERSION:-1.2.0} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} NUMJOBS=${NUMJOBS:--j7} diff --git a/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild b/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild index cb1470c..7b2fcaf 100755 --- a/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild +++ b/deps/qt-gstreamer0/qt-gstreamer0.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2014 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2014, 2015 Eric Hameleers, Eindhoven, NL +# Copyright 2014, 2015, 2016 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,7 +25,7 @@ PKGNAM=qt-gstreamer0 SRCNAM=qt-gstreamer VERSION=${VERSION:-0.10.3} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j7} diff --git a/deps/qt5/.url b/deps/qt5/.url index a5dc197..c819030 100644 --- a/deps/qt5/.url +++ b/deps/qt5/.url @@ -1 +1 @@ -http://download.qt.io/official_releases/qt/5.6/5.6.1/single/qt-everywhere-opensource-src-5.6.1.tar.xz +http://download.qt.io/official_releases/qt/5.6/5.6.1-1/single/qt-everywhere-opensource-src-5.6.1-1.tar.xz diff --git a/deps/qt5/qt5.SlackBuild b/deps/qt5/qt5.SlackBuild index 67e104d..e7df254 100755 --- a/deps/qt5/qt5.SlackBuild +++ b/deps/qt5/qt5.SlackBuild @@ -36,7 +36,7 @@ # Alternate method (we don't use this): # wget http://qt.gitorious.org/qt/kde-qt/archive-tarball/4.6.2-patched # -# Modifications 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, NL +# Modifications 2010, 2011, 2012, 2013, 2014, 2015, 2016 Eric Hameleers, Eindhoven, NL # qt 4.7.3, 4.7.4, 4.8.0, 4.8.1, 4.8.2, 4.8.4, are built from original nokia sources. # # Modifications for qt 5.2.0 2013 by Michael James, AU @@ -46,9 +46,12 @@ # Modifications for qt 5.4.1 2015 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.5.1 2015,2016 by Eric Hameleers, Eindhoven, NL # Modifications for qt 5.6.0 2016 by Eric Hameleers, Eindhoven, NL +# Modifications for qt 5.6.1 2016 by Eric Hameleers, Eindhoven, NL PKGNAM=qt5 -VERSION=${VERSION:-5.6.1} +VERSION=${VERSION:-5.6.1-1} +PKGSRC=$(echo $VERSION |cut -d- -f1) +PKGVER=$(echo $VERSION |tr - _) BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -105,7 +108,7 @@ cd $TMP rm -rf qt-everywhere-opensource-src-$VERSION echo "Extracting qt-everywhere-opensource-src-$VERSION.tar.xz" tar xf $CWD/qt-everywhere-opensource-src-$VERSION.tar.xz || exit 1 -cd qt-everywhere-opensource-src-$VERSION || exit 1 +cd qt-everywhere-opensource-src-$PKGSRC || exit 1 chown -R root:root . find . \ @@ -131,21 +134,21 @@ fi # Fix path to mysql header: cat $CWD/patches/qt5.mysql.h.diff | patch -p1 --verbose || exit 1 -# Properly detect ALSA version 1.1.0 as being newer than 1.0.10: -cat $CWD/patches/qt5.alsa.patch | patch -p1 --verbose || exit 1 - +## Properly detect ALSA version 1.1.0 as being newer than 1.0.10: +#cat $CWD/patches/qt5.alsa.patch | patch -p1 --verbose || exit 1 +# ## Build with explicitlib, preventing linker errors: #cd qtbase # cat $CWD/patches/qt5.qtbug-51621.patch | patch -p1 --verbose || exit 1 #cd - - -# Backport fixes for QtDBus deadlocks: -cd qtbase - cat $CWD/patches/qt5.qtbug-51648.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/qt5.qtbug-51649.patch | patch -p1 --verbose || exit 1 - cat $CWD/patches/qt5.qtbug-51676.patch | patch -p1 --verbose || exit 1 -cd - - +# +## Backport fixes for QtDBus deadlocks: +#cd qtbase +# cat $CWD/patches/qt5.qtbug-51648.patch | patch -p1 --verbose || exit 1 +# cat $CWD/patches/qt5.qtbug-51649.patch | patch -p1 --verbose || exit 1 +# cat $CWD/patches/qt5.qtbug-51676.patch | patch -p1 --verbose || exit 1 +#cd - +# ## qtwebengine fails to build with system nss 3.23: #cd qtwebengine # cat $CWD/patches/qt5.qtbug-51890.patch | patch -p1 --verbose || exit 1 @@ -167,7 +170,7 @@ sed -i -e "/^QMAKE_LFLAGS\s/s,+=,+= $SLKLDFLAGS,g" qtbase/mkspecs/common/gcc-bas export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" export OPENSOURCE_CXXFLAGS="$SLKCFLAGS" -export QTDIR="${TMP}/qt-everywhere-opensource-src-${VERSION}" +export QTDIR="${TMP}/qt-everywhere-opensource-src-${PKGSRC}" export LD_LIBRARY_PATH="${QTDIR}/qtbase/lib:${QTDIR}/qttools/lib:${LD_LIBRARY_PATH}" export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" ./configure \ @@ -180,8 +183,8 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins" -headerdir /usr/include/qt5 \ -datadir /usr/share/qt5 \ -archdatadir /usr/lib${LIBDIRSUFFIX}/qt5 \ - -docdir /usr/doc/qt5-$VERSION \ - -examplesdir /usr/doc/qt5-$VERSION/examples \ + -docdir /usr/doc/qt5-$PKGVER \ + -examplesdir /usr/doc/qt5-$PKGVER/examples \ -system-libpng \ -system-libjpeg \ -system-pcre \ @@ -321,12 +324,12 @@ Categories=Qt;Development;Debugger; EOF # Add a documentation directory: -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION +mkdir -p $PKG/usr/doc/$PKGNAM-$PKGVER cp -a \ README qtbase/{header*,LGPL_EXCEPTION.txt,LICENSE*} \ - $PKG/usr/doc/$PKGNAM-$VERSION + $PKG/usr/doc/$PKGNAM-$PKGVER if [ -d $PKG/usr/lib${LIBDIRSUFFIX}/qt5/doc/html ]; then - ( cd $PKG/usr/doc/$PKGNAM-$VERSION + ( cd $PKG/usr/doc/$PKGNAM-$PKGVER ln -sf /usr/lib${LIBDIRSUFFIX}/qt5/doc/html . ) fi @@ -336,5 +339,5 @@ cat $CWD/slack-desc > $PKG/install/slack-desc cat $CWD/doinst.sh > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c n $TMP/$PKGNAM-$PKGVER-$ARCH-$BUILD.txz diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild deleted file mode 100755 index bbdc2ed..0000000 --- a/deps/sip/sip.SlackBuild +++ /dev/null @@ -1,110 +0,0 @@ -#!/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.17} -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 deleted file mode 100644 index d2fae24..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/sni-qt/.url b/deps/sni-qt/.url new file mode 100644 index 0000000..0faae09 --- /dev/null +++ b/deps/sni-qt/.url @@ -0,0 +1,2 @@ +https://launchpad.net/sni-qt/trunk/0.2.6/+download/sni-qt-0.2.6.tar.bz2 + diff --git a/deps/sni-qt/sni-qt.SlackBuild b/deps/sni-qt/sni-qt.SlackBuild index 3d3159b..d1bb6a5 100755 --- a/deps/sni-qt/sni-qt.SlackBuild +++ b/deps/sni-qt/sni-qt.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2015 Patrick J. Volkerding, Sebeka, MN, USA -# Copyright 2015 Eric Hameleers, Eindhoven, NL +# Copyright 2015, 2016 Eric Hameleers, Eindhoven, NL # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,7 +23,7 @@ PKGNAM=sni-qt VERSION=${VERSION:-0.2.6} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:--j6} # Automatically determine the architecture we're building on: diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild index f5c5f55..3a10cb8 100755 --- a/deps/updates.SlackBuild +++ b/deps/updates.SlackBuild @@ -25,7 +25,6 @@ ALLDEPS=" \ qt-gstreamer \ phonon \ phonon-gstreamer \ - sip \ PyQt5 \ polkit-qt5-1 \ grantlee \ -- cgit v1.2.3