Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Jimi Huotari <chiitoo@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/
Date: Tue, 03 Apr 2018 03:15:29
Message-Id: 1522724848.7eacbe0e0eacda5f70cda3a6bbcdd5d37b459d56.chiitoo@gentoo
1 commit: 7eacbe0e0eacda5f70cda3a6bbcdd5d37b459d56
2 Author: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 3 03:07:28 2018 +0000
4 Commit: Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 3 03:07:28 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7eacbe0e
7
8 dev-qt/qtwebengine: update patches related to system-icu
9
10 Package-Manager: Portage-2.3.28, Repoman-2.3.9
11
12 dev-qt/qtwebengine/Manifest | 4 ++--
13 dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild | 2 +-
14 dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 7 +++++--
15 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 7 +++++--
16 4 files changed, 13 insertions(+), 7 deletions(-)
17
18 diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
19 index a43f68ad..ff7af173 100644
20 --- a/dev-qt/qtwebengine/Manifest
21 +++ b/dev-qt/qtwebengine/Manifest
22 @@ -1,5 +1,5 @@
23 DIST qtwebengine-5.10.0-icu-patches.tar.bz2 6821 BLAKE2B b77a63727a73a6f3ff18bc83ba2e29db86fa39556708634fc01013865e48386ecdb3b32d8d3a41449ae336d1d7f98e4dcc6c6aecf3d8f9c39cdcc594902c306e SHA512 10508fe284750c0e5510d298113b7ab076e763f2071943aa6b11e8717b7a3d9e34d91a9b9310a116ecee187f35c2f32e17d21824f4bfadcc7c8472f183651997
24 -DIST qtwebengine-5.11.0-icu-patches.tar.bz2 6781 BLAKE2B 921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c SHA512 b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
25 -DIST qtwebengine-5.11.0-system-icu-patch.tar.bz2 6661 BLAKE2B e15ab9af0adedbf1da55d53f2e671026f3db4aca848fb8f7a821215c17a3bd51725c23a1e8504a24cbceb37736d0135df926282161f06f2e8c9e340671863c4b SHA512 2b46533c0b23b9ed6c8fa13eb579e21fb1b06019bfe7d79cf277a2e32fad8a5265df2905898ffec2a075d0252435937001fb6355035c71f1a4e34f812836a359
26 +DIST qtwebengine-5.11.0-icu-patches.tar.bz2 7598 BLAKE2B 4cb72bf71eba67bcbceee5e35b75b19664e0e4027e24e722d159dde1d8741d8621647c5aa7d7298e5e7209800945eadae9f203d59a604481c2c09f99578347ed SHA512 50fa38962ef5203b2fc1f6df0bca8acebc18c26579077cb090dc7f14ad9def39a1325644e66a83dd52cd7943053fc0c6894a00f6939443c34961620ac93c3dd5
27 +DIST qtwebengine-5.11.0_beta2-icu-patches.tar.bz2 6781 BLAKE2B 921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c SHA512 b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
28 DIST qtwebengine-everywhere-src-5.10.1.tar.xz 209844952 BLAKE2B 4a9ac3a5a931c239b0eac949d6d52e22f7752ece4ba08126d0be2509b43b36ebebd1fbf3d1c9076e05fb866caea9bc00d902864a496e6f50cc367cee86602618 SHA512 dc1b15eb857cb9ff3ef98a2f90cfec8c40429eea292bbed6a323cf1c4b044f3b73efaf51833fe8d9ca2ecc4f99d7092590a1a34248a9ab14fa5a38d4335f4925
29 DIST qtwebengine-everywhere-src-5.11.0-beta2.tar.xz 221511360 BLAKE2B 4bb8ee10ea760c59518d0d411de29b51a9cfd95e8b2a78f7e1cfadcb5de8ffa9443f2a2518fc1defa086582df1767a74107f2e64bc6d1a623983cc468a42a598 SHA512 09589759792336e0483d8cd908760f7c9435b218f05d125867d3fdf85e21a2edf4f5fe17509a6b7f64be3012c631adaa5e2ae62c53ec736d0008a12b5388ac9c
30
31 diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
32 index 0f479987..5102a5d0 100644
33 --- a/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
34 +++ b/dev-qt/qtwebengine/qtwebengine-5.11.0_beta2.ebuild
35 @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
36 fi
37
38 SRC_URI+=" system-icu? (
39 - https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
40 + https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0_beta2-icu-patches.tar.bz2
41 )"
42
43 IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
44
45 diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
46 index 4c22a9b0..686d1d20 100644
47 --- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
48 +++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
49 @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
50 fi
51
52 SRC_URI+=" system-icu? (
53 - https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
54 + https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
55 )"
56
57 IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
58 @@ -85,7 +85,10 @@ DEPEND="${RDEPEND}
59 src_prepare() {
60 use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
61 use system-icu && has_version ">=dev-libs/icu-59" && \
62 - PATCHES+=( "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" )
63 + PATCHES+=(
64 + "${WORKDIR}/${PN}-5.11.0-system-icu-build.patch"
65 + "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
66 + )
67
68 # bug 620444 - ensure local headers are used
69 find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
70
71 diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
72 index 2450a132..85042ae6 100644
73 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
74 +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
75 @@ -12,7 +12,7 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
76 fi
77
78 SRC_URI+=" system-icu? (
79 - https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2
80 + https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-icu-patches.tar.bz2
81 )"
82
83 IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets"
84 @@ -84,7 +84,10 @@ DEPEND="${RDEPEND}
85 src_prepare() {
86 use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" )
87 use system-icu && has_version ">=dev-libs/icu-59" && \
88 - PATCHES+=( "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" )
89 + PATCHES+=(
90 + "${WORKDIR}/${PN}-5.11.0-system-icu-build.patch"
91 + "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
92 + )
93
94 # bug 620444 - ensure local headers are used
95 find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die
Report Message
Find on MARC Find on Google Groups