From 0b35ccefa982c2933a0f4c153ea0a83713537022 Mon Sep 17 00:00:00 2001
From: Nyall Dawson <nyall.dawson@gmail.com>
Date: Tue, 25 Oct 2016 12:14:22 +1000
Subject: [PATCH] Update qt5 build instructions for Fedora

---
 INSTALL          | 23 ++++++++++++++++-------
 doc/INSTALL.html | 27 +++++++++++++++------------
 doc/linux.t2t    | 11 +++++++++--
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/INSTALL b/INSTALL
index bd0dfed63cf..fa9bfd41aa6 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,11 +1,9 @@
 QGIS
 Building QGIS from source - step by step
-Monday October 17, 2016
-
-
-Last Updated: Monday October 17, 2016
-Last Change : Monday October 17, 2016
+Tuesday October 25, 2016
 
+Last Updated: Tuesday October 25, 2016
+Last Change : Monday October 24, 2016
 
   1. Introduction
   2. Overview
@@ -370,12 +368,21 @@ new subdirectory called `build` or `build-qt5` in it.
     3.11.1. Install build dependencies
     ==================================
 
+
   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-devel gsl-devel postgresql-devel
+  qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
+  python3-psycopg2 python3-PyYAML qca-qt5-ossl
+
+
+To build QGIS server additional dependencies are required:
+
+
+  dnf install fcgi-devel
+
 
 Make sure that your build directory is completely empty when you enter the
 following command. Do never try to "re-use" an existing Qt4 build directory.
@@ -383,7 +390,9 @@ If you want to use `ccmake` or other interactive tools, run the following
 command in the empty build directory once before starting to use the interactive
 tools.
 
-  cmake -DENABLE_QT5=ON -DWITH_QWTPOLAR=OFF ..
+
+  cmake ..
+
 
 If everything went ok you can finally start to compile. (As usual append a -jX
 where X is the number of available cores option to make to speed up your build
diff --git a/doc/INSTALL.html b/doc/INSTALL.html
index 399e5378fb0..703775adb3f 100644
--- a/doc/INSTALL.html
+++ b/doc/INSTALL.html
@@ -77,13 +77,13 @@ label{  background-color: #FFFFCC;
 <DIV CLASS="header" ID="header">
 <H1>QGIS</H1>
 <H2>Building QGIS from source - step by step</H2>
-<H3>Monday October 17, 2016</H3>
+<H3>Tuesday October 25, 2016</H3>
 </DIV>
 
 <DIV CLASS="body" ID="body">
 <P>
-Last Updated: Monday October 17, 2016
-Last Change : Monday October 17, 2016
+Last Updated: Tuesday October 25, 2016
+Last Change : Monday October 24, 2016
 </P>
 <DIV CLASS="toc">
 
@@ -563,38 +563,41 @@ If you want to use `ccmake` or other interactive tools, run the following
 command in the empty build directory once before starting to use the
 interactive tools.
 </P>
-
 <div class="code"><PRE>
 cmake
 </PRE></div>
-
+<P></P>
 <P>
 If everything went ok you can finally start to compile. (As usual append a -jX where X is the number of available cores option to make to speed up your build process)
 </P>
-
 <div class="code"><PRE>
 make
 </PRE></div>
-
+<P></P>
 <A NAME="toc14"></A>
 <H2>3.11. On Fedora Linux</H2>
-
 <P>
 We assume that you have the source code of QGIS ready and created a
 new subdirectory called `build` or `build-qt5` in it.
 </P>
-
 <H3>3.11.1. Install build dependencies</H3>
-
 <div class="code"><PRE>
 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-devel gsl-devel postgresql-devel
+qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
+python3-psycopg2 python3-PyYAML qca-qt5-ossl
 </PRE></div>
-
+<P></P>
+<P>
+To build QGIS server additional dependencies are required:
+</P>
+<div class="code"><PRE>
+dnf install fcgi-devel
+</PRE></div>
+<P></P>
 <P>
 Make sure that your build directory is completely empty when you enter the
 following command. Do never try to "re-use" an existing Qt4 build directory.
diff --git a/doc/linux.t2t b/doc/linux.t2t
index 0ff0db24d0f..c4443c4e107 100644
--- a/doc/linux.t2t
+++ b/doc/linux.t2t
@@ -254,7 +254,14 @@ 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-devel gsl-devel postgresql-devel
+qwt-qt5-devel gsl-devel postgresql-devel cmake python3-future gdal-python3
+python3-psycopg2 python3-PyYAML qca-qt5-ossl
+```
+
+To build QGIS server additional dependencies are required:
+
+```
+dnf install fcgi-devel
 ```
 
 Make sure that your build directory is completely empty when you enter the
@@ -264,7 +271,7 @@ command in the empty build directory once before starting to use the interactive
 tools.
 
 ```
-cmake -DENABLE_QT5=ON -DWITH_QWTPOLAR=OFF ..
+cmake ..
 ```
 
 If everything went ok you can finally start to compile. (As usual append a -jX