diff options
Diffstat (limited to 'source/l/libdbusmenu-qt')
-rwxr-xr-x | source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild | 22 | ||||
-rw-r--r-- | source/l/libdbusmenu-qt/slack-desc | 8 |
2 files changed, 19 insertions, 11 deletions
diff --git a/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild index ccd77d037..04d87c652 100755 --- a/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild +++ b/source/l/libdbusmenu-qt/libdbusmenu-qt.SlackBuild @@ -1,7 +1,7 @@ -#!/bin/sh +#!/bin/bash # Copyright 2010, 2011, 2012 Eric Hameleers, Eindhoven, The Netherlands -# Copyright 2010, 2011, 2012 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2010, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # Redistribution and use of this script, with or without modification, is @@ -21,6 +21,7 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) # Pull this package from git due to some copyright related # problems going on at Canonical... @@ -31,7 +32,7 @@ PKGNAM=libdbusmenu-qt VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} 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: @@ -47,8 +48,16 @@ if [ -z "$ARCH" ]; then esac fi -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +# 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-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then SLKCFLAGS="-O2" @@ -61,7 +70,6 @@ else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM diff --git a/source/l/libdbusmenu-qt/slack-desc b/source/l/libdbusmenu-qt/slack-desc index 6e72c25f0..42029d657 100644 --- a/source/l/libdbusmenu-qt/slack-desc +++ b/source/l/libdbusmenu-qt/slack-desc @@ -1,8 +1,8 @@ # 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-----------------------------------------------------| @@ -12,7 +12,7 @@ libdbusmenu-qt: This library provides a Qt implementation of the DBusMenu protoc libdbusmenu-qt: The DBusMenu protocol makes it possible for applications to export libdbusmenu-qt: and import their menus over DBus. libdbusmenu-qt: -libdbusmenu-qt: Homepage: http://people.canonical.com/~agateau/dbusmenu/ +libdbusmenu-qt: Homepage: http://people.canonical.com/~agateau/dbusmenu/ libdbusmenu-qt: libdbusmenu-qt: libdbusmenu-qt: |