From faa80e7dad4c49ff3fb490a3c7f9c66ca6fe0ba5 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Tue, 6 Aug 2019 14:29:25 +0200 Subject: Packages rebuilt/upgraded due to newer ffmpeg/libevent in -current Deps: - rebuilt qt5 (for the new libevent). - rebuilt OpenAL and mlt (for the new ffmpeg). - upgraded opencv, qrencode, qtav, sip and QScintilla. - removed PyQT (since this now properly landed in -current) Frameworks: - rebuilt prison (for the new qrencode) and kfilemetadata5 (new ffmpeg). Plasma: - rebuilt ksysguard (for the new libevent). Applications: - rebuilt ffmpegthumbs and k3b (for the new ffmpeg). Applications-extra: - upgraded digikam and krita. --- deps/sip/.url | 2 +- deps/sip/sip.SlackBuild | 21 +++++++++++++-------- deps/sip/slack-desc | 12 ++++++------ 3 files changed, 20 insertions(+), 15 deletions(-) (limited to 'deps/sip') diff --git a/deps/sip/.url b/deps/sip/.url index 202b19a..f36c949 100644 --- a/deps/sip/.url +++ b/deps/sip/.url @@ -1,2 +1,2 @@ -https://www.riverbankcomputing.com/static/Downloads/sip/4.19.17/sip-4.19.17.tar.gz +https://www.riverbankcomputing.com/static/Downloads/sip/4.19.18/sip-4.19.18.tar.gz diff --git a/deps/sip/sip.SlackBuild b/deps/sip/sip.SlackBuild index c79e22f..e52985b 100755 --- a/deps/sip/sip.SlackBuild +++ b/deps/sip/sip.SlackBuild @@ -1,7 +1,7 @@ #!/bin/sh # Copyright 2008 Aleksandar Samardzic -# Copyright 2008, 2009, 2010, 2011, 2017 Patrick J. Volkerding, Sebeka, MN, USA +# 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 @@ -24,12 +24,13 @@ # Modified by Robby Workman # Modified by Eric Hameleers +cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sip -VERSION=${VERSION:-4.19.17} +VERSION=${VERSION:-4.19.18} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:-" -j$(nproc) "} +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -42,6 +43,14 @@ if [ -z "$ARCH" ]; then 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 @@ -60,7 +69,6 @@ PYTHON2LIB=$( python2 -c 'from distutils.sysconfig import get_python_lib; print 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 ) -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM @@ -68,12 +76,9 @@ rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP rm -rf $PKGNAM-$VERSION -tar xvf $CWD/$PKGNAM-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1 cd $PKGNAM-$VERSION || exit 1 -## Get PyQt4 to compile: -#cat $CWD/patches/PyQt4_sip_regression.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/sip/slack-desc b/deps/sip/slack-desc index d2fae24..69e52db 100644 --- a/deps/sip/slack-desc +++ b/deps/sip/slack-desc @@ -1,19 +1,19 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# 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 +# 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 (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: 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: Homepage: http://www.riverbankcomputing.co.uk/software/sip/ sip: sip: sip: -- cgit v1.2.3