diff options
Diffstat (limited to 'libraries/libqxt')
| -rw-r--r-- | libraries/libqxt/libqxt-gcc6.patch | 11 | ||||
| -rw-r--r-- | libraries/libqxt/libqxt.SlackBuild | 31 | ||||
| -rw-r--r-- | libraries/libqxt/libqxt.info | 2 |
3 files changed, 36 insertions, 8 deletions
diff --git a/libraries/libqxt/libqxt-gcc6.patch b/libraries/libqxt/libqxt-gcc6.patch new file mode 100644 index 0000000000..519646d6eb --- /dev/null +++ b/libraries/libqxt/libqxt-gcc6.patch @@ -0,0 +1,11 @@ +--- a/src/core/qxtslotjob.cpp 2011-11-24 16:10:32.000000000 -0600 ++++ b/src/core/qxtslotjob.cpp 2016-03-07 16:20:32.758268253 -0600 +@@ -174,7 +174,7 @@ This uses QxtSignalWaiter so it will _no + + QVariant QxtFuture::delayedResult(int msec) + { +- if (!waiter->wait(msec, false)) ++ if (!waiter->wait(msec, NULL)) + return QVariant(); + return job->result(); + } diff --git a/libraries/libqxt/libqxt.SlackBuild b/libraries/libqxt/libqxt.SlackBuild index 870d2ead16..dd72cc7ad2 100644 --- a/libraries/libqxt/libqxt.SlackBuild +++ b/libraries/libqxt/libqxt.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for libqxt @@ -24,26 +24,36 @@ # Modified by the SlackBuilds.org project +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=libqxt VERSION=${VERSION:-0.6.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) ARCH=i486 ;; + i?86) ARCH=i586 ;; arm*) ARCH=arm ;; *) ARCH=$( uname -m ) ;; esac fi -CWD=$(pwd) +# 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -74,6 +84,11 @@ find -L . \ # Fix linking during the xrandr test sed -i "s|lXrandr$|lXrandr -lX11|" config.tests/xrandr/xrandr.pro +# Thanks to Archlinux for this +patch -p1 < $CWD/libqxt-gcc6.patch + +. /etc/profile.d/qt4.sh + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure -prefix /usr -libdir /usr/lib$LIBDIRSUFFIX @@ -90,8 +105,10 @@ cp -a \ $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +rm -f $PKG/usr/lib*/*.la + mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/libraries/libqxt/libqxt.info b/libraries/libqxt/libqxt.info index 86db5e1fed..aa628af72a 100644 --- a/libraries/libqxt/libqxt.info +++ b/libraries/libqxt/libqxt.info @@ -5,6 +5,6 @@ DOWNLOAD="http://ponce.cc/slackware/sources/repo/libqxt-0.6.2.tar.xz" MD5SUM="3029f62e04f76a5c2ffab2af307f28e6" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="qt4" MAINTAINER="Andrey Maraev" EMAIL="andrew.maraev60@yandex.ru" |