From 780a8bb7752241f169bbbc7b48129ee489574f10 Mon Sep 17 00:00:00 2001 From: Eric Hameleers Date: Sun, 25 Jun 2017 12:33:35 +0200 Subject: Updated deps for upcoming KDE 5_17.06 On slackware-current, we switch to Qt 5.9 which is going to be a LTS release (Long Term Support). --- deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild') diff --git a/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild b/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild index efec6bd..103e251 100755 --- a/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild +++ b/deps/libdbusmenu-qt5/libdbusmenu-qt5.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2010, 2011, 2012, 2014, 2015 Eric Hameleers, Eindhoven, The Netherlands +# Copyright 2010, 2011, 2012, 2014, 2015, 2017 Eric Hameleers, Eindhoven, The Netherlands # Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. @@ -30,8 +30,9 @@ # grep dbusmenu_qt_VERSION dbusmenu-qt/CMakeLists.txt PKGNAM=libdbusmenu-qt5 -VERSION=${VERSION:-r267_20140619} -BUILD=${BUILD:-3} +SRCNAM=libdbusmenu-qt +VERSION=${VERSION:-0.9.3+16.04.20160218} +BUILD=${BUILD:-1} NUMJOBS=${NUMJOBS:--j7} @@ -39,7 +40,7 @@ NUMJOBS=${NUMJOBS:--j7} MARCH=$( uname -m ) if [ -z "$ARCH" ]; then case "$MARCH" in - i?86) export ARCH=i486 ;; + 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: @@ -50,6 +51,9 @@ fi if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" LIBDIRSUFFIX="" +elif [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" + LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" LIBDIRSUFFIX="" @@ -68,9 +72,9 @@ PKG=$TMP/package-$PKGNAM 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 +rm -rf $SRCNAM-$VERSION +tar xvf $CWD/${SRCNAM}_${VERSION}.orig.tar.?z* || exit 1 +cd $SRCNAM-$VERSION || exit 1 chown -R root:root . find . \ @@ -105,10 +109,6 @@ cp -a \ COPYING NEWS README \ $PKG/usr/doc/$PKGNAM-$VERSION -mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION/doc -mv $PKG/usr/share/doc/dbusmenu-qt/* $PKG/usr/doc/$PKGNAM-$VERSION/doc -rm -rf $PKG/usr/share/doc - mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc -- cgit v1.2.3