From d37b97a25b8b10f748eead6574b01f893f140b01 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 6 Dec 2017 18:23:20 +0000
Subject: gentoo resync : 06.12.2017

---
 dev-qt/Manifest.gz                                  | Bin 10560 -> 10558 bytes
 dev-qt/qtwebengine/Manifest                         |   3 ++-
 .../files/qtwebengine-5.9.3-icu-60.1.patch          |  16 ++++++++++++++++
 dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild         |   2 ++
 4 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch

(limited to 'dev-qt')

diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index f0a742e02ca6..5dd718cd919c 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 27ea14da82df..3724deca0813 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -4,11 +4,12 @@ AUX qtwebengine-5.7.0-undef-madv_free.patch 1132 BLAKE2B 26f441b8e06bd059476a640
 AUX qtwebengine-5.7.1-fix-audio-detection.patch 802 BLAKE2B 0567ca41667c62c794c9c782df07aac966849101b23a8979352d83a990636935aabe7d7d7e945b286714121e963e43509fd6b6115376a883ccf4ec8777747b14 SHA512 d461dc066eda63d9cc7131852d12f2a0ed0abdaf849f9d7ec0e1da20098e031877c07ae37ebd3ba47af1ef1d7cf4d909ef594bcb4682f9e4f69d7deeaeb01f2c
 AUX qtwebengine-5.7.1-gcc-7.patch 5612 BLAKE2B 2ee8a7411dcdd397e9dfd17af0b0081fd16b16da4598ba976e94b3b14d4e1a3fbfc7abed83204e472d5f9a8aea60bc402ca98c3d355f653117556a6047a1393f SHA512 a2824a8ea4b2499fb6f5b583349c3b3428a3a99e5f534d624e00c7820f7a70c824ffc90fc9abd0f981fd707e5361b1d466de1094f65d5c1c8d62db9dc118be0a
 AUX qtwebengine-5.9.0-paxmark-mksnapshot.patch 1299 BLAKE2B 61ed2846bad8e7c82ec3a948197a16cc01ab0a9488045add6f5c27fe202e6c0daaf71e9915d62755e341461c43e263362291f8cce1dc61209aed8cf3c4301fd2 SHA512 80fce43f244d5ac7519eb27415bc9bbee9012cd1416abaed815e835d3057f64b0d766f8d7c0e4d58ec2ceab04fc3090223eb9a461e64235a6113bef31dd7d47b
