[SCM] qtwebengine packaging branch, master, updated. 6e131ecfd82abff0a7b5c9b6c002fd2d2f04b43d

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 6e131ecfd82abff0a7b5c9b6c002fd2d2f04b43d
Author: Sandro Knauß <sknauss at kde.org>
Date:   Mon Aug 1 19:26:05 2016 +0200

    use as much from the system as possible.
    
    The part is copied from chromium, I have currently no glue if it really
    works like that.
---
 debian/control |  6 +++++-
 debian/rules   | 26 ++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 7a3c77e..e50655e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,11 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Scarlett Clark <sgclark at kubuntu.org>,
            Sandro Knauß <bugs at sandroknauss.de>,
            Simon Quigley <tsimonq2 at ubuntu.com>
-Build-Depends: bison,
+Build-Depends: autotools-dev,
+               bison,
                chrpath,
                debhelper (>= 9.0.0),
+               dh-autoreconf,
                flex,
                gperf,
                khronos-api,
@@ -29,6 +31,7 @@ Build-Depends: bison,
                libicu-dev,
                libjpeg-dev,
                libjsoncpp-dev,
+               libminizip-dev,
                libnss3-dev,
                libopus-dev,
                libpci-dev,
@@ -40,6 +43,7 @@ Build-Depends: bison,
                libsnappy-dev,
                libsqlite3-dev,
                libsrtp-dev,
+               libv8-dev,
                libvpx-dev,
                libwebp-dev,
                libxcomposite-dev,
diff --git a/debian/rules b/debian/rules
index ba85637..e817432 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,12 +17,34 @@ fulldebug_architectures := none
 disabled_jit_architectures := armel mips mipsel
 disabled_pch_architectures := amd64 powerpc s390x
 
+defines+=use_system_re2=1 \
+         use_system_yasm=1 \
+         use_system_opus=1 \
+         use_system_zlib=1 \
+         use_system_speex=1 \
+         use_system_expat=1 \
+         use_system_libpng=1 \
+         use_system_libxml=1 \
+         use_system_libusb=1 \
+         use_system_libjpeg=1 \
+         use_system_libwebp=1 \
+         use_system_libxslt=1 \
+         use_system_jsoncpp=1 \
+         use_system_libevent=1 \
+         use_system_harfbuzz=1 \
+         use_system_xdg_utils=1 \
+         use_system_icu \
+         use_system_protobuf \
+         use_system_sqlite \
+         use_system_v8 \
+         use_system_ffmpeg \
+
 %:
 	dh $@ --parallel --dbg-package=libqt5webengine5-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
 	# Run qmake once to create .qmake.conf and be sure to append the following values.
-	qmake WEBENGINE_CONFIG+="use_system_icu use_system_zlib"
+	qmake WEBENGINE_CONFIG+="$(defines)"
 
 # Enable gstabs debugging symbols only on gstab_architectures.
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))
@@ -49,7 +71,7 @@ ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(disabled_pch_architectur
 endif
 
 	# Run qmake again now with the proper values.
-	qmake  WEBENGINE_CONFIG+="use_system_icu use_system_zlib"
+	qmake  WEBENGINE_CONFIG+="$(defines)"
 
 	# 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 $(DEB_VERSION_UPSTREAM)

-- 
qtwebengine packaging