diff options
| author | Thomas Orgis | 2019-01-10 17:30:14 +0100 |
|---|---|---|
| committer | Thomas Orgis | 2019-01-10 18:53:11 +0100 |
| commit | 230b514cdd9c976cfaf8b74df308512b9fa00d94 (patch) | |
| tree | d730482d8f57d17cfa10ea99d5a89e5e3ced86dd /science | |
| parent | 97b681a8c74f3d626b06f33275da654fe37013cc (diff) | |
octave: enable Qt5 GUI
Diffstat (limited to 'science')
| -rwxr-xr-x | science/octave/BUILD | 5 | ||||
| -rwxr-xr-x | science/octave/DEPENDS | 7 | ||||
| -rw-r--r-- | science/octave/HISTORY | 2 | ||||
| -rwxr-xr-x | science/octave/PRE_BUILD | 7 |
4 files changed, 20 insertions, 1 deletions
diff --git a/science/octave/BUILD b/science/octave/BUILD index 284371f542..a6326f66b7 100755 --- a/science/octave/BUILD +++ b/science/octave/BUILD @@ -1,3 +1,6 @@ +if is_depends_enabled $SPELL qtbase; then + PATH+=":$QT5DIR/bin" + PKG_CONFIG_PATH+=":$QT5DIR/lib/pkgconfig" +fi && export CXXFLAGS="$CXXFLAGS -pthread" && -export OPTS="$OPTS --disable-rpath --enable-shared --enable-dl" && FFLAGS=$CFLAGS default_build diff --git a/science/octave/DEPENDS b/science/octave/DEPENDS index 5d61f02cfa..8c3f04a189 100755 --- a/science/octave/DEPENDS +++ b/science/octave/DEPENDS @@ -2,6 +2,13 @@ depends -sub FORTRAN gcc && depends lapack && depends pcre && +# I want optional_depends "qtbase qttools" ... +optional_depends qtbase "" "--without-qt" "for Qt GUI" && +if is_depends_enabled $SPELL qtbase; then + depends qttools && + optional_depends qscintilla "" "--without-qscintilla" "for GUI Editor" +fi && + optional_depends gnuplot \ '' \ '' \ diff --git a/science/octave/HISTORY b/science/octave/HISTORY index 9e3ec1b59e..7b79738bd9 100644 --- a/science/octave/HISTORY +++ b/science/octave/HISTORY @@ -1,5 +1,7 @@ 2019-01-10 Thomas Orgis <sobukus@sourcemage.org> * DEPENDS: -sub OPENGL fltk (fails linking otherwise) + * DEPENDS, BUILD: Qt GUI, no rpath/shared lib messing + * PRE_BUILD: fix qscintilla detection for our layout 2018-12-31 Thomas Orgis <sobukus@sourcemage.org> * DETAILS: hot-update to 4.4.1, fixup needed for deps diff --git a/science/octave/PRE_BUILD b/science/octave/PRE_BUILD new file mode 100755 index 0000000000..10be498d3f --- /dev/null +++ b/science/octave/PRE_BUILD @@ -0,0 +1,7 @@ +default_pre_build && +cd "$SOURCE_DIRECTORY" && +# Octave expects some qt5-specific name for the lib, while we install it in a +# specific prefix. +sed -i \ + 's:octave_qscintilla_libnames="qscintilla2-qt5 qscintilla2_qt5 qt5scintilla2":octave_qscintilla_libnames=qscintilla2:' \ + configure |