[SCM] qt5webkit packaging branch, ubuntu, updated. ubuntu/5.6.1+dfsg-4ubuntu1-8-gcd6c2cf

[Dmitry Shachnev]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt5webkit.git;a=commitdiff;h=c900ac0

The following commit has been merged in the ubuntu branch:
commit c900ac03d25b217b14190105634b7953e43b589e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Dec 23 13:06:39 2016 +0300

    Re-enable WebP, it is in main since Trusty (LP: #1652166).
---
 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 d159481..7f0da21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qtwebkit-opensource-src (5.6.1+dfsg-5ubuntu1) UNRELEASED; urgency=medium
 
   * Re-sync with Debian unstable, no changes remaining.
+  * Re-enable WebP, it is in main since Trusty (LP: #1652166).
 
  -- Dmitry Shachnev <mitya57 at ubuntu.com>  Fri, 23 Dec 2016 13:00:54 +0300
 
diff --git a/debian/control b/debian/control
index dab7289..95fceee 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Build-Depends: bison,
                libqt5opengl5-dev (>= 5.6.1+dfsg~),
                libqt5xmlpatterns5-dev (>= 5.6.1~),
                libsqlite3-dev,
+               libwebp-dev,
                libxcomposite-dev,
                libxml2-dev,
                libxrender-dev,
diff --git a/debian/rules b/debian/rules
index c454194..492fe74 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ upstream_version = $(firstword $(subst +, ,$(debian_version)))
 
 override_dh_auto_configure:
 	# Run qmake once to create .qmake.conf and be sure to append the following values.
-	qmake WEBKIT_CONFIG-=use_webp
+	qmake
 
 # Enable gstabs debugging symbols only on gstab_architectures.
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))

-- 
qt5webkit packaging