+AUX qtwebengine-5.9.3-icu-60.1.patch 664 BLAKE2B eb36ee21a907677d6599dfd7fa3960619492ca0616cace73e475ceba64b1f43631d6f81b303801d934dc6e4a71bf7dc4c4b43fc73d3d048ca51bd7ceea13bc68 SHA512 9652916b675ae2d94f761ebd1e13effbb7545d14bda130a61122d082ea7e826da1be1d22d9063f5e3a4a3b2bb3bc51edb7a98a51869ec8bb9db9089e4c31dd5b
 AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce1d2bd58662f83e35f3426cf3daba0ea49d28689723c59c14ed2d357102d8eefbc4c7afcce298efa516f82710bcabe930a6e566 SHA512 3ad5312be5d0a1e08df9d5f25256678c12373d64a99f0d7fb0f96b711f719775328feb554144ac5cde22f8226a7b8d62bd07287270da613db09a1ed3c3303019
 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a
 DIST qtwebengine-opensource-src-5.9.2.tar.xz 217353592 BLAKE2B 978a13f11adcc09486764d08da53a38386b6f9b57a57a4e574c916c614a681b14f4a44b03ac4a728673688e4ee607d512215661363909729e8736e896804ec0e SHA512 9139533b8b384519cb49a909ed678344c94cdeeed40048d0cf8482506defaea0ea8f06396576fae9f51e4b073a04ee63d1b1b42b8cd82a6d4592bc0db983c715
 DIST qtwebengine-opensource-src-5.9.3.tar.xz 217344496 BLAKE2B 51701dfa8a804ad7723d296fb8ba11df821041c60e4c96459b7851b3ba1ca683e83207c3020a5a54e401779186daf46049a1167649b930cc04151b6d0474aaeb SHA512 0db532b4d54540da1ca63de1cc4d561d72f052211535f75f60b99c1858ec0819ab0f831a3326d58da6350066748634000fe7ad0719ca545e12f3ed249a6eb90a
 EBUILD qtwebengine-5.7.1-r2.ebuild 3106 BLAKE2B e3ce8d5155c0a82d413a9d61bbf29e66f44bff39e3287446045eb9af78860ca478687330e4dbe069bc38aa70a7712dc49d559c04ba06877c4251c1d9ffe53d24 SHA512 40e425233d99bf82a0595d4248597177516f4fccc7dcba1a607e4940c828b5e35de7c3b1a5ebc700d1d05e436ff885f445b1428dd6bc9f7d9395b088ada04b20
 EBUILD qtwebengine-5.9.2.ebuild 2993 BLAKE2B 97a45338fd7dfb72df8a3d6d23a8a699b43bcc5f121fb1521e3c23fcfa4d4149839fe0d725c18babefdf844f41163f14042be517be1fe69f4f5d33f48403deb8 SHA512 6400356d54109aead2a3766a939d2f31938eaee5df7025dccd8bf47a6e66bfcd0667e4ee5262ebabf4f3c11524b8d2511ce3df518874ba5ada2340ede4a78f65
-EBUILD qtwebengine-5.9.3.ebuild 2993 BLAKE2B 97a45338fd7dfb72df8a3d6d23a8a699b43bcc5f121fb1521e3c23fcfa4d4149839fe0d725c18babefdf844f41163f14042be517be1fe69f4f5d33f48403deb8 SHA512 6400356d54109aead2a3766a939d2f31938eaee5df7025dccd8bf47a6e66bfcd0667e4ee5262ebabf4f3c11524b8d2511ce3df518874ba5ada2340ede4a78f65
+EBUILD qtwebengine-5.9.3.ebuild 3040 BLAKE2B fe9dbf28e393940b35d9b81a7a190bd422f363efc6daa737f601862689164fabd889a0e618e9fba0168106b1b612f88a3bfa53d911874c1cb7bd26d5989262e1 SHA512 31ddb1ea3fe2b2ac2b4e651efd5f072d2a91595b3e8301adbbf90992f5f056031496a33cfbca1240d5755a2eac53cb542187615f136990efdf6277ac664d3e80
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
new file mode 100644
index 000000000000..9866ab929194
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.9.3-icu-60.1.patch
@@ -0,0 +1,16 @@
+Fix build with >=ICU-60
+
+Bug: https://bugs.gentoo.org/639220
+Bug: https://bugreports.qt.io/browse/QTBUG-64925
+
+--- a/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
++++ b/src/3rdparty/chromium/components/url_formatter/url_formatter.cc
+@@ -488,7 +488,7 @@
+   // are added to the allowed set. The list has to be updated when a new
+   // version of Unicode is released. The current version is 9.0.0 and ICU 60
+   // will have Unicode 10.0 data.
+-#if U_ICU_VERSION_MAJOR_NUM < 60
++#if U_ICU_VERSION_MAJOR_NUM < 60 || defined(TOOLKIT_QT)
+   const icu::UnicodeSet aspirational_scripts(
+       icu::UnicodeString(
+           // Unified Canadian Syllabics
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index 2c0bd6388d55..afb0d89df444 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -73,6 +73,8 @@ DEPEND="${RDEPEND}
 	pax_kernel? ( sys-apps/elfix )
 "
 
+PATCHES=( "${FILESDIR}/${P}-icu-60.1.patch" )
+
 src_prepare() {
 	use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.0-paxmark-mksnapshot.patch" )
 
-- 
cgit v1.2.3