Skip to content

Commit 98a8bc1

Browse files
committed
INSTALL: use meta package to install osgeo4w build dependencies
1 parent ad21d37 commit 98a8bc1

File tree

3 files changed

+12
-98
lines changed

3 files changed

+12
-98
lines changed

INSTALL

+5-33
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
QGIS
22
Building QGIS from source - step by step
3-
Thursday November 02, 2017
3+
Friday February 02, 2018
44

55

6-
Last Updated: Thursday November 02, 2017
7-
Last Change : Thursday November 02, 2017
6+
Last Updated: Friday February 02, 2018
7+
Last Change : Friday February 02, 2018
88

99

1010
1. Introduction
@@ -100,7 +100,7 @@ Required build dependencies:
100100
- Proj >= 4.4.x
101101
- GEOS >= 3.4
102102
- Sqlite3 >= 3.0.0
103-
- SpatiaLite
103+
- SpatiaLite >= 4.2.0
104104
- libspatialindex
105105
- GDAL/OGR >= 2.1
106106
- Qwt >= 5.0 & (< 6.1 with internal QwtPolar)
@@ -456,35 +456,7 @@ For the QGIS build you need to install following packages from cygwin:
456456

457457
and from OSGeo4W (select Advanced Installation):
458458

459-
- expat
460-
- fcgi
461-
- gdal
462-
- grass
463-
- gsl-devel
464-
- iconv
465-
- libzip-devel
466-
- libspatialindex-devel
467-
- pyqt5
468-
- python3-devel
469-
- python3-qscintilla
470-
- python3-nose2
471-
- python3-future
472-
- python3-pyyaml
473-
- python3-mock
474-
- python3-six
475-
- qca-qt5-devel
476-
- qca-qt5-libs
477-
- qscintilla-qt5
478-
- qt5-devel
479-
- qt5-libs-debug
480-
- qtwebkit-qt5-devel
481-
- qtwebkit-qt5-libs-debug
482-
- qwt-devel-qt5
483-
- sip-qt5
484-
- spatialite
485-
- oci
486-
- qtkeychain
487-
- libzip
459+
- qgis-dev-deps
488460

489461
This will also select packages the above packages depend on.
490462

doc/INSTALL.html

+6-34
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@
7777
<DIV CLASS="header" ID="header">
7878
<H1>QGIS</H1>
7979
<H2>Building QGIS from source - step by step</H2>
80-
<H3>Thursday November 02, 2017</H3>
80+
<H3>Friday February 02, 2018</H3>
8181
</DIV>
8282

8383
<DIV CLASS="body" ID="body">
8484
<P>
85-
Last Updated: Thursday November 02, 2017
86-
Last Change : Thursday November 02, 2017
85+
Last Updated: Friday February 02, 2018
86+
Last Change : Friday February 02, 2018
8787
</P>
8888
<DIV CLASS="toc">
8989

@@ -206,7 +206,7 @@ <H1>2. Overview</H1>
206206
<LI>Proj &gt;= 4.4.x
207207
<LI>GEOS &gt;= 3.4
208208
<LI>Sqlite3 &gt;= 3.0.0
209-
<LI>SpatiaLite
209+
<LI>SpatiaLite &gt;= 4.2.0
210210
<LI>libspatialindex
211211
<LI>GDAL/OGR &gt;= 2.1
212212
<LI>Qwt &gt;= 5.0 &amp; (&lt; 6.1 with internal QwtPolar)
@@ -741,35 +741,7 @@ <H3>4.1.2. Other tools and dependencies</H3>
741741
</P>
742742

743743
<UL>
744-
<LI>expat
745-
<LI>fcgi
746-
<LI>gdal
747-
<LI>grass
748-
<LI>gsl-devel
749-
<LI>iconv
750-
<LI>libzip-devel
751-
<LI>libspatialindex-devel
752-
<LI>pyqt5
753-
<LI>python3-devel
754-
<LI>python3-qscintilla
755-
<LI>python3-nose2
756-
<LI>python3-future
757-
<LI>python3-pyyaml
758-
<LI>python3-mock
759-
<LI>python3-six
760-
<LI>qca-qt5-devel
761-
<LI>qca-qt5-libs
762-
<LI>qscintilla-qt5
763-
<LI>qt5-devel
764-
<LI>qt5-libs-debug
765-
<LI>qtwebkit-qt5-devel
766-
<LI>qtwebkit-qt5-libs-debug
767-
<LI>qwt-devel-qt5
768-
<LI>sip-qt5
769-
<LI>spatialite
770-
<LI>oci
771-
<LI>qtkeychain
772-
<LI>libzip
744+
<LI>qgis-dev-deps
773745
</UL>
774746

775747
<P>
@@ -3065,5 +3037,5 @@ <H1>9. Authors and Acknowledgments</H1>
30653037

30663038
</DIV>
30673039
<!-- html code generated by txt2tags 2.6 (http://txt2tags.org) -->
3068-
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build-master-qt5/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
3040+
<!-- cmdline: txt2tags -\-encoding=utf-8 -o/home/fischer/src/qgis/debian/build-master-release/doc/INSTALL.html -t html /home/fischer/src/qgis/doc/INSTALL.t2t -->
30693041
</BODY></HTML>

doc/msvc.t2t

+1-31
Original file line numberDiff line numberDiff line change
@@ -36,39 +36,9 @@ For the QGIS build you need to install following packages from cygwin:
3636

3737
and from OSGeo4W (select //Advanced Installation//):
3838

39-
- expat
40-
- fcgi
41-
- gdal
42-
- grass
43-
- gsl-devel
44-
- iconv
45-
- libzip-devel
46-
- libspatialindex-devel
47-
- pyqt5
48-
- python3-devel
49-
- python3-qscintilla
50-
- python3-nose2
51-
- python3-future
52-
- python3-pyyaml
53-
- python3-mock
54-
- python3-six
55-
- qca-qt5-devel
56-
- qca-qt5-libs
57-
- qscintilla-qt5
58-
- qt5-devel
59-
- qt5-libs-debug
60-
- qtwebkit-qt5-devel
61-
- qtwebkit-qt5-libs-debug
62-
- qwt-devel-qt5
63-
- sip-qt5
64-
- spatialite
65-
- oci
66-
- qtkeychain
67-
- libzip
39+
- qgis-dev-deps
6840
-
6941

70-
71-
7242
This will also select packages the above packages depend on.
7343

7444
If you install other packages, this might cause issues. Particularly, make sure

0 commit comments

Comments
 (0)