bacula/bacula-7.0.3-bat-build.patch

35 lines
1.3 KiB
Diff
Raw Normal View History

2014-05-15 14:02:42 +00:00
diff -Naur bacula-7.0.3.old/src/qt-console/bat.pro.in bacula-7.0.3/src/qt-console/bat.pro.in
--- bacula-7.0.3.old/src/qt-console/bat.pro.in 2014-05-15 15:45:13.750148702 +0200
+++ bacula-7.0.3/src/qt-console/bat.pro.in 2014-05-15 15:49:57.592032881 +0200
2012-09-12 12:21:33 +00:00
@@ -6,13 +6,13 @@
#
# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
#
-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
2014-05-15 14:02:42 +00:00
diff -Naur bacula-7.0.3.old/src/qt-console/main.cpp bacula-7.0.3/src/qt-console/main.cpp
--- bacula-7.0.3.old/src/qt-console/main.cpp 2014-05-15 15:45:13.749148713 +0200
+++ bacula-7.0.3/src/qt-console/main.cpp 2014-05-15 15:49:57.593032870 +0200
@@ -28,9 +28,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