summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kaczmar2021-07-28 13:50:07 +0200
committerKrzysztof Kaczmar2021-07-28 13:50:07 +0200
commit7b3c4904e5eb9a6d19e3366330c277869b45fe62 (patch)
tree4a6f35bec9761a161d2195a1af1e8ce33e9d83ca
parent63cebac2d83304be555efc90376bd767c466e9f2 (diff)
downloadaur-7b3c4904e5eb9a6d19e3366330c277869b45fe62.tar.gz
configure: look for Qt5 before checking for Qt4
-rw-r--r--.SRCINFO2
-rw-r--r--01-basename.patch199
-rw-r--r--PKGBUILD3
-rw-r--r--look-for-qt-order.patch25
4 files changed, 28 insertions, 201 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 78e1ce5c179..1e7e568b4ef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = bacula
pkgdesc = Bacula - A Network Backup Tool
pkgver = 11.0.5
- pkgrel = 1
+ pkgrel = 2
url = https://www.bacula.org
install = bacula.install
arch = x86_64
diff --git a/01-basename.patch b/01-basename.patch
deleted file mode 100644
index e2695d564e8..00000000000
--- a/01-basename.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -ru a/bacula-7.2.0/src/console/bconsole.conf.in b/bacula-7.2.0/src/console/bconsole.conf.in
---- a/bacula-7.2.0/src/console/bconsole.conf.in 2015-08-13 09:52:24.000000000 -0400
-+++ b/bacula-7.2.0/src/console/bconsole.conf.in 2015-11-01 17:10:50.385441109 -0500
-@@ -6,7 +6,7 @@
- #
-
- Director {
-- Name = @basename@-dir
-+ Name = __BASENAME__-dir
- DIRport = @dir_port@
- address = @hostname@
- Password = "@dir_password@"
-diff -ru a/bacula-7.2.0/src/dird/bacula-dir.conf.in b/bacula-7.2.0/src/dird/bacula-dir.conf.in
---- a/bacula-7.2.0/src/dird/bacula-dir.conf.in 2015-08-13 09:52:24.000000000 -0400
-+++ b/bacula-7.2.0/src/dird/bacula-dir.conf.in 2015-11-01 17:11:05.367931570 -0500
-@@ -13,7 +13,7 @@
- #
-
- Director { # define myself
-- Name = @basename@-dir
-+ Name = __BASENAME__-dir
- DIRport = @dir_port@ # where we listen for UA connections
- QueryFile = "@scriptdir@/query.sql"
- WorkingDirectory = "@working_dir@"
-@@ -27,7 +27,7 @@
- Name = "DefaultJob"
- Type = Backup
- Level = Incremental
-- Client = @basename@-fd
-+ Client = __BASENAME__-fd
- FileSet = "Full Set"
- Schedule = "WeeklyCycle"
- Storage = File1
-@@ -49,7 +49,7 @@
-
- #Job {
- # Name = "BackupClient2"
--# Client = @basename@2-fd
-+# Client = __BASENAME__2-fd
- # JobDefs = "DefaultJob"
- #}
-
-@@ -87,7 +87,7 @@
- Job {
- Name = "RestoreFiles"
- Type = Restore
-- Client=@basename@-fd
-+ Client=__BASENAME__-fd
- FileSet="Full Set"
- Storage = File1
- Pool = File
-@@ -165,7 +165,7 @@
-
- # Client (File Services) to backup
- Client {
-- Name = @basename@-fd
-+ Name = __BASENAME__-fd
- Address = @hostname@
- FDPort = @fd_port@
- Catalog = MyCatalog
-@@ -180,7 +180,7 @@
- # You should change Name, Address, and Password before using
- #
- #Client {
--# Name = @basename@2-fd
-+# Name = __BASENAME__2-fd
- # Address = @hostname@2
- # FDPort = @fd_port@
- # Catalog = MyCatalog
-@@ -309,7 +309,7 @@
- # Restricted console used by tray-monitor to get the status of the director
- #
- Console {
-- Name = @basename@-mon
-+ Name = __BASENAME__-mon
- Password = "@mon_dir_password@"
- CommandACL = status, .status
- }
-diff -ru a/bacula-7.2.0/src/filed/bacula-fd.conf.in b/bacula-7.2.0/src/filed/bacula-fd.conf.in
---- a/bacula-7.2.0/src/filed/bacula-fd.conf.in 2015-08-13 09:52:24.000000000 -0400
-+++ b/bacula-7.2.0/src/filed/bacula-fd.conf.in 2015-11-01 17:11:11.380926629 -0500
-@@ -15,7 +15,7 @@
- # List Directors who are permitted to contact this File daemon
- #
- Director {
-- Name = @basename@-dir
-+ Name = __BASENAME__-dir
- Password = "@fd_password@"
- }
-
-@@ -24,7 +24,7 @@
- # status of the file daemon
- #
- Director {
-- Name = @basename@-mon
-+ Name = __BASENAME__-mon
- Password = "@mon_fd_password@"
- Monitor = yes
- }
-@@ -33,7 +33,7 @@
- # "Global" File daemon configuration specifications
- #
- FileDaemon { # this is me
-- Name = @basename@-fd
-+ Name = __BASENAME__-fd
- FDport = @fd_port@ # where we listen for the director
- WorkingDirectory = @working_dir@
- Pid Directory = @piddir@
-@@ -44,5 +44,5 @@
- # Send all messages except skipped files back to Director
- Messages {
- Name = Standard
-- director = @basename@-dir = all, !skipped, !restored
-+ director = __BASENAME__-dir = all, !skipped, !restored
- }
-diff -ru a/bacula-7.2.0/src/qt-console/bat.conf.in b/bacula-7.2.0/src/qt-console/bat.conf.in
---- a/bacula-7.2.0/src/qt-console/bat.conf.in 2015-08-13 09:52:24.000000000 -0400
-+++ b/bacula-7.2.0/src/qt-console/bat.conf.in 2015-11-01 17:11:25.040158200 -0500
-@@ -3,7 +3,7 @@
- #
-
- Director {
-- Name = @basename@-dir
-+ Name = __BASENAME__-dir
- DIRport = @dir_port@
- address = @hostname@
- Password = "@dir_password@"
-diff -ru a/bacula-7.2.0/src/qt-console/tray-monitor/tray-monitor.conf.in b/bacula-7.2.0/src/qt-console/tray-monitor/tray-monitor.conf.in
---- a/bacula-7.2.0/src/qt-console/tray-monitor/tray-monitor.conf.in 2015-08-13 09:52:24.000000000 -0400
-+++ b/bacula-7.2.0/src/qt-console/tray-monitor/tray-monitor.conf.in 2015-11-01 17:11:31.926437464 -0500
-@@ -3,27 +3,27 @@
- #
-
- Monitor {
-- Name = @basename@-mon
-+ Name = __BASENAME__-mon
- Password = "@mon_dir_password@" # password for the Directors
- RefreshInterval = 30 seconds
- }
-
- Client {
-- Name = @basename@-fd
-+ Name = __BASENAME__-fd
- Address = @hostname@
- FDPort = @fd_port@
- Password = "@mon_fd_password@" # password for FileDaemon
- }
-
- Storage {
-- Name = @basename@-sd
-+ Name = __BASENAME__-sd
- Address = @hostname@
- SDPort = @sd_port@
- Password = "@mon_sd_password@" # password for StorageDaemon
- }
-
- Director {
-- Name = @basename@-dir
-+ Name = __BASENAME__-dir
- DIRport = @dir_port@
- address = @hostname@
- }
-diff -ru a/bacula-7.2.0/src/stored/bacula-sd.conf.in b/bacula-7.2.0/src/stored/bacula-sd.conf.in
---- a/bacula-7.2.0/src/stored/bacula-sd.conf.in 2015-08-13 09:52:24.000000000 -0400
-+++ b/bacula-7.2.0/src/stored/bacula-sd.conf.in 2015-11-01 17:11:38.186085314 -0500
-@@ -15,7 +15,7 @@
- #
-
- Storage { # definition of myself
-- Name = @basename@-sd
-+ Name = __BASENAME__-sd
- SDPort = @sd_port@ # Director's port
- WorkingDirectory = "@working_dir@"
- Pid Directory = "@piddir@"
-@@ -26,7 +26,7 @@
- # List Directors who are permitted to contact Storage daemon
- #
- Director {
-- Name = @basename@-dir
-+ Name = __BASENAME__-dir
- Password = "@sd_password@"
- }
-
-@@ -35,7 +35,7 @@
- # status of the storage daemon
- #
- Director {
-- Name = @basename@-mon
-+ Name = __BASENAME__-mon
- Password = "@mon_sd_password@"
- Monitor = yes
- }
-@@ -284,5 +284,5 @@
- #
- Messages {
- Name = Standard
-- director = @basename@-dir = all
-+ director = __BASENAME__-dir = all
- }
diff --git a/PKGBUILD b/PKGBUILD
index 5f6dfcd293c..ee1e8d05da0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,7 +16,7 @@ pkgname=("${pkgbase}-common"
"${_dir_backends[@]}"
"${pkgbase}-dir-mysql")
pkgver=11.0.5
-pkgrel=1
+pkgrel=2
arch=(x86_64)
pkgdesc="${pkgbase^} - A Network Backup Tool "
url="https://www.${pkgbase}.org"
@@ -41,6 +41,7 @@ _workdir="/var/lib/${pkgbase}"
build() {
cd "${srcdir}/${pkgbase}-${pkgver}"
+ patch -i ../../look-for-qt-order.patch
./configure \
--enable-bat \
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