diff options
| author |   Kyle Guinn <elyk03@gmail.com> | 2021-04-21 00:00:33 -0500 |
|---|---|---|
| committer |   Robby Workman <rworkman@slackbuilds.org> | 2021-04-21 20:04:43 -0500 |
| commit | 50db25ab212221716677e0c0f58734f37aff91c2 (patch) | |
| tree | f5d5aafc89085dbb0a86a2e187370ea5668dd058 /academic | |
| parent | b8317dc8590f90e1dbdc6e74307bf0ba1b57284c (diff) | |
| download | slackbuilds-50db25ab212221716677e0c0f58734f37aff91c2.tar.gz slackbuilds-50db25ab212221716677e0c0f58734f37aff91c2.tar.xz | |
academic/octave: Remove Qt4 support
Signed-off-by: Kyle Guinn <elyk03@gmail.com>
Diffstat (limited to 'academic')
| -rw-r--r-- | academic/octave/README | 6 | ||||
| -rw-r--r-- | academic/octave/octave.SlackBuild | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/academic/octave/README b/academic/octave/README index 2a6c9cc1de..46429c6687 100644 --- a/academic/octave/README +++ b/academic/octave/README @@ -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 diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild index 11493d831c..897e712c17 100644 --- a/academic/octave/octave.SlackBuild +++ b/academic/octave/octave.SlackBuild @@ -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" \ |