summaryrefslogtreecommitdiff
path: root/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
diff options
context:
space:
mode:
Diffstat (limited to 'sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch')
-rw-r--r--sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch22
1 files changed, 22 insertions, 0 deletions
diff --git a/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
new file mode 100644
index 000000000000..2b16fbf411e1
--- /dev/null
+++ b/sci-mathematics/octave/files/octave-6.4.0-omit-qtchooser-qtver.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/839285
+--- a/m4/acinclude.m4
++++ b/m4/acinclude.m4
+@@ -2095,9 +2071,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_TOOL], [
+ if test -z "$m4_toupper([$1])_QTVER"; then
+ AC_CHECK_TOOLS(m4_toupper([$1]), [$1])
+ if test -n "$m4_toupper([$1])"; then
+- if test -n "$QTCHOOSER"; then
+- m4_toupper([$1])FLAGS="-qt=$qt_version"
+- fi
+ QT_TOOLS_AVAILABLE="$QT_TOOLS_AVAILABLE $1"
+ else
+ QT_TOOLS_MISSING="$QT_TOOLS_MISSING $1"
+@@ -2167,8 +2167,6 @@ AC_DEFUN([OCTAVE_CHECK_QT_VERSION], [AC_MSG_CHECKING([Qt version $1])
+ QT_TOOLS_MISSING=
+
+ if test $build_qt_gui = yes; then
+- AC_CHECK_TOOLS(QTCHOOSER, [qtchooser])
+-
+ OCTAVE_CHECK_QT_TOOL([moc])
+ OCTAVE_CHECK_QT_TOOL([uic])
+ OCTAVE_CHECK_QT_TOOL([rcc])