[qgis] 03/06: Re-enable QtWebKit support, still available in Qt4 for jessie.

Bas Couwenberg sebastic at debian.org
Sun Jul 24 23:37:26 UTC 2016


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

sebastic pushed a commit to branch jessie-backports
in repository qgis.

commit 9b6943c2cff86cda7b6f8e3a4621772c73f8502c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 24 16:44:07 2016 +0200

    Re-enable QtWebKit support, still available in Qt4 for jessie.
---
 debian/changelog | 1 +
 debian/control   | 1 +
 debian/rules     | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5cbd523..9c5d0f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qgis (2.14.4+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 
   * Rebuild for jessie-backports.
   * Re-enable globe plugin, still supports osgEarth 2.5 in jessie.
+  * Re-enable QtWebKit support, still available in Qt4 for jessie.
 
  -- Bas Couwenberg <sebastic at debian.org>  Sun, 24 Jul 2016 16:41:17 +0200
 
diff --git a/debian/control b/debian/control
index 994bbe3..8e83c84 100644
--- a/debian/control
+++ b/debian/control
@@ -26,6 +26,7 @@ Build-Depends: bison,
                libqca2-dev,
                libqca2-plugin-ossl,
                libqscintilla2-dev,
+               libqtwebkit-dev,
                libqwt-dev,
                libspatialite-dev,
                libsqlite3-dev,
diff --git a/debian/rules b/debian/rules
index df97813..98f9ced 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,7 +76,7 @@ CMAKE_OPTS := \
 	-DWITH_INTERNAL_DATEUTIL=FALSE \
 	-DWITH_INTERNAL_PYTZ=FALSE \
 	-DWITH_INTERNAL_YAML=FALSE \
-	-DWITH_QTWEBKIT=FALSE \
+	-DWITH_QTWEBKIT=TRUE \
 	-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



More information about the Pkg-grass-devel mailing list