commit:     2fb5d5d92dcded5ea30b5b1eb58e46e9a0eb412b
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 19:14:10 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 19:14:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=2fb5d5d9

dev-qt/qtwebengine: add patch from Fedora to solve system-icu issue

Package-Manager: portage-2.2.26

 dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch | 15 +++++++++++++++
 dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild     |  2 ++
 2 files changed, 17 insertions(+)

diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch
new file mode 100644
index 0000000..0b367c7
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.6.0-icu.patch
@@ -0,0 +1,15 @@
+Solves issue with trying to locate icudtl.dat in /usr/share/qt5/ when built
+with system-icu.
+
+Patch from Fedora.
+
+--- a/src/core/config/linux.pri
++++ b/src/core/config/linux.pri
+@@ -40,6 +40,6 @@
+ use?(system_snappy):   GYP_CONFIG += use_system_snappy=1
+ use?(system_speex):    GYP_CONFIG += use_system_speex=1
+ use?(system_vpx):      GYP_CONFIG += use_system_libvpx=1
+-use?(system_icu):      GYP_CONFIG += use_system_icu=1
++use?(system_icu):      GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0
+ use?(system_ffmpeg):   GYP_CONFIG += use_system_ffmpeg=1
+ 

diff --git a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
index 5293465..34ca7d3 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.6.0_beta.ebuild
@@ -68,6 +68,8 @@ DEPEND="${RDEPEND}
        sys-devel/bison
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.6.0-icu.patch" )
+
 src_prepare() {
        qt_use_disable_mod geolocation positioning \
                src/core/core_common.pri \

Reply via email to