summarylogtreecommitdiffstats
path: root/look-for-qt-order.patch
diff options
context:
space:
mode:
authorKrzysztof Kaczmar2021-07-28 13:50:07 +0200
committerKrzysztof Kaczmar2021-07-28 13:50:07 +0200
commit7b3c4904e5eb9a6d19e3366330c277869b45fe62 (patch)
tree4a6f35bec9761a161d2195a1af1e8ce33e9d83ca /look-for-qt-order.patch
parent63cebac2d83304be555efc90376bd767c466e9f2 (diff)
downloadaur-bacula.tar.gz
configure: look for Qt5 before checking for Qt4
Diffstat (limited to 'look-for-qt-order.patch')
-rw-r--r--look-for-qt-order.patch25
1 files changed, 25 insertions, 0 deletions
diff --git a/look-for-qt-order.patch b/look-for-qt-order.patch
new file mode 100644
index 00000000000..7d7b0f9fb93
--- /dev/null
+++ b/look-for-qt-order.patch
@@ -0,0 +1,25 @@
+--- configure.orig 2021-06-03 09:31:55.000000000 +0200
++++ configure 2021-07-28 13:35:21.934743892 +0200
+@@ -21874,17 +21874,17 @@
+
+ BAT_DIR=
+ if test x$support_bat = xyes; then
+- abc=`$PKGCONFIG QtGui`
++ abc=`$PKGCONFIG Qt5Gui`
+ pkg=$?
+ if test $pkg = 0; then
+- BAT_DIR=src/qt-console
++ BAT_DIR="src/qt-console src/qt-console/tray-monitor"
+ else
+- abc=`$PKGCONFIG Qt5Gui`
++ abc=`$PKGCONFIG QtGui`
+ pkg=$?
+ if test $pkg = 0; then
+- BAT_DIR="src/qt-console src/qt-console/tray-monitor"
++ BAT_DIR=src/qt-console
+ else
+- as_fn_error $? "Unable to find either Qt4 or Qt5 installation needed by bat" "$LINENO" 5
++ as_fn_error $? "Unable to find either Qt4 or Qt5 installation needed by bat" "$LINENO" 5
+ fi
+ fi
+ fi