Skip to content

Commit 9afff9d

Browse files
committed
[RPM] Add qt5-qtbase-private-devel build dep for F30+
qt5-qtbase-devel as been splitted in Fedora 30
1 parent e86c096 commit 9afff9d

File tree

4 files changed

+11
-3
lines changed

4 files changed

+11
-3
lines changed

INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -372,7 +372,7 @@ new subdirectory called `build` or `build-qt5` in it.
372372
3.9.1. Install build dependencies
373373
=================================
374374

375-
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
375+
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
376376

377377
To build QGIS server additional dependencies are required:
378378

doc/INSTALL.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ <H2>3.9. On Fedora Linux</H2>
607607
<H3>3.9.1. Install build dependencies</H3>
608608

609609
<div class="code"><PRE>
610-
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
610+
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
611611
</PRE></div>
612612

613613
<P>

doc/linux.t2t

+1-1
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ new subdirectory called `build` or `build-qt5` in it.
263263
=== Install build dependencies ===
264264

265265
```
266-
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
266+
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
267267
```
268268

269269
To build QGIS server additional dependencies are required:

rpm/qgis.spec.template

+8
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,14 @@ BuildRequires: qtkeychain-qt5-devel
113113
BuildRequires: qt5-qtserialport-devel
114114
BuildRequires: qt5-qt3d-devel
115115

116+
# In F30+ qt5-qtbase-devel has been splitted
117+
# in qt5-qtbase-private-devel and qt5-qtbase-private-devel
118+
# qt5-qtbase-private-devel is neede by
119+
# external/qspatialite/qsql_spatialite.cpp:49:10
120+
%if 0%{?fedora} >= 30
121+
BuildRequires: qt5-qtbase-private-devel
122+
%endif
123+
116124
# Qwt stuff
117125
BuildRequires: qwt-devel
118126
BuildRequires: qwt-qt5-devel

0 commit comments

Comments
 (0)