bacula/bacula-7.4.0-bat-build.patch

35 lines
1.3 KiB
Diff
Raw Normal View History

2016-01-25 20:12:28 +00:00
diff -Naur bacula-7.4.0.old/src/qt-console/bat.pro.in bacula-7.4.0/src/qt-console/bat.pro.in
--- bacula-7.4.0.old/src/qt-console/bat.pro.in 2016-01-25 21:00:14.022670354 +0100
+++ bacula-7.4.0/src/qt-console/bat.pro.in 2016-01-25 21:04:26.092297488 +0100
2012-09-12 12:21:33 +00:00
@@ -6,13 +6,13 @@
#
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
2015-09-29 09:16:35 +00:00
#
2012-09-12 12:21:33 +00:00
-CONFIG += qt debug @QWT@
+CONFIG += qt release @QWT@
bins.path = /$(DESTDIR)@sbindir@
bins.files = bat
confs.path = /$(DESTDIR)@sysconfdir@
confs.commands = ./install_conf_file
-help.path = /$(DESTDIR)@docdir@
+help.path = /$(DESTDIR)@htmldir@
help.files = help/*.html images/status.png images/mail-message-new.png
TEMPLATE = app
2016-01-25 20:12:28 +00:00
diff -Naur bacula-7.4.0.old/src/qt-console/main.cpp bacula-7.4.0/src/qt-console/main.cpp
--- bacula-7.4.0.old/src/qt-console/main.cpp 2016-01-25 21:00:14.023670369 +0100
+++ bacula-7.4.0/src/qt-console/main.cpp 2016-01-25 21:04:26.093297507 +0100
@@ -31,9 +31,9 @@
2012-09-12 12:21:33 +00:00
/*
2013-02-20 08:55:41 +00:00
* We need Qt version 4.8.4 or later to be able to comple correctly
2012-09-12 12:21:33 +00:00
*/
2013-02-20 08:55:41 +00:00
-#if QT_VERSION < 0x040804
2012-09-12 12:21:33 +00:00
+#if QT_VERSION < 0x040602
#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
2013-02-20 08:55:41 +00:00
-#error "You need Qt version 4.8.4 or later to build Bat"
2012-09-12 12:21:33 +00:00
+#error "You need Qt version 4.6.2 or later to build Bat"
#error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
#endif