diff options
| author | David Spencer <baildon.research@googlemail.com> | 2015-10-28 19:31:10 +0000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-01-17 09:40:16 +0700 |
| commit | 9434f258ee05b0951f5690cb20726c55a2e73e40 (patch) | |
| tree | b21b21d2bb4b47988b9edcda093af97d379deda1 /academic/QtiPlot/QtiPlot.SlackBuild | |
| parent | 7f020478b9da0abb624b1d887ed4be81ee28c014 (diff) | |
academic/QtiPlot: Patched for building with sip-4.16.
Also fixed library plugin location.
Signed-off-by: David Spencer <baildon.research@googlemail.com>
Diffstat (limited to 'academic/QtiPlot/QtiPlot.SlackBuild')
| -rw-r--r-- | academic/QtiPlot/QtiPlot.SlackBuild | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/academic/QtiPlot/QtiPlot.SlackBuild b/academic/QtiPlot/QtiPlot.SlackBuild index 2b43518e93cc5..c5f8a4acf95aa 100644 --- a/academic/QtiPlot/QtiPlot.SlackBuild +++ b/academic/QtiPlot/QtiPlot.SlackBuild @@ -47,16 +47,16 @@ OUTPUT=${OUTPUT:-/tmp} if [ "$ARCH" = "i486" ]; then SLKCFLAGS="-O2 -march=i486 -mtune=i686" - LIBDIRSUFFIX="" + QMAKESPEC="linux-g++" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" - LIBDIRSUFFIX="" + QMAKESPEC="linux-g++" elif [ "$ARCH" = "x86_64" ]; then SLKCFLAGS="-O2 -fPIC" - LIBDIRSUFFIX="64" + QMAKESPEC="linux-g++-64" else SLKCFLAGS="-O2" - LIBDIRSUFFIX="" + QMAKESPEC="linux-g++" fi # Define these here, as numbers change between Slackware releases. The @@ -90,8 +90,12 @@ cp -a $UNOFPLUGIN/qtiplot/src/plugins $SRCNAM-$VERSION/qtiplot/src cp -a $UNOFPLUGIN/qtiplot/importOPJ.pro $SRCNAM-$VERSION/qtiplot cd $SRCNAM-$VERSION -# Patch for recent libpng (thanks to slack_jack, ponce and Arch) +# Patches for recent libpng, sip etc +# thanks to slack_jack, Raveriux, ponce, Arch and Gentoo patch -p0 -d 3rdparty/qwtplot3d < $CWD/qwtplot3d-libpng15.patch +patch -p1 < $CWD/sip-4.15.patch +patch -p1 < $CWD/qtiplot-0.9.8.9-private.patch +patch -p1 < $CWD/pyqt-4.11.patch # Use the custom build.conf cp $CWD/build.conf.slack build.conf @@ -159,10 +163,10 @@ make -j1 web # Build QtiPlot cd ../qtiplot -qmake qtiplot.pro +qmake qtiplot.pro "QMAKESPEC=$QMAKESPEC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make -j1 +make -j1 "QMAKESPEC=$QMAKESPEC" make -j1 install INSTALL_ROOT=$PKG # Generate translations and copy them to their proper place @@ -176,10 +180,10 @@ cp examples/python/* $PKG/usr/share/qtiplot/python-examples # Build fitPlugins cd ../fitPlugins -qmake +qmake "QMAKESPEC=$QMAKESPEC" CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ -make -j1 +make -j1 "QMAKESPEC=$QMAKESPEC" make -j1 install INSTALL_ROOT=$PKG cd .. |