replace qt4 with qt5 in all build files

bareos · Oct 2, 2018 · 89c891a · 89c891a
1 parent 7225e69
commit 89c891a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 22 deletions.
diff --git a/core/debian/control b/core/debian/control
@@ -22,7 +22,7 @@ Build-Depends: acl-dev,
  libacl1-dev,
  libcap-dev [linux-any],
  liblzo2-dev,
- libqt4-dev,
+ libqt5-dev,
  libreadline-dev,
  libssl-dev,
  libwrap0-dev,

diff --git a/core/debian/control.in b/core/debian/control.in
@@ -22,7 +22,7 @@ Build-Depends: acl-dev,
  libacl1-dev,
  libcap-dev [linux-any],
  liblzo2-dev,
- libqt4-dev,
+ libqt5-dev,
  libreadline-dev,
  libssl-dev,
  libwrap0-dev,

diff --git a/core/platforms/packaging/bareos-Univention_4.0.dsc b/core/platforms/packaging/bareos-Univention_4.0.dsc
@@ -6,7 +6,7 @@ Version: 0.0.0
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.9.4
-Build-Depends: acl-dev, bc, chrpath, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, ucslint, univention-config-dev, wget, zlib1g-dev, postgresql-server-dev-all, cmake
+Build-Depends: acl-dev, bc, chrpath, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, libqt5-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev (>= 8.4), logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, ucslint, univention-config-dev, wget, zlib1g-dev, postgresql-server-dev-all, cmake
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 DEBTRANSFORM-RELEASE: 1
 Files:
diff --git a/core/platforms/packaging/bareos-Univention_4.2.dsc b/core/platforms/packaging/bareos-Univention_4.2.dsc
@@ -6,7 +6,7 @@ Version: 0.0.0
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.9.4
-Build-Depends: acl-dev, bc, chrpath, dh-systemd, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, init-system-helpers, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev, logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, systemd, ucslint, univention-config-dev, wget, zlib1g-dev, postgresql-server-dev-all, cmake
+Build-Depends: acl-dev, bc, chrpath, dh-systemd, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, init-system-helpers, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, libqt5-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, libmysqlclient-dev, libpq-dev, logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, systemd, ucslint, univention-config-dev, wget, zlib1g-dev, postgresql-server-dev-all, cmake
 Build-Conflicts: python2.2-dev, python2.3, python2.4, qt3-dev-tools
 DEBTRANSFORM-RELEASE: 1
 Files:
diff --git a/core/platforms/packaging/bareos.dsc b/core/platforms/packaging/bareos.dsc
@@ -6,7 +6,7 @@ Version: 0.0.0
 Maintainer: Joerg Steffens <joerg.steffens@bareos.com>
 Homepage: http://www.bareos.org/
 Standards-Version: 3.9.4
-Build-Depends: acl-dev, bc, chrpath, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, libqt4-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, zlib1g-dev, postgresql-server-dev-all, cmake, libpam-dev
+Build-Depends: acl-dev, bc, chrpath, debhelper (>= 7.0.50~), dpkg-dev (>= 1.13.19), git-core, libacl1-dev, libcap-dev, libfastlz-dev, libjansson-dev, liblzo2-dev, libqt5-dev, libreadline-dev, libssl-dev, libwrap0-dev, libx11-dev, libsqlite3-dev, default-libmysqlclient-dev | libmysqlclient-dev, libpq-dev, logrotate, lsb-release, mtx, ncurses-dev, openssl, pkg-config, po-debconf (>= 0.8.2), python-dev, zlib1g-dev, postgresql-server-dev-all, cmake, libpam-dev
 # optional (via OBS project config):
 #   0%{?debian_version} >= 800 || 0%{?ubuntu_version} >= 1404
 #     libcephfs-dev

diff --git a/core/platforms/packaging/bareos.spec b/core/platforms/packaging/bareos.spec
@@ -195,7 +195,7 @@ BuildRequires: libcap-devel
 BuildRequires: mtx
 
 %if 0%{?build_qt_monitor}
-BuildRequires: libqt4-devel
+BuildRequires: libqt5-devel
 %endif
 
 
@@ -707,7 +707,7 @@ if [ "%{?buildroot}" -a "%{?buildroot}" != "/" ]; then
     rm -rf "%{?buildroot}"
 fi
 %if !0%{?suse_version}
-export PATH=$PATH:/usr/lib64/qt4/bin:/usr/lib/qt4/bin
+export PATH=$PATH:/usr/lib64/qt5/bin:/usr/lib/qt5/bin
 %endif
 export MTX=/usr/sbin/mtx
 

