diff options
Diffstat (limited to 'libraries/qwt')
| -rw-r--r-- | libraries/qwt/README | 15 | ||||
| -rw-r--r-- | libraries/qwt/qwt.SlackBuild | 99 | ||||
| -rw-r--r-- | libraries/qwt/qwt.info | 6 |
3 files changed, 65 insertions, 55 deletions
diff --git a/libraries/qwt/README b/libraries/qwt/README index ddd2be7307..e72ff35b3c 100644 --- a/libraries/qwt/README +++ b/libraries/qwt/README @@ -1,8 +1,11 @@ -Qwt is an extension to the Qt GUI library from Troll Tech AS. -The Qwt library contains widgets and components which are -primarily useful for technical and scientifical purposes. -It includes a 2-D plotting widget, different kinds of sliders, -and much more. +Qwt is an extension to the Qt GUI library from Troll Tech AS. The Qwt +library contains widgets and components which are primarily useful +for technical and scientifical purposes. It includes a 2-D plotting +widget, different kinds of sliders, and much more. -Support for Qt5 will be included if the qt5 package is detected at build time. +Optional dependency: qt4. If installed, the package will include qt4 +support. +If you're interested in developing software that uses qwt, you might +want to build this with EXAMPLES=yes in the environment. This will +compile the example programs and install them in the doc dir. diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild index 46a4e9b453..15ad9c54d2 100644 --- a/libraries/qwt/qwt.SlackBuild +++ b/libraries/qwt/qwt.SlackBuild @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for qwt @@ -6,12 +6,22 @@ # Nobbled from Slacky and sanitised for sanity :) # Modified by dunkyp <dunkyp@gmail.com> # Modified by the Slackbuilds.org project -# Maintained 2015-2019 by Christoph Willing <chris.willing@linux.com> +# Maintained 2015-2021 by Christoph Willing <chris.willing@linux.com> + +# 20220419 bkw: Modified by SlackBuilds.org, BUILD=3: +# - don't build and install the example binaries by default; +# add EXAMPLES=yes option. + +# 20220222 bkw: Modified by SlackBuilds.org: +# - add optional qt4 support. + +cd $(dirname $0) ; CWD=$(pwd) PRGNAM=qwt -VERSION=${VERSION:-6.1.4} -BUILD=${BUILD:-1} +VERSION=${VERSION:-6.1.6} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -21,7 +31,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +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} @@ -40,9 +54,6 @@ else LIBDIRSUFFIX="" fi -# If Qt5 is installed, assume we want to use it -QWT_QT5="no" ; pkg-config --exists Qt5 ; if [ "$?" = "0" ]; then QWT_QT5="yes" ; fi - set -e rm -rf $PKG @@ -55,33 +66,36 @@ patch -p0 < $CWD/patch-6.1.2-config.diff chown -R root:root . find -L . \ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \ - -exec chmod 755 {} \; -o \ + -exec chmod 755 {} \+ -o \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ - -exec chmod 644 {} \; - -mkdir -p build-qt4 -cd build-qt4 -qmake .. LIBDIRSUFFIX=$LIBDIRSUFFIX -make CFLAGS+="$SLKCFLAGS" CXXFLAGS+="$SLKCFLAGS" -make install INSTALL_ROOT=$PKG -cd .. + -exec chmod 644 {} \+ + +# 20220419 bkw: don't build the examples by default. they're not +# particularly useful. the sources to the examples are installed in +# the doc dir, if users want to play with them. +[ "${EXAMPLES:-no}" != "yes" ] && + sed -i '/^QWT_CONFIG.*QwtExamples/s,^,#,' qwtconfig.pri + +if [ -x /usr/lib$LIBDIRSUFFIX/qt4/bin/qmake ]; then + mkdir -p build-qt4 + cd build-qt4 + qmake-qt4 .. LIBDIRSUFFIX=$LIBDIRSUFFIX + make CFLAGS+="$SLKCFLAGS" CXXFLAGS+="$SLKCFLAGS -std=c++11 -fPIC" + make install INSTALL_ROOT=$PKG + cd .. +fi -if [ "$QWT_QT5" = "yes" ]; then - echo "Supporting Qt5" - mkdir -p build-qt5 - cd build-qt5 +mkdir -p build +cd build qmake-qt5 .. LIBDIRSUFFIX=$LIBDIRSUFFIX make CFLAGS+="$SLKCFLAGS" CXXFLAGS+="$SLKCFLAGS -std=c++11 -fPIC" make install INSTALL_ROOT=$PKG - cd .. -fi +cd .. # Rationalise the pkgconfig default filenames ( cd $PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig - ln -s qwt.pc Qwt6.pc - if [ -f Qt5Qwt6.pc ]; then - ln -s Qt5Qwt6.pc qwt-qt5.pc - fi + [ -f qwt.pc ] && ln -s qwt.pc Qwt6.pc + [ -f Qt5Qwt6.pc ] && ln -s Qt5Qwt6.pc qwt-qt5.pc ) find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ @@ -89,29 +103,22 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ mv $PKG/usr/doc/man $PKG/usr rm -f $PKG/usr/man/man3/_tmp* -( cd $PKG/usr/man - find . -type f -exec gzip -9 {} \; - for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done -) - -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples -find ./build-qt4/examples/ -name moc -type d |xargs rm -rf -find ./build-qt4/examples/ -name obj -type d |xargs rm -rf -cp -a ./build-qt4/examples/* $PKG/usr/doc/$PRGNAM-$VERSION/examples - -if [ -d build-qt5 ]; then - mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples-qt5 - find ./build-qt5/examples/ -name moc -type d |xargs rm -rf - find ./build-qt5/examples/ -name obj -type d |xargs rm -rf - cp -a ./build-qt5/examples/* $PKG/usr/doc/$PRGNAM-$VERSION/examples-qt5 +gzip -9 $PKG/usr/man/man*/* + +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC/examples +cp -a examples/* $PKGDOC/examples/ +if [ "${EXAMPLES:-no}" = "yes" ]; then + mkdir -p $PKGDOC/examples/bin + install -s -m0755 build/examples/bin/* $PKGDOC/examples/bin fi -mv $PKG/usr/doc/html $PKG/usr/doc/$PRGNAM-$VERSION -cp -a CHANGES* COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +mv $PKG/usr/doc/html $PKGDOC +cp -a CHANGES* COPYING README $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild 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/qwt/qwt.info b/libraries/qwt/qwt.info index 1b81a031d9..36c5bc0943 100644 --- a/libraries/qwt/qwt.info +++ b/libraries/qwt/qwt.info @@ -1,8 +1,8 @@ PRGNAM="qwt" -VERSION="6.1.4" +VERSION="6.1.6" HOMEPAGE="https://qwt.sourceforge.io/" -DOWNLOAD="https://downloads.sourceforge.net/qwt/qwt-6.1.4.tar.bz2" -MD5SUM="4fb1852f694420e3ab9c583526edecc5" +DOWNLOAD="https://downloads.sourceforge.net/qwt/qwt-6.1.6.tar.bz2" +MD5SUM="cc71be5d6c33c2fc19ae8082ccdd3e83" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |