mirror of
https://github.com/Ponce/slackbuilds
synced 2024-11-21 19:42:24 +01:00
academic/octave: Remove Qt4 support
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
This commit is contained in:
parent
b8317dc859
commit
50db25ab21
2 changed files with 0 additions and 13 deletions
|
@ -20,12 +20,6 @@ amd, camd, colamd, ccolamd, cholmod, umfpack, cxsparse, glpk, arpack-ng,
|
|||
qrupdate, sundials, qhull, hdf5, fltk, ftgl, gl2ps, jdk, GraphicsMagick,
|
||||
portaudio.
|
||||
|
||||
Octave can use either Qt4 or Qt5, and it will select Qt5 if both are
|
||||
installed. You can force it to use a particular version by passing QT=4 or
|
||||
QT=5 to the script. If Qt5 is selected and it does not find a Qt5 version of
|
||||
QScintilla, then the editor window in the GUI will be disabled. If you need
|
||||
the editor window and have both Qt versions installed, force it to use Qt4.
|
||||
|
||||
Octave can use ImageMagick (part of Slackware) or GraphicsMagick (available
|
||||
from SBo) for image-reading functionality. If both are installed,
|
||||
GraphicsMagick will be selected by default, since ImageMagick is not
|
||||
|
|
|
@ -74,12 +74,6 @@ if [ -n "$MAGICK" ]; then
|
|||
MAGICK="--with-magick=$MAGICK"
|
||||
fi
|
||||
|
||||
# Allow forcing a particular version of Qt. Set QT=4 or QT=5.
|
||||
# If unset, Octave will decide, and it prefers version 5.
|
||||
if [ -n "$QT" ]; then
|
||||
QT="--with-qt=$QT"
|
||||
fi
|
||||
|
||||
set -e
|
||||
|
||||
rm -rf $PKG
|
||||
|
@ -116,7 +110,6 @@ find . -name stamp-vti -exec touch {} +
|
|||
--disable-dependency-tracking \
|
||||
--with-openssl=auto \
|
||||
${MAGICK} \
|
||||
${QT} \
|
||||
--build=$ARCH-slackware-linux \
|
||||
CFLAGS="$SLKCFLAGS" \
|
||||
CXXFLAGS="$SLKCFLAGS" \
|
||||
|
|
Loading…
Reference in a new issue