Skip to content

Commit f6abdd5

Browse files
authoredOct 27, 2017
Merge pull request #5471 from daniviga/rpm-3d
libqgis_3d.so missing in rpm spec
2 parents 89f6282 + a625e73 commit f6abdd5

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed
 

‎doc/INSTALL.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ <H2>3.9. On Fedora Linux</H2>
596596
<H3>3.9.1. Install build dependencies</H3>
597597

598598
<div class="code"><PRE>
599-
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-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 qt5-qtxmlpatterns-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
599+
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel 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 qt5-qtxmlpatterns-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
600600
</PRE></div>
601601

602602
<P>

‎doc/linux.t2t

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -257,7 +257,7 @@ new subdirectory called `build` or `build-qt5` in it.
257257
=== Install build dependencies ===
258258

259259
```
260-
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel qca-qt5-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 qt5-qtxmlpatterns-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
260+
dnf install qt5-qtwebkit-devel qt5-qtlocation-devel qt5-qttools-static qt5-qtscript-devel 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 qt5-qtxmlpatterns-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
261261
```
262262

263263
To build QGIS server additional dependencies are required:

‎rpm/qgis.spec.template

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
# is pushed to stable
1919
%if 0%{?fedora} > 26
2020
%global configure_with_3d -D WITH_3D:BOOL=TRUE
21-
BuildRequires: qt5-qt3d-devel
21+
%global build_with_3d 1
22+
%else
23+
%global configure_with_3d -D WITH_3D:BOOL=FALSE
24+
%global build_with_3d 0
2225
%endif
2326

2427
Name: qgis
@@ -105,6 +108,9 @@ BuildRequires: qt5-qtwebkit-devel
105108
BuildRequires: qt5-qtxmlpatterns-devel
106109
BuildRequires: qtkeychain-qt5-devel
107110
BuildRequires: qextserialport-devel
111+
%if 0%{?build_with_3d}
112+
BuildRequires: qt5-qt3d-devel
113+
%endif
108114

109115
# Qwt stuff
110116
BuildRequires: qwt-devel
@@ -330,6 +336,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
330336
%{_libdir}/lib%{name}_analysis.so.*
331337
%{_libdir}/lib%{name}_core.so.*
332338
%{_libdir}/lib%{name}_gui.so.*
339+
%if 0%{?build_with_3d}
340+
%{_libdir}/lib%{name}_3d.so.*
341+
%endif
333342
%{_libdir}/%{name}/
334343
%{_qt5_prefix}/plugins/sqldrivers/libqsqlspatialite.so
335344
%{_bindir}/%{name}

0 commit comments

Comments
 (0)
Please sign in to comment.