[SCM] qtwebengine packaging branch, master, updated. ac4132ac21684970f049f090891b9675d6615840

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 84d85cc653508698aa8f0f06d0182b5864a9f7a6
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Sep 14 16:41:48 2016 +0200

    Force the usage of the system libs, whenever possible.
---
 debian/control |  3 ++-
 debian/rules   | 39 +++++++++++++++++++++++----------------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 4dba2a1..02cb6a6 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,7 @@ Build-Depends: autotools-dev,
                libdbus-1-dev,
                libegl1-mesa-dev,
                libevent-dev,
+               libflac-dev,
                libfontconfig1-dev,
                libgl1-mesa-dev [!armel !armhf] | libgl-dev [!armel !armhf],
                libgles2-mesa-dev [armel armhf] | libgles2-dev [armel armhf],
@@ -41,8 +42,8 @@ Build-Depends: autotools-dev,
                libqt5opengl5-dev (>= 5.6.0+dfsg~),
                libqt5webchannel5-dev (>= 5.6.0~),
                libqt5xmlpatterns5-dev (>= 5.6.0~),
+               libre2-dev,
                libsnappy-dev,
-               libsqlite3-dev,
                libsrtp-dev,
                libv8-dev,
                libvpx-dev,
diff --git a/debian/rules b/debian/rules
index c7c24f5..005080c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,32 +17,39 @@ 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 \
+defines+=use_system_expat=1 \
+         use_system_ffmpeg=1 \
+	 use_system_flac=1 \
+         use_system_harfbuzz=1 \
+         use_system_icu=1 \
+         use_system_jsoncpp=1 \
+         use_system_libevent=1 \
+         use_system_libjpeg=1 \
          use_system_libpng=1 \
-         use_system_libxml=1 \
          use_system_libusb=1 \
-         use_system_libjpeg=1 \
+         use_system_libvpx=1 \
          use_system_libwebp=1 \
+         use_system_libxml=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=1 \
+         use_system_opus=1 \
+         use_system_re2=1 \
+         use_system_snappy=1 \
+         use_system_speex=1 \
          use_system_v8 \
-         use_system_ffmpeg \
+         use_system_xdg_utils=1 \
+         use_system_yasm=1 \
+         use_system_zlib=1
+         # The embedded sqlite version is chromium specificly patched
+         # use_system_sqlite=1 \
+         # use_system_protobuf=1 \
+
+replace_gyp_args = $(foreach define,$(defines),-D$(define))
 
 %:
 	dh $@ --parallel --dbg-package=libqt5webengine5-dbg --with pkgkde_symbolshelper
 
 override_dh_auto_configure:
+	src/3rdparty/chromium/build/linux/unbundle/replace_gyp_files.py $(replace_gyp_args)
 	# Run qmake once to create .qmake.conf and be sure to append the following values.
 	qmake WEBENGINE_CONFIG+="$(defines)"
 

-- 
qtwebengine packaging