f73cc9307c
* 0001-Fix-name-of-output-variable.patch * 0002-Support-building-for-Qt6.patch * 0003-Adjusted-expression-to-work-correclty-using-Qt5-and-.patch * 0004-Add-missing-files-to-AC_CONFIG_FILES.patch * 0005-Prevent-configuration-for-Qt5-and-Qt6-at-the-same-ti.patch * 0006-Improve-configuration-on-systems-with-Qt5-and-Qt6-in.patch * 0007-Remove-debug-output.patch - Spec cleanup - Add patch: * gwenhywfar-gcc15.patch OBS-URL: https://build.opensuse.org/package/show/Office/gwenhywfar?expand=0&rev=59
26 lines
752 B
Diff
26 lines
752 B
Diff
From 77db6dc15d60f18bcf8ca934ee698db028264518 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Baumgart <thb@net-bembel.de>
|
|
Date: Thu, 19 Jun 2025 09:07:36 +0200
|
|
Subject: [PATCH 3/7] Adjusted expression to work correclty using Qt5 and Qt6
|
|
|
|
---
|
|
m4/ax_have_qt.m4 | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/m4/ax_have_qt.m4 b/m4/ax_have_qt.m4
|
|
index 88075fa..51bb0d2 100644
|
|
--- a/m4/ax_have_qt.m4
|
|
+++ b/m4/ax_have_qt.m4
|
|
@@ -137,7 +137,7 @@ EOF
|
|
rmdir $am_have_qt_dir
|
|
|
|
ver=`$QTPATHS --version | cut -d' ' -f 2`
|
|
- if test "$ver" '>' "1"; then
|
|
+ if test "$ver" = "2.0"; then
|
|
QT_MAJOR_VERSION="6"
|
|
# Add QT_HOST_BINS and QT_HOST_LIBEXECS paths to PATH
|
|
for var in QT_HOST_BINS QT_HOST_LIBEXECS; do
|
|
--
|
|
2.50.0
|
|
|