[packages/gwenhywfar] - don't try to use all available qt modules (and some unavailable in case of some qt6 mispackaging)
qboosh
qboosh at pld-linux.org
Sat Apr 18 11:23:57 CEST 2026
commit 745311e35c1c3bfa4223e07c9b20ad4f4bc1c57b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat Apr 18 11:24:30 2026 +0200
- don't try to use all available qt modules (and some unavailable in case of some qt6 mispackaging)
gwenhywfar-qt5.patch | 53 ++++++++++++++++++++++++++++++++++++++++++++++------
1 file changed, 47 insertions(+), 6 deletions(-)
---
diff --git a/gwenhywfar-qt5.patch b/gwenhywfar-qt5.patch
index bc92039..9bc236e 100644
--- a/gwenhywfar-qt5.patch
+++ b/gwenhywfar-qt5.patch
@@ -1,6 +1,6 @@
--- gwenhywfar-5.14.1/m4/ax_have_qt.m4.orig 2025-07-06 19:48:38.000000000 +0200
+++ gwenhywfar-5.14.1/m4/ax_have_qt.m4 2026-04-16 20:51:16.295981068 +0200
-@@ -80,10 +80,14 @@ AC_DEFUN([AX_HAVE_QT],
+@@ -80,9 +80,9 @@ AC_DEFUN([AX_HAVE_QT],
AC_MSG_CHECKING(for Qt)
am_have_qt_qmexe_suff=`echo $QMAKE | sed 's,^.*qmake,,'`
# If we have Qt5 or later in the path, we're golden
@@ -9,14 +9,55 @@
- if test "$ver" ">" "Qt version 4"; then
+ if test "$ver" -gt 4; then
-+ if test "$ver" -gt 5; then
-+ QT_MAJOR_VERSION="6"
-+ else
QT_MAJOR_VERSION="5"
-+ fi
have_qt=yes
# This pro file dumps qmake's variables, but it only works on Qt 5 or later
- am_have_qt_dir=`mktemp -d`
+@@ -96,35 +96,9 @@ win32 {
+ CONFIG -= debug_and_release
+ CONFIG += release
+ }
+-qtHaveModule(axcontainer): QT += axcontainer
+-qtHaveModule(axserver): QT += axserver
+-qtHaveModule(concurrent): QT += concurrent
+ qtHaveModule(core): QT += core
+-qtHaveModule(dbus): QT += dbus
+-qtHaveModule(declarative): QT += declarative
+-qtHaveModule(designer): QT += designer
+ qtHaveModule(gui): QT += gui
+-qtHaveModule(help): QT += help
+-qtHaveModule(multimedia): QT += multimedia
+-qtHaveModule(multimediawidgets): QT += multimediawidgets
+-qtHaveModule(network): QT += network
+-qtHaveModule(opengl): QT += opengl
+-qtHaveModule(printsupport): QT += printsupport
+-qtHaveModule(qml): QT += qml
+-qtHaveModule(qmltest): QT += qmltest
+-qtHaveModule(x11extras): QT += x11extras
+-qtHaveModule(script): QT += script
+-qtHaveModule(scripttools): QT += scripttools
+-qtHaveModule(sensors): QT += sensors
+-qtHaveModule(serialport): QT += serialport
+-qtHaveModule(sql): QT += sql
+-qtHaveModule(svg): QT += svg
+-qtHaveModule(testlib): QT += testlib
+-qtHaveModule(uitools): QT += uitools
+-qtHaveModule(webkit): QT += webkit
+-qtHaveModule(webkitwidgets): QT += webkitwidgets
+-qtHaveModule(xml): QT += xml
+-qtHaveModule(xmlpatterns): QT += xmlpatterns
++qtHaveModule(widgets): QT += widgets
+ percent.target = %
+ percent.commands = @echo -n "\$(\$(@))\ "
+ QMAKE_EXTRA_TARGETS += percent
+@@ -139,7 +113,7 @@ EOF
+ rm $am_have_qt_pro $am_have_qt_stash $am_have_qt_makefile
+ rmdir $am_have_qt_dir
+
+- if test "$ver" ">" "Qt version 5"; then
++ if test "$ver" -gt 5; then
+ QT_MAJOR_VERSION="6"
+ AC_CHECK_TOOLS([QTPATHS],[qtpaths-qt6 qtpaths6 qtpaths],[false])
+ else
--- gwenhywfar-5.14.1/gui/qt5/Makefile.am.orig 2026-04-16 21:31:24.532934528 +0200
+++ gwenhywfar-5.14.1/gui/qt5/Makefile.am 2026-04-16 21:31:49.336133490 +0200
@@ -29,7 +29,7 @@ nodist_libgwengui_qt at QT_MAJOR_VERSION@_l
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gwenhywfar.git/commitdiff/745311e35c1c3bfa4223e07c9b20ad4f4bc1c57b
More information about the pld-cvs-commit
mailing list