[qgis] 01/01: Disable use of QtWebKit. (closes: #882663)

[Bas Couwenberg]

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

sebastic pushed a commit to branch experimental
in repository qgis.

commit 29d57853cbf171d8e37daf28bb92a6b06fbe65ce
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Nov 25 20:10:46 2017 +0100

    Disable use of QtWebKit. (closes: #882663)
---
 debian/changelog | 2 ++
 debian/control   | 2 +-
 debian/rules     | 6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5123e27..6112d36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qgis (2.14.20+dfsg-2~exp3) UNRELEASED; urgency=medium
 
   * Strip trailing whitespace from control file.
+  * Disable use of QtWebKit.
+    (closes: #882663)
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 21 Nov 2017 10:08:49 +0100
 
diff --git a/debian/control b/debian/control
index f5a926a..f21976e 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Build-Depends: bison,
                libqca2-dev,
                libqca2-plugin-ossl,
                libqscintilla2-dev,
-               libqtwebkit-dev,
+#               libqtwebkit-dev,
                libqwt-dev,
                libspatialite-dev,
                libsqlite3-dev,
diff --git a/debian/rules b/debian/rules
index 20313aa..ba1a615 100755
--- a/debian/rules
+++ b/debian/rules
@@ -113,7 +113,11 @@ ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
 	CMAKE_OPTS += -DPOSTGRES_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpq.so
 endif
 
-ifneq (,$(findstring $(DISTRIBUTION),"sid stretch"))
+ifneq (,$(findstring $(DISTRIBUTION),"sid"))
+	CMAKE_OPTS += -DWITH_QTWEBKIT=FALSE
+endif
+
+ifneq (,$(findstring $(DISTRIBUTION),"stretch"))
 	CMAKE_OPTS += -DWITH_INTERNAL_WEBKIT_BINDINGS=TRUE
 endif
 

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