[SCM] qtwebengine packaging branch, master, updated. 367d03aa5b7bcfa33766ced50269609a2171eb15

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 423f6a07ba6d1dbea585b5909704ad788774279b
Author: Sandro Knauß <sknauss at kde.org>
Date:   Thu Jul 28 16:14:06 2016 +0200

    Use debian versions of zlib, ffmpeg and icu
---
 debian/control | 10 ++++++++++
 debian/rules   |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 8339f21..fe08596 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,14 @@ Build-Depends: bison,
                flex,
                gperf,
                khronos-api,
+               libasound2-dev,
+               libavcodec-dev,
+               libavformat-dev,
+               libavutil-dev,
                libcap-dev,
                libdbus-1-dev,
                libegl1-mesa-dev,
+               libevent-dev,
                libfontconfig1-dev,
                libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
                libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
@@ -24,6 +29,9 @@ Build-Depends: bison,
                libharfbuzz-dev,
                libicu-dev,
                libjpeg-dev,
+               libjsoncpp-dev,
+               libnss3-dev,
+               libopus-dev,
                libpci-dev,
                libpng-dev,
                libpulse-dev,
@@ -32,6 +40,8 @@ Build-Depends: bison,
                libqt5xmlpatterns5-dev (>= 5.6.0~),
                libsnappy-dev,
                libsqlite3-dev,
+               libsrtp-dev,
+               libvpx-dev,
                libwebp-dev,
                libxcomposite-dev,
                libxcursor-dev,
diff --git a/debian/rules b/debian/rules
index 756f495..27a9b59 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
+	qmake  WEBENGINE_CONFIG+="use_system_icu use_system_ffmpeg use_system_zlib"
 
 # Enable gstabs debugging symbols only on gstab_architectures.
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))
@@ -52,7 +52,7 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_pch_architectur
 endif
 
 	# Run qmake again now with the proper values.
-	qmake
+	qmake  WEBENGINE_CONFIG+="use_system_icu use_system_ffmpeg use_system_zlib"
 
 	# Upstream 5.6.0 RC tarball was generated improperly and has no synced headers
 	/usr/lib/$(DEB_HOST_MULTIARCH)/qt5/bin/syncqt.pl Source -version $(upstream_version)

-- 
qtwebengine packaging