From 08e6aaef0b6e1afffc11ccdb208cfca5273320a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gonzalo=20Tornar=C3=ADa?= <tornaria@cmat.edu.uy>
Date: Fri, 2 Aug 2024 11:45:34 -0300
Subject: [PATCH] octave: switch to qt6, fix cross, remove build options

---
 srcpkgs/octave/template | 75 ++++++-----------------------------------
 1 file changed, 10 insertions(+), 65 deletions(-)

diff --git a/srcpkgs/octave/template b/srcpkgs/octave/template
index b8f92fd8a63..d49364bb9d0 100644
--- a/srcpkgs/octave/template
+++ b/srcpkgs/octave/template
@@ -1,13 +1,18 @@
 # Template file for 'octave'
 pkgname=octave
 version=9.2.0
-revision=1
+revision=2
 build_style=gnu-configure
+build_helper=qmake6
 configure_args="--disable-docs"
-hostmakedepends="perl gcc-fortran pkg-config"
+hostmakedepends="perl gcc-fortran pkg-config qt6-base qt6-tools"
 makedepends="pcre2-devel readline-devel libSM-devel libltdl-devel lcms2-devel
- glpk-devel SuiteSparse-devel rapidjson"
-depends="$(vopt_if gui qt5-plugin-sqlite) texinfo"
+ glpk-devel SuiteSparse-devel rapidjson arpack-ng-devel libsndfile-devel
+ portaudio-devel libcurl-devel fftw-devel libgraphicsmagick-devel
+ qt6-base-devel qt6-tools-devel qt6-qt5compat-devel qt6-plugin-sqlite
+ qscintilla-qt6-devel glu-devel fltk-devel fontconfig-devel freetype-devel
+ gl2ps-devel libgomp-devel libqhull-devel zlib-devel"
+depends="qt6-plugin-sqlite texinfo"
 checkdepends="zip unzip ghostscript gnuplot tar texinfo"
 short_desc="High-level language, primarily intended for numerical computations"
 maintainer="Gonzalo Tornaría <tornaria@cmat.edu.uy>"
@@ -17,9 +22,6 @@ changelog="http://hg.savannah.gnu.org/hgweb/octave/raw-file/default/etc/NEWS.${v
 distfiles="${GNU_SITE}/octave/octave-${version}.tar.gz"
 checksum=0636554b05996997e431caad4422c00386d2d7c68900472700fecf5ffeb7c991
 
-# avoid warnings due to egrep deprecation
-export EGREP="grep -E"
-
 # Use OpenBLAS on platforms where it is available and fallback to regular BLAS
 # on all others.
 case "$XBPS_TARGET_MACHINE" in
@@ -33,52 +35,9 @@ case "$XBPS_TARGET_MACHINE" in
 		;;
 esac
 
-
-# Package build options
-# TODO: some options are still missing, such as java, qrupdate
-build_options="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- hdf5
- imagemagick
- opengl
- openmp
- qhull
- zlib"
-
-vopt_conflict graphicsmagick imagemagick
-
-desc_option_arpack="Provides 'eigs' and 'svds' functions."
-desc_option_audio="Provides audiofile related functionality."
-desc_option_curl="Provides 'urlread' and 'urlwrite' functions and the 'ftp' class."
-desc_option_fftw3="Improves performance on discrete Fourier transforms."
-desc_option_gui="Graphical User Interface."
-desc_option_graphicsmagick="Provides 'imread' and 'imwrite' functions."
-desc_option_hdf5="Support for HDF data files."
-desc_option_imagemagick="Provides 'imread' and 'imwrite' functions."
-desc_option_qhull="Provides 'convhull{,n}', 'delaunay{,n}' and 'voronoi{,n}' functions."
-desc_option_openmp="Enable support for OpenMP SMP multi-threading"
-desc_option_zlib="Support for compressed data."
-
-build_options_default="
- arpack
- audio
- curl
- fftw3
- graphicsmagick
- gui
- opengl
- openmp
- qhull
- zlib"
-
 if [ -z "$CROSS_BUILD" ]; then
 	# hdf5 is nocross
-	build_options_default+=" hdf5"
+	makedepends+=" hdf5-devel"
 fi
 
 if [ -n "$CROSS_BUILD" ];then
@@ -88,20 +47,6 @@ if [ -n "$CROSS_BUILD" ];then
 	configure_args+=" ax_blas_integer_size=4"
 fi
 
-makedepends+="
- $(vopt_if arpack arpack-ng-devel)
- $(vopt_if audio 'libsndfile-devel portaudio-devel')
- $(vopt_if curl libcurl-devel)
- $(vopt_if fftw3 fftw-devel)
- $(vopt_if graphicsmagick libgraphicsmagick-devel)
- $(vopt_if gui 'qt5-devel qt5-plugin-sqlite qscintilla-qt5-devel qt5-tools-devel')
- $(vopt_if hdf5 hdf5-devel)
- $(vopt_if imagemagick libmagick-devel)
- $(vopt_if opengl "glu-devel fltk-devel fontconfig-devel freetype-devel gl2ps-devel")
- $(vopt_if openmp libgomp-devel)
- $(vopt_if qhull libqhull-devel)
- $(vopt_if zlib zlib-devel)"
-
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;
 	ppc*) broken="fails to configure";;