[SCM] qtwebengine packaging branch, master, updated. 9a877655270d8c3ecb92621df181ac4327767a2a

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 8e82d2d71eb9a230096b05e3bfef12bc97b162c9
Author: Sandro Knauß <sknauss at kde.org>
Date:   Mon Aug 1 11:03:52 2016 +0200

    use system icu & zlib
---
 debian/libqt5webengine5.install | 1 -
 debian/rules                    | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/libqt5webengine5.install b/debian/libqt5webengine5.install
index 1db75f2..8254245 100644
--- a/debian/libqt5webengine5.install
+++ b/debian/libqt5webengine5.install
@@ -2,7 +2,6 @@ usr/lib/*/libQt5WebEngine.so.5*
 usr/lib/*/libQt5WebEngineCore.so.5*
 usr/lib/*/libQt5WebEngineWidgets.so.5*
 usr/lib/*/qt5/libexec/QtWebEngineProcess
-usr/share/qt5/resources/icudtl.dat
 usr/share/qt5/resources/qtwebengine_resources.pak
 usr/share/qt5/resources/qtwebengine_resources_100p.pak
 usr/share/qt5/resources/qtwebengine_resources_200p.pak
diff --git a/debian/rules b/debian/rules
index 9598a17..f96e3a5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ disabled_pch_architectures := amd64 powerpc s390x
 
 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_ffmpeg use_system_zlib"
+	qmake WEBENGINE_CONFIG+="use_system_icu use_system_zlib"
 
 # Enable gstabs debugging symbols only on gstab_architectures.
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gstab_architectures)))
@@ -49,7 +49,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_ffmpeg use_system_zlib"
+	qmake  WEBENGINE_CONFIG+="use_system_icu 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 $(DEB_VERSION_UPSTREAM)

-- 
qtwebengine packaging