From 646a5c1cbfd95873950a87b5f75d52073a967023 Mon Sep 17 00:00:00 2001 From: Patrick J Volkerding Date: Mon, 28 May 2018 19:12:29 +0000 Subject: Mon May 28 19:12:29 UTC 2018 a/pkgtools-15.0-noarch-13.txz: Rebuilt. installpkg: default line length for --terselength is the number of columns. removepkg: added --terse mode. upgradepkg: default line length for --terselength is the number of columns. upgradepkg: accept -option in addition to --option. ap/vim-8.1.0026-x86_64-1.txz: Upgraded. d/bison-3.0.5-x86_64-1.txz: Upgraded. e/emacs-26.1-x86_64-1.txz: Upgraded. kde/kopete-4.14.3-x86_64-8.txz: Rebuilt. Recompiled against libidn-1.35. n/conntrack-tools-1.4.5-x86_64-1.txz: Upgraded. n/libnetfilter_conntrack-1.0.7-x86_64-1.txz: Upgraded. n/libnftnl-1.1.0-x86_64-1.txz: Upgraded. n/links-2.16-x86_64-2.txz: Rebuilt. Rebuilt to enable X driver for -g mode. n/lynx-2.8.9dev.19-x86_64-1.txz: Upgraded. n/nftables-0.8.5-x86_64-1.txz: Upgraded. n/p11-kit-0.23.11-x86_64-1.txz: Upgraded. n/ulogd-2.0.7-x86_64-1.txz: Upgraded. n/whois-5.3.1-x86_64-1.txz: Upgraded. xap/network-manager-applet-1.8.12-x86_64-1.txz: Upgraded. xap/vim-gvim-8.1.0026-x86_64-1.txz: Upgraded. --- .../qtscriptgenerator/qtscriptgenerator.SlackBuild | 60 +++++++++++++--------- source/l/qtscriptgenerator/slack-desc | 10 ++-- 2 files changed, 42 insertions(+), 28 deletions(-) (limited to 'source/l/qtscriptgenerator') diff --git a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild index 252adbdf4..1b408c0a4 100755 --- a/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild +++ b/source/l/qtscriptgenerator/qtscriptgenerator.SlackBuild @@ -1,9 +1,9 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for qtscriptgenerator # Copyright 2009 Heinz Wiesinger -# Copyright 2009, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2009, 2012, 2013, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,46 +23,55 @@ # 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) + PKGNAM=qtscriptgenerator VERSION=${VERSION:-0.2.0} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; esac 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-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + NUMJOBS=${NUMJOBS:-" -j7 "} -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-$PKGNAM -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686 -fpermissive" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then - SLKCFLAGS="-O2 -march=i686 -mtune=i686" + SLKCFLAGS="-O2 -march=i686 -mtune=i686 -fpermissive" LIBDIRSUFFIX="" elif [ "$ARCH" = "s390" ]; then - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fpermissive" LIBDIRSUFFIX="" elif [ "$ARCH" = "x86_64" ]; then - SLKCFLAGS="-O2 -fPIC" + SLKCFLAGS="-O2 -fPIC -fpermissive" LIBDIRSUFFIX="64" elif [ "$ARCH" = "arm" ]; then - SLKCFLAGS="-O2 -march=armv4 -mtune=xscale" + SLKCFLAGS="-O2 -march=armv4 -mtune=xscale -fpermissive" LIBDIRSUFFIX="" elif [ "$ARCH" = "armel" ]; then - SLKCFLAGS="-O2 -march=armv4t" + SLKCFLAGS="-O2 -march=armv4t -fpermissive" LIBDIRSUFFIX="" else - SLKCFLAGS="-O2" + SLKCFLAGS="-O2 -fpermissive" LIBDIRSUFFIX="" fi @@ -88,15 +97,18 @@ find . \ zcat $CWD/include-everything.patch.gz | patch -p1 --verbose || exit 1 cd generator - qmake - make $NUMJOBS - ./generator --include-paths=/usr/lib${LIBDIRSUFFIX}/qt/include:/usr/include + echo "Building generator..." + qmake || exit 1 + make $NUMJOBS || exit 1 + ./generator --include-paths=/usr/lib${LIBDIRSUFFIX}/qt/include:/usr/include || exit 1 cd - +# Leaving off the || exit 1 in two make statements below, or we get nowhere :/ cd qtbindings + echo "Building qtbindings..." sed -i "s|CONFIG += debug_and_release|CONFIG += release|" \ qtbindingsbase.pri - qmake + qmake || exit 1 make $NUMJOBS qmake_all sed -i "s|-I/usr/lib${LIBDIRSUFFIX}/qt/include/phonon|-I/usr/include/phonon|" \ qtscript_phonon/Makefile @@ -104,19 +116,21 @@ cd qtbindings cd - cd tools/qsexec/src - qmake - make $NUMJOBS + echo "Building tools/qsexec/src..." + qmake || exit 1 + make $NUMJOBS || exit 1 cd - cd qtbindings/qtscript_uitools - qmake - make $NUMJOBS all + echo "Building qtbindings/qtscript_uitools..." + qmake || exit 1 + make $NUMJOBS all || exit 1 cd - mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/qt/{bin,plugins/script} -install -m 755 tools/qsexec/qsexec $PKG/usr/lib${LIBDIRSUFFIX}/qt/bin/qsexec -install -m 755 generator/generator $PKG/usr/lib${LIBDIRSUFFIX}/qt/bin/generator +install -m 755 tools/qsexec/qsexec $PKG/usr/lib${LIBDIRSUFFIX}/qt/bin/qsexec || exit 1 +install -m 755 generator/generator $PKG/usr/lib${LIBDIRSUFFIX}/qt/bin/generator || exit 1 cp -a plugins/script/libqtscript* $PKG/usr/lib${LIBDIRSUFFIX}/qt/plugins/script/ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ diff --git a/source/l/qtscriptgenerator/slack-desc b/source/l/qtscriptgenerator/slack-desc index 16f2ba052..c4f2e096a 100644 --- a/source/l/qtscriptgenerator/slack-desc +++ b/source/l/qtscriptgenerator/slack-desc @@ -1,16 +1,16 @@ # 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------------------------------------------------------| qtscriptgenerator: qtscriptgenerator (Qt API Bindings for QtScript) qtscriptgenerator: qtscriptgenerator: Qt Script Generator is a tool that generates Qt bindings for Qt -qtscriptgenerator: Script. With the generated bindings you get access to substantial -qtscriptgenerator: portions of the Qt API from within Qt Script. +qtscriptgenerator: Script. With the generated bindings you get access to substantial +qtscriptgenerator: portions of the Qt API from within QtScript. qtscriptgenerator: qtscriptgenerator: Homepage: http://code.google.com/p/qtscriptgenerator/ qtscriptgenerator: -- cgit v1.2.3