[SCM] qtwebengine packaging branch, master, updated. 00f20029d640454ecc0b7173b8be8bd20af26012

[Sandro Knauß]

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

The following commit has been merged in the master branch:
commit 5c3b41e15a8ae447646c795e6fa7de257013bc23
Author: Sandro Knauß <hefee at debian.org>
Date:   Mon Oct 31 16:33:26 2016 +0100

    Use internal ICU, because we need the icudtl.dat
---
 debian/libqt5webengine-data.install | 1 +
 debian/rules                        | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/debian/libqt5webengine-data.install b/debian/libqt5webengine-data.install
index e2dd026..994fd77 100644
--- a/debian/libqt5webengine-data.install
+++ b/debian/libqt5webengine-data.install
@@ -2,4 +2,5 @@ usr/share/qt5/resources/qtwebengine_devtools_resources.pak
 usr/share/qt5/resources/qtwebengine_resources.pak
 usr/share/qt5/resources/qtwebengine_resources_100p.pak
 usr/share/qt5/resources/qtwebengine_resources_200p.pak
+usr/share/qt5/resources/icudtl.dat
 usr/share/qt5/translations/qtwebengine_locales/*
diff --git a/debian/rules b/debian/rules
index f25f487..c1fbf0b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,6 @@ 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 \
@@ -44,6 +43,7 @@ defines+=use_system_expat=1 \
          # use_system_libxnvctrl=1 \
          # use_system_sqlite=1 \
          # use_system_libvpx=1 \
+         # use_system_icu=1 \
 
 replace_gyp_args = $(foreach define,$(defines),-D$(define))
 

-- 
qtwebengine packaging