aboutsummaryrefslogtreecommitdiff
path: root/academic/octave
diff options
context:
space:
mode:
authorKyle Guinn <elyk03@gmail.com>2014-02-04 09:40:57 +0100
committerErik Hanson <erik@slackbuilds.org>2014-02-08 11:10:27 -0600
commit49395366cda1ca6ff24b5cba6af073e564ec466f (patch)
treea4e4b5e6e5f91ce2f82b4896e7f7e47dc586a09a /academic/octave
parent3795956fae85bb21d1ee25fb0a95cf8b276667a0 (diff)
academic/octave: Remove Qt5 detection.
Patch by Larry Hajali Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'academic/octave')
-rw-r--r--academic/octave/README9
-rw-r--r--academic/octave/octave.SlackBuild6
-rw-r--r--academic/octave/patches/no-qt5.diff18
3 files changed, 27 insertions, 6 deletions
diff --git a/academic/octave/README b/academic/octave/README
index 9a4a2ab7b4653..47a2184526254 100644
--- a/academic/octave/README
+++ b/academic/octave/README
@@ -4,11 +4,10 @@ linear and nonlinear problems numerically, and for performing other numerical
experiments using a language that is mostly compatible with Matlab. It may
also be used as a batch-oriented language.
-These optional dependencies will be used if found. See INSTALL.OCTAVE (in the
-Octave source) for a description of what each dependency offers.
-
-AMD, CAMD, COLAMD, CCOLAMD, CHOLMOD, UMFPACK, CXSparse, glpk, arpack-ng,
-qrupdate, qhull, HDF5, fltk, ftgl, gl2ps, jdk, GraphicsMagick
+These optional dependencies will be used if found (see INSTALL.OCTAVE, in the
+Octave source, for a description of what each dependency offers):
+amd, camd, colamd, ccolamd, cholmod, umfpack, cxsparse, glpk, arpack-ng,
+qrupdate, qhull, hdf5, fltk, ftgl, gl2ps, jdk, GraphicsMagick.
Octave can use ImageMagick (part of Slackware) or GraphicsMagick (available
from SBo) for some functionality. ImageMagick 6.8.6-10 from Slackware 14.1
diff --git a/academic/octave/octave.SlackBuild b/academic/octave/octave.SlackBuild
index 68eded862f1e0..275582c96573a 100644
--- a/academic/octave/octave.SlackBuild
+++ b/academic/octave/octave.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=octave
VERSION=${VERSION:-3.8.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -82,6 +82,10 @@ find -L . \
# https://savannah.gnu.org/bugs/?41054
patch -p1 < $CWD/patches/compressed-info.diff
+# Don't try to detect Qt5. It's not supported yet.
+# https://savannah.gnu.org/bugs/?40252
+patch -p1 < $CWD/patches/no-qt5.diff
+
# Fix several configure checks due to the above umfpack.h -> amd.h issue.
# https://savannah.gnu.org/bugs/?41209
patch -p1 < $CWD/patches/umfpack-cppflags.diff
diff --git a/academic/octave/patches/no-qt5.diff b/academic/octave/patches/no-qt5.diff
new file mode 100644
index 0000000000000..48044ef831db9
--- /dev/null
+++ b/academic/octave/patches/no-qt5.diff
@@ -0,0 +1,18 @@
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -2707,10 +2707,10 @@
+ fi
+
+ if test $build_gui = yes; then
+- AC_CHECK_TOOLS(MOC, [moc-qt5 moc-qt4 moc])
+- AC_CHECK_TOOLS(UIC, [uic-qt5 uic-qt4 uic])
+- AC_CHECK_TOOLS(RCC, [rcc-qt5 rcc-qt4 rcc])
+- AC_CHECK_TOOLS(LRELEASE, [lrelease-qt5 lrelease-qt4 lrelease])
++ AC_CHECK_TOOLS(MOC, [moc-qt4 moc])
++ AC_CHECK_TOOLS(UIC, [uic-qt4 uic])
++ AC_CHECK_TOOLS(RCC, [rcc-qt4 rcc])
++ AC_CHECK_TOOLS(LRELEASE, [lrelease-qt4 lrelease])
+ if test -n "$MOC" && test -n "$UIC" && test -n "$RCC" && test -n "$LRELEASE"; then
+ AC_DEFINE(HAVE_QT, 1,
+ [Define to 1 if Qt is available (libraries, developer header files, utility programs (moc, uic, rcc, and lrelease))])