diff options
| author | Christoph Willing <chris.willing@linux.com> | 2021-05-21 21:43:25 +1000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2021-05-26 08:07:35 +0700 |
| commit | f9cf7e2fdb05567d64e3b8979329928581a07fb5 (patch) | |
| tree | 9f02c95eb3f2d8a06d760c493bc6ecf5c3f07dff /libraries/qwt | |
| parent | fab907b7442fbcc19d5cdf59e9a2923873694659 (diff) | |
libraries/qwt: Remove Qt4 support
Signed-off-by: Christoph Willing <chris.willing@linux.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'libraries/qwt')
| -rw-r--r-- | libraries/qwt/README | 2 | ||||
| -rw-r--r-- | libraries/qwt/qwt.SlackBuild | 33 |
2 files changed, 6 insertions, 29 deletions
diff --git a/libraries/qwt/README b/libraries/qwt/README index ddd2be73070bf..917a92ae0543f 100644 --- a/libraries/qwt/README +++ b/libraries/qwt/README @@ -4,5 +4,3 @@ 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. - diff --git a/libraries/qwt/qwt.SlackBuild b/libraries/qwt/qwt.SlackBuild index 9e821a74746b8..4a4b139b0f443 100644 --- a/libraries/qwt/qwt.SlackBuild +++ b/libraries/qwt/qwt.SlackBuild @@ -10,7 +10,7 @@ PRGNAM=qwt VERSION=${VERSION:-6.1.6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -40,9 +40,6 @@ else LIBDIRSUFFIX="" fi -# If Qt5 is installed, assume we want to use it -QWT_QT5="no" ; pkg-config --exists Qt5Core ; if [ "$?" = "0" ]; then QWT_QT5="yes" ; fi - set -e rm -rf $PKG @@ -59,22 +56,12 @@ find -L . \ \( -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 .. - -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 @@ -95,16 +82,8 @@ rm -f $PKG/usr/man/man3/_tmp* ) 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 -fi +cp -a build/examples/bin $PKG/usr/doc/$PRGNAM-$VERSION/examples/ +cp -a examples/* $PKG/usr/doc/$PRGNAM-$VERSION/examples/ mv $PKG/usr/doc/html $PKG/usr/doc/$PRGNAM-$VERSION cp -a CHANGES* COPYING INSTALL README $PKG/usr/doc/$PRGNAM-$VERSION |