diff --git a/core/platforms/win32/winbareos-nsi.spec b/core/platforms/win32/winbareos-nsi.spec
@@ -67,11 +67,8 @@ BuildRequires:  mingw64-libstdc++
 BuildRequires:  mingw32-libwinpthread1
 BuildRequires:  mingw64-libwinpthread1
 
-BuildRequires:  mingw32-libqt4
-BuildRequires:  mingw64-libqt4
-
-#BuildRequires:  mingw32-qt4-debug
-#BuildRequires:  mingw64-qt4-debug
+BuildRequires:  mingw32-libqt5
+BuildRequires:  mingw64-libqt5
 
 BuildRequires:  mingw32-lzo
 BuildRequires:  mingw64-lzo

diff --git a/core/platforms/win32/winbareos32.spec b/core/platforms/win32/winbareos32.spec
@@ -39,9 +39,9 @@ BuildRequires:  %{mingw}-cross-gcc
 BuildRequires:  %{mingw}-cross-gcc-c++
 BuildRequires:  %{mingw}-cross-binutils
 BuildRequires:  %{mingw}-cross-pkg-config
-BuildRequires:  %{mingw}-libqt4
-BuildRequires:  %{mingw}-libqt4-devel
-BuildRequires:  %{mingw}-libqt4-filesystem
+BuildRequires:  %{mingw}-libqt5
+BuildRequires:  %{mingw}-libqt5-devel
+BuildRequires:  %{mingw}-libqt5-filesystem
 BuildRequires:  %{mingw}-libwinpthread1
 BuildRequires:  %{mingw}-winpthreads-devel
 BuildRequires:  %{mingw}-libopenssl-devel
@@ -70,7 +70,7 @@ BuildRequires:  %{mingw}-gtest-devel
 BuildRequires:  %{mingw}-libgtest0
 BuildRequires:  %{mingw}-libjansson
 BuildRequires:  %{mingw}-libjansson-devel
-#BuildRequires:  %%{mingw}-qt4-debug
+#BuildRequires:  %%{mingw}-qt5-debug
 
 BuildRequires:  bc
 BuildRequires:  less
@@ -113,7 +113,7 @@ for flavor in %flavors; do
    WINDOWS_BITS=$(echo %name | grep 64 >/dev/null 2>&1 && echo "64" || echo "32")
    WINDOWS_VERSION=$(echo $flavor | grep release >/dev/null && echo 0x600 || echo 0x500)
    pushd $flavor
-   %{_mingw32_cmake_qt4} \
+   %{_mingw32_cmake_qt5} \
       -DCMAKE_INSTALL_BINDIR:PATH=%{_mingw64_bindir} \
       -Dsqlite3=yes \
       -Dpostgresql=yes \

diff --git a/core/platforms/win32/winbareos64.spec b/core/platforms/win32/winbareos64.spec
@@ -39,9 +39,9 @@ BuildRequires:  %{mingw}-cross-gcc
 BuildRequires:  %{mingw}-cross-gcc-c++
 BuildRequires:  %{mingw}-cross-binutils
 BuildRequires:  %{mingw}-cross-pkg-config
-BuildRequires:  %{mingw}-libqt4
-BuildRequires:  %{mingw}-libqt4-devel
-BuildRequires:  %{mingw}-libqt4-filesystem
+BuildRequires:  %{mingw}-libqt5
+BuildRequires:  %{mingw}-libqt5-devel
+BuildRequires:  %{mingw}-libqt5-filesystem
 BuildRequires:  %{mingw}-libwinpthread1
 BuildRequires:  %{mingw}-winpthreads-devel
 BuildRequires:  %{mingw}-libopenssl-devel
@@ -70,7 +70,7 @@ BuildRequires:  %{mingw}-gtest-devel
 BuildRequires:  %{mingw}-libgtest0
 BuildRequires:  %{mingw}-libjansson
 BuildRequires:  %{mingw}-libjansson-devel
-#BuildRequires:  %%{mingw}-qt4-debug
+#BuildRequires:  %%{mingw}-qt5-debug
 
 BuildRequires:  bc
 BuildRequires:  less
@@ -113,7 +113,7 @@ for flavor in %flavors; do
    #WINDOWS_BITS=$(echo %name | grep 64 >/dev/null 2>&1 && echo "64" || echo "32")
    WINDOWS_VERSION=$(echo $flavor | grep release >/dev/null && echo 0x600 || echo 0x500)
    pushd $flavor
-   %{_mingw64_cmake_qt4} \
+   %{_mingw64_cmake_qt5} \
       -DCMAKE_INSTALL_BINDIR:PATH=%{_mingw64_bindir} \
       -Dsqlite3=yes \
       -Dpostgresql=yes \