From db91e295ccecc0af7d63ad19e2d98e1f7d53c052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniele=20Vigan=C3=B2?= Date: Wed, 8 May 2019 14:15:23 +0000 Subject: [PATCH] [RPM] Add qt5-qtbase-private-devel build dep for F30+ qt5-qtbase-devel as been splitted in Fedora 30 --- INSTALL | 2 +- doc/INSTALL.html | 2 +- doc/linux.t2t | 2 +- rpm/qgis.spec.template | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/INSTALL b/INSTALL index 9fcd71de65e..61f60a36842 100644 --- a/INSTALL +++ b/INSTALL @@ -372,7 +372,7 @@ new subdirectory called `build` or `build-qt5` in it. 3.9.1. Install build dependencies ================================= - dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel exiv2-devel + dnf install qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel exiv2-devel To build QGIS server additional dependencies are required: diff --git a/doc/INSTALL.html b/doc/INSTALL.html index 175d6ee4ac7..80e288e4bac 100644 --- a/doc/INSTALL.html +++ b/doc/INSTALL.html @@ -607,7 +607,7 @@ new subdirectory called `build` or `build-qt5` in it.

3.9.1. Install build dependencies

-dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel exiv2-devel
+dnf install qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel exiv2-devel

diff --git a/doc/linux.t2t b/doc/linux.t2t index 76c1037d595..d7506c089b7 100644 --- a/doc/linux.t2t +++ b/doc/linux.t2t @@ -263,7 +263,7 @@ new subdirectory called `build` or `build-qt5` in it. === Install build dependencies === ``` -dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel exiv2-devel +dnf install qt5-qtbase-private-devel qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qca-qt5-devel qca-qt5-ossl qt5-qt3d-devel python3-qt5-devel python3-qscintilla-qt5-devel qscintilla-qt5-devel python3-qscintilla-devel python3-qscintilla-qt5 clang flex bison geos-devel gdal-devel sqlite-devel libspatialite-devel qt5-qtsvg-devel spatialindex-devel expat-devel proj-devel qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3 python3-psycopg2 python3-PyYAML python3-pygments python3-jinja2 python3-OWSLib qca-qt5-ossl qwt-qt5-devel qtkeychain-qt5-devel qwt-devel sip-devel libzip-devel exiv2-devel ``` To build QGIS server additional dependencies are required: diff --git a/rpm/qgis.spec.template b/rpm/qgis.spec.template index 1041853c5b9..80908d25bda 100644 --- a/rpm/qgis.spec.template +++ b/rpm/qgis.spec.template @@ -113,6 +113,14 @@ BuildRequires: qtkeychain-qt5-devel BuildRequires: qt5-qtserialport-devel BuildRequires: qt5-qt3d-devel +# In F30+ qt5-qtbase-devel has been splitted +# in qt5-qtbase-private-devel and qt5-qtbase-private-devel +# qt5-qtbase-private-devel is neede by +# external/qspatialite/qsql_spatialite.cpp:49:10 +%if 0%{?fedora} >= 30 +BuildRequires: qt5-qtbase-private-devel +%endif + # Qwt stuff BuildRequires: qwt-devel BuildRequires: qwt-qt5-devel