From 8071117968608a54ff9bcc535eb221c739b18cc5 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Dec 11 2017 08:19:11 +0000 Subject: Update BAT patches for RHEL 7.4 --- diff --git a/bacula-9.0.6-bat-build.patch b/bacula-9.0.6-bat-build.patch index 9c22e76..f9fcd14 100644 --- a/bacula-9.0.6-bat-build.patch +++ b/bacula-9.0.6-bat-build.patch @@ -19,21 +19,3 @@ diff -Naur bacula-9.0.6.old/src/qt-console/bat.pro.in bacula-9.0.6/src/qt-consol help.files = help/*.html images/status.png images/mail-message-new.png datarootdir = @datarootdir@ -diff -Naur bacula-9.0.6.old/src/qt-console/main.cpp bacula-9.0.6/src/qt-console/main.cpp ---- bacula-9.0.6.old/src/qt-console/main.cpp 2017-12-07 15:44:44.742173271 +0100 -+++ bacula-9.0.6/src/qt-console/main.cpp 2017-12-07 15:44:55.119366353 +0100 -@@ -29,11 +29,11 @@ - #include - - /* -- * We need Qt version 4.8.4 or later to be able to comple correctly -+ * We need Qt version 4.6.2 or later to be able to comple correctly - */ --#if QT_VERSION < 0x040804 -+#if QT_VERSION < 0x040602 - #error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" --#error "You need Qt version 4.8.4 or later to build Bat" -+#error "You need Qt version 4.6.2 or later to build Bat" - #error "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!" - #endif -