[qgis] 01/03: Disable QtWebKit support, will be removed from Qt4.

[Sebastiaan Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository qgis.

commit 4933139d0471492b4b1292a9a3bab0fb608e4670
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun May 22 15:59:43 2016 +0200

    Disable QtWebKit support, will be removed from Qt4.
---
 debian/changelog                      |  7 +++++++
 debian/control                        |  1 -
 debian/patches/disable-qtwebkit.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 debian/rules                          |  1 +
 5 files changed, 41 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 288e31d..6c9768a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qgis (2.14.3+dfsg-2) UNRELEASED; urgency=medium
+
+  * Disable QtWebKit support, will be removed from Qt4.
+    (closes: #784514)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 22 May 2016 15:54:11 +0200
+
 qgis (2.14.3+dfsg-1) unstable; urgency=medium
 
   * Update symbols for arm64 mips mipsel powerpc ppc64el s390x.
diff --git a/debian/control b/debian/control
index f601ef5..1c4200a 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,6 @@ Build-Depends: bison,
                libqt4-sql-sqlite,
                libqca2-dev,
                libqca2-plugin-ossl,
-               libqtwebkit-dev,
                libqwt-dev,
                libspatialite-dev,
                libsqlite3-dev,
diff --git a/debian/patches/disable-qtwebkit.patch b/debian/patches/disable-qtwebkit.patch
new file mode 100644
index 0000000..4eb05cf
--- /dev/null
+++ b/debian/patches/disable-qtwebkit.patch
@@ -0,0 +1,32 @@
+Description: Only require QTWEBKIT for Qt4 when WITH_QTWEBKIT is true.
+Author: Bas Couwenberg <sebastic at debian.org>
+Bug-Debian: https://bugs.debian.org/784514
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -274,10 +274,12 @@ ELSE()
+   SET(QT_USE_QTNETWORK 1)
+   SET(QT_USE_QTSVG 1)
+   SET(QT_USE_QTSQL 1)
+-  SET(QT_USE_QTWEBKIT 1)
+-  IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
++  IF (WITH_QTWEBKIT)
++    SET(QT_USE_QTWEBKIT 1)
++  ENDIF(WITH_QTWEBKIT)
++  IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR (WITH_QTWEBKIT AND NOT QT_QTWEBKIT_FOUND) OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
+     MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
+-  ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
++  ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR (WITH_QTWEBKIT AND NOT QT_QTWEBKIT_FOUND) OR (WITH_CUSTOM_WIDGETS AND NOT QT_QTDESIGNER_FOUND))
+ 
+   INCLUDE( ${QT_USE_FILE} )
+ 
+--- a/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp
++++ b/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp
+@@ -20,6 +20,7 @@
+ #include <QGridLayout>
+ #include <QFileDialog>
+ #include <QSettings>
++#include <QUrl>
+ 
+ #include "qgsfilterlineedit.h"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 19eb014..0fc69f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ occurred-typo.patch
 number-typo.patch
 qtermwidget-kfreebsd.patch
 qtermwidget-hurd.patch
+disable-qtwebkit.patch
diff --git a/debian/rules b/debian/rules
index 2dc1765..aab3b49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,6 +76,7 @@ CMAKE_OPTS := \
 	-DWITH_INTERNAL_DATEUTIL=FALSE \
 	-DWITH_INTERNAL_PYTZ=FALSE \
 	-DWITH_INTERNAL_YAML=FALSE \
+	-DWITH_QTWEBKIT=FALSE \
 	-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
 	-DQT_DOC_URL=/usr/share/qt4/doc/html/
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qgis.git