blob: 5e331d4ac0d2dd4847d6cc0c98a90beb5699a51f (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
|
Hunk 1: Fix detection of fox libs.
Hunk 2: Avoid linking to unneeded Qt components (yet again) which were re-added
in 5.12.1, and re-add widgets which was removed for some reason. This
only needs core, gui, and widgets.
Use pkgconf to define QT_LIBS. The other method produces the full path
to the libraries which libtool seems to discard.
--- configure.orig 2025-07-06 17:51:09 UTC
+++ configure
@@ -24831,7 +24831,7 @@ then :
# Check whether --with-fox-libs was given.
if test ${with_fox_libs+y}
then :
- withval=$with_fox_libs; fox_libs="$withval"
+ withval=$with_fox_libs; local_fox_libs="$withval"
else $as_nop
ac_ext=cpp
@@ -26583,42 +26583,20 @@ 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
EOF
$QMAKE $am_have_qt_pro -o $am_have_qt_makefile
QT_CXXFLAGS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile CXXFLAGS INCPATH`
- QT_LIBS=`cd $am_have_qt_dir; make -s -f $am_have_qt_makefile LIBS`
+ if test "$ver" ">" "Qt version 5"; then
+ QT_LIBS=`pkgconf --libs Qt6Widgets opengl`
+ else
+ QT_LIBS=`pkgconf --libs Qt5Widgets gl`
+ fi
rm $am_have_qt_pro $am_have_qt_stash $am_have_qt_makefile
rmdir $am_have_qt_dir
|
