sci-mathematics/octave: bump to version 9.1.0 #36762
Conversation
- Added support to Qt6 - Added support to sci-libs/klu - Added support to sci-libs/spqr Bug: https://bugs.gentoo.org/918123 Signed-off-by: Fabio Rossi <[email protected]>
Pull Request assignmentSubmitter: @efferre79 sci-mathematics/octave: @gentoo/sci-mathematics Linked bugsBugs linked: 918123 In order to force reassignment and/or bug reference scan, please append Docs: Code of Conduct ● Copyright policy (expl.) ● Devmanual ● GitHub PRs ● Proxy-maint guide |
gentoo-bot
added
assigned
Pull request CI reportReport generated at: 2024-05-21 18:10 UTC There are existing issues already. Please look into the report to make sure none of them affect the packages in question: |
| # will probably make sense to merge USE=opengl and USE=X into USE=qt[56], | ||
| # dropping USE=fltk entirely. | ||
| REQUIRED_USE=" | ||
| ?? ( qt5 qt6 ) |
There was a problem hiding this comment.
Per Qt packaging policy we should not introduce the qt5 flag and REQUIRED_USE here.
Instead we should add only the qt6 flag, if enabled gui is built with qt6, otherwise it is built with qt5.
| # will probably make sense to merge USE=opengl and USE=X into USE=qt[56], | ||
| # dropping USE=fltk entirely. | ||
| REQUIRED_USE=" | ||
| ?? ( qt5 qt6 ) |
There was a problem hiding this comment.
| ?? ( qt5 qt6 ) |
| >=media-gfx/fig2dev-3.2.9-r1 | ||
| ) | ||
| gui? ( | ||
| qt5? ( |
There was a problem hiding this comment.
| qt5? ( | |
| !qt6? ( |
| SLOT="0/${PV}" | ||
| KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" | ||
|
|
||
| IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json klu opengl portaudio postscript +qhull +qrupdate +qt5 qt6 readline sndfile +sparse spqr ssl sundials X zlib" |
There was a problem hiding this comment.
| IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json klu opengl portaudio postscript +qhull +qrupdate +qt5 qt6 readline sndfile +sparse spqr ssl sundials X zlib" | |
| IUSE="curl doc fftw fltk +glpk gnuplot gui hdf5 imagemagick java json klu opengl portaudio postscript +qhull +qrupdate qt6 readline sndfile +sparse spqr ssl sundials X zlib" |
| # would want to use them in octave. In any case, upstream doesn't really | ||
| # support imagemagick, only graphicsmagick (bug 864785). |
There was a problem hiding this comment.
Is this still the case? I find the graphicsmagick/imagemagick situation here a bit confusing.
| qt5? ( gui ) | ||
| qt6? ( gui ) |
There was a problem hiding this comment.
| qt5? ( gui ) | |
| qt6? ( gui ) |
| if use qt5 ; then | ||
| export MOC="$(qt5_get_bindir)/moc" \ | ||
| UIC="$(qt5_get_bindir)/uic" \ | ||
| RCC="$(qt5_get_bindir)/rcc" \ | ||
| LRELEASE="$(qt5_get_bindir)/lrelease" \ | ||
| QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \ | ||
| QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator" | ||
| gui_with="--with-qt=5" | ||
| elif use qt6 ; then | ||
| export MOC="$(qt6_get_bindir)/../libexec/moc" \ | ||
| UIC="$(qt6_get_bindir)/../libexec/uic" \ | ||
| RCC="$(qt6_get_bindir)/../libexec/rcc" \ | ||
| LRELEASE="$(qt6_get_bindir)/lrelease" \ | ||
| QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator" | ||
| gui_with="--with-qt=6" | ||
| else | ||
| gui_with="--without-qt" | ||
| fi |
There was a problem hiding this comment.
| if use qt5 ; then | |
| export MOC="$(qt5_get_bindir)/moc" \ | |
| UIC="$(qt5_get_bindir)/uic" \ | |
| RCC="$(qt5_get_bindir)/rcc" \ | |
| LRELEASE="$(qt5_get_bindir)/lrelease" \ | |
| QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \ | |
| QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator" | |
| gui_with="--with-qt=5" | |
| elif use qt6 ; then | |
| export MOC="$(qt6_get_bindir)/../libexec/moc" \ | |
| UIC="$(qt6_get_bindir)/../libexec/uic" \ | |
| RCC="$(qt6_get_bindir)/../libexec/rcc" \ | |
| LRELEASE="$(qt6_get_bindir)/lrelease" \ | |
| QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator" | |
| gui_with="--with-qt=6" | |
| else | |
| gui_with="--without-qt" | |
| fi | |
| if use gui; then | |
| if use qt6; then | |
| export MOC="$(qt6_get_bindir)/../libexec/moc" \ | |
| UIC="$(qt6_get_bindir)/../libexec/uic" \ | |
| RCC="$(qt6_get_bindir)/../libexec/rcc" \ | |
| LRELEASE="$(qt6_get_bindir)/lrelease" \ | |
| QHELPGENERATOR="$(qt6_get_bindir)/../libexec/qhelpgenerator" | |
| gui_with="--with-qt=6" | |
| else | |
| export MOC="$(qt5_get_bindir)/moc" \ | |
| UIC="$(qt5_get_bindir)/uic" \ | |
| RCC="$(qt5_get_bindir)/rcc" \ | |
| LRELEASE="$(qt5_get_bindir)/lrelease" \ | |
| QCOLLECTIONGENERATOR="$(qt5_get_bindir)/qcollectiongenerator" \ | |
| QHELPGENERATOR="$(qt5_get_bindir)/qhelpgenerator" | |
| gui_with="--with-qt=5" | |
| fi | |
| else | |
| gui_with="--without-qt" | |
| fi |
| --without-libiconv-prefix | ||
| --without-libreadline-prefix | ||
|
|
||
| ${gui_with} |
There was a problem hiding this comment.
Instead of using a variable, lets put the qt conditionals below the definition of myeconfargs and then we can do myeconfargs+=( --with(out)-qt... ) in the qt conditional block.
I have added support to Qt6. The IUSE=gui might be removed but I left it to avoid further modifications (e.g. change of mask file for hppa)
Please check all the boxes that apply:
Signed-off-byline to every commit in the pull request.pkgcheck scan --commits --netto check for issues with my commits.Please note that all boxes must be checked for the pull request to be merged.