Mercurial > mxe-octave
changeset 7140:414e3f556594
gnuplot: Adapt patch for newer versions of Qt6.
* src/gnuplot-3-qt6-native.patch: In newer versions of Qt6, the Qt6Widgets
module is no longer pulled in as a dependency by the other used modules. Add
Qt6Widgets explicitly to the list of required modules.
| author | Markus Mützel <markus.muetzel@gmx.de> |
|---|---|
| date | Fri, 29 Mar 2024 13:56:03 +0100 |
| parents | 2f9d66cb522c |
| children | 2aa2d088b2b3 |
| files | src/gnuplot-3-qt6-native.patch |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gnuplot-3-qt6-native.patch Fri Mar 29 12:22:59 2024 +0100 +++ b/src/gnuplot-3-qt6-native.patch Fri Mar 29 13:56:03 2024 +0100 @@ -16,6 +16,10 @@ ./configure --with-qt=qt4 is still accepted but I no longer have the Qt4 libraries installed to confirm that it works. + + +Adapted by MXE Octave for newer versions of Qt6 which seem to have +a different dependency between modules. --- configure.ac | 53 ++++++++++++++++++++++---------- src/qtterminal/qt_conversion.cpp | 9 ++++++ @@ -43,7 +47,7 @@ if test "x${with_qt}" != "xqt4"; then - PKG_CHECK_MODULES_NOFAIL(QT, [Qt5Core Qt5Gui Qt5Network Qt5Svg Qt5PrintSupport]) + AC_MSG_CHECKING([Checking for Qt6 support libraries]) -+ PKG_CHECK_MODULES_NOFAIL(QT, [Qt6Core Qt6Gui Qt6Network Qt6Svg Qt6PrintSupport Qt6Core5Compat]) ++ PKG_CHECK_MODULES_NOFAIL(QT, [Qt6Core Qt6Gui Qt6Network Qt6Svg Qt6Widgets Qt6PrintSupport Qt6Core5Compat]) if test $pkg_failed = no; then - try_qt4=no - QT5LOC=`$PKG_CONFIG --variable=host_bins Qt5Core`