guix_mirror_bot pushed a commit to branch master
in repository guix.
commit a87f1c558e9d5b14ebf468e6412e3285f5f4a997
Author: Cayetano Santos <[email protected]>
AuthorDate: Tue Aug 25 11:36:44 2026 +0200
gnu: octave: Build with Qt6.
* gnu/packages/maths.scm (octave)[arguments]: Delete
’patch-qscintilla-library-name #:phase.
[native-inputs]: Add qttools.
[inputs]: Delete qscintilla-qt5, qtbase-5 and qtwayland-5; add
qscintilla-qt6, qtbase, qtwayland and qt5compat.
---
gnu/packages/maths.scm | 13 +++----------
1 file changed, 3 insertions(+), 10 deletions(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 39011053be..30b84af3b5 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -3714,14 +3714,6 @@ script files.")
`((guix build qt-utils) ,@imported-modules))
((#:phases phases)
#~(modify-phases #$phases
- (add-before 'configure 'patch-qscintilla-library-name
- (lambda* (#:key inputs #:allow-other-keys)
- ;; The QScintilla library that the Octave configure script
- ;; tries to link with should be named libqscintilla-qt5.so,
- ;; but the QScintilla input provides the shared library
- ;; as libqscintilla2_qt5.so.
- (substitute* "configure"
- (("qscintilla2-qt5") "qscintilla2_qt5"))))
(add-after 'install 'wrap-qt
(lambda* (#:key inputs #:allow-other-keys)
(for-each (lambda (path)
@@ -3732,11 +3724,12 @@ script files.")
(find-files "libexec" "^octave-gui$")))))))))
(native-inputs
(modify-inputs native-inputs
- (prepend qttools-5 ;for lrelease
+ (prepend qttools-5 ;for qthelpgenerator
+ qttools ;for lrelease
(texlive-local-tree (list texlive-epsf))))) ;for texi2dvi
(inputs
(modify-inputs inputs
- (prepend qscintilla-qt5 qtbase-5 qtwayland-5)))
+ (prepend qscintilla-qt6 qtbase qtwayland qt5compat)))
(synopsis "High-level language for numerical computation (with GUI)")))
(define-public opencascade-occt
