1 files changed, 13 insertions, 9 deletions
diff --git a/academic/QtiPlot/QtiPlot.SlackBuild b/academic/QtiPlot/QtiPlot.SlackBuild
index 2b43518e93..c5f8a4acf9 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 ..