commit: 2a44abc7c9671d6b2bcb0aa1f04498496ee48b56
Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 21:32:45 2018 +0000
Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 21:32:45 2018 +0000
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=2a44abc7
dev-qt/qtwebengine: fix system-icu for 5.11 and 5.9999
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-qt/qtwebengine/Manifest | 1 +
dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 6 +++---
dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index a99d18a0..fffec4a3 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,2 +1,3 @@
DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B
b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e
SHA512
10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
+DIST qtwebengine-5.11.0-icu-patches.tar.bz2 6781 BLAKE2B
921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c
SHA512
b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
DIST qtwebengine-everywhere-src-5.10.0.tar.xz 209737304 BLAKE2B
8d7871c9f5953e375a4e9590f557406a98d225ae1b531fcedb070441e84dd98bcc4697da0e37015460f3e39dbcee6a3f41532db162f97215c4d7106d55278afa
SHA512
7acb4579e4aea7c07654b2523b4d19102288ab06ee1ef5b8bb0ad7b38fa771612336acc56ec02ce85c881c0878a7875955ad73f5f1e2740352234e2f02b9d84e
diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index 7f6d0349..098e4822 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
-
https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+
https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg
+system-icu widgets"
@@ -87,8 +87,8 @@ src_prepare() {
use pax_kernel && PATCHES+=(
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
PATCHES+=(
- "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
- "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+ "${WORKDIR}/${PN}-5.11.0-icu-59.1.patch"
+ "${WORKDIR}/${PN}-5.11.0-icu-60.1.patch"
)
# bug 620444 - ensure local headers are used
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 7f6d0349..098e4822 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
@@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
fi
SRC_URI+=" system-icu? (
-
https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.10.0-icu-patches.tar.bz2
+
https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
)"
IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg
+system-icu widgets"
@@ -87,8 +87,8 @@ src_prepare() {
use pax_kernel && PATCHES+=(
"${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
use system-icu && has_version ">=dev-libs/icu-59" && \
PATCHES+=(
- "${WORKDIR}/${PN}-5.10.0-icu-59.1.patch"
- "${WORKDIR}/${PN}-5.10.0-icu-60.1.patch"
+ "${WORKDIR}/${PN}-5.11.0-icu-59.1.patch"
+ "${WORKDIR}/${PN}-5.11.0-icu-60.1.patch"
)
# bug 620444 - ensure local headers are used