From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 79AB41382C5 for ; Sat, 17 Mar 2018 02:49:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 74F28E082D; Sat, 17 Mar 2018 02:49:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 37D7FE082D for ; Sat, 17 Mar 2018 02:49:39 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4A7FF335C8B for ; Sat, 17 Mar 2018 02:49:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7357B232 for ; Sat, 17 Mar 2018 02:49:36 +0000 (UTC) From: "Jimi Huotari" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jimi Huotari" Message-ID: <1521253414.f91bb48a1a371a490e26b12b898966ccd9d6b9da.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/Manifest dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: f91bb48a1a371a490e26b12b898966ccd9d6b9da X-VCS-Branch: master Date: Sat, 17 Mar 2018 02:49:36 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a612c422-9629-4f78-acb3-2ef34ff1ebfd X-Archives-Hash: dd5950dcf7c11c8aeeab8891f76ec2f5 commit: f91bb48a1a371a490e26b12b898966ccd9d6b9da Author: Jimi Huotari gentoo org> AuthorDate: Sat Mar 17 02:22:52 2018 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Sat Mar 17 02:23:34 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=f91bb48a dev-qt/qtwebengine: switch system ICU patches for 65-based 5.11 Package-Manager: Portage-2.3.24, Repoman-2.3.6 dev-qt/qtwebengine/Manifest | 1 + dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild | 7 ++----- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 7 ++----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest index cbde3844..a43f68ad 100644 --- a/dev-qt/qtwebengine/Manifest +++ b/dev-qt/qtwebengine/Manifest @@ -1,4 +1,5 @@ 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-5.11.0-system-icu-patch.tar.bz2 6661 BLAKE2B e15ab9af0adedbf1da55d53f2e671026f3db4aca848fb8f7a821215c17a3bd51725c23a1e8504a24cbceb37736d0135df926282161f06f2e8c9e340671863c4b SHA512 2b46533c0b23b9ed6c8fa13eb579e21fb1b06019bfe7d79cf277a2e32fad8a5265df2905898ffec2a075d0252435937001fb6355035c71f1a4e34f812836a359 DIST qtwebengine-everywhere-src-5.10.1.tar.xz 209844952 BLAKE2B 4a9ac3a5a931c239b0eac949d6d52e22f7752ece4ba08126d0be2509b43b36ebebd1fbf3d1c9076e05fb866caea9bc00d902864a496e6f50cc367cee86602618 SHA512 dc1b15eb857cb9ff3ef98a2f90cfec8c40429eea292bbed6a323cf1c4b044f3b73efaf51833fe8d9ca2ecc4f99d7092590a1a34248a9ab14fa5a38d4335f4925 DIST qtwebengine-everywhere-src-5.11.0-beta2.tar.xz 221511360 BLAKE2B 4bb8ee10ea760c59518d0d411de29b51a9cfd95e8b2a78f7e1cfadcb5de8ffa9443f2a2518fc1defa086582df1767a74107f2e64bc6d1a623983cc468a42a598 SHA512 09589759792336e0483d8cd908760f7c9435b218f05d125867d3fdf85e21a2edf4f5fe17509a6b7f64be3012c631adaa5e2ae62c53ec736d0008a12b5388ac9c diff --git a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild index 098e4822..05974b1c 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.11.0-icu-patches.tar.bz2 + https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2 )" IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" @@ -86,10 +86,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" ) 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.11.0-icu-59.1.patch" - "${WORKDIR}/${PN}-5.11.0-icu-60.1.patch" - ) + PATCHES+=( "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" ) # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 098e4822..05974b1c 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.11.0-icu-patches.tar.bz2 + https://dev.gentoo.org/~chiitoo/distfiles/qtwebengine-5.11.0-system-icu-patch.tar.bz2 )" IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" @@ -86,10 +86,7 @@ PATCHES=( "${FILESDIR}/${PN}-5.10.0-jpeg-9.patch" ) 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.11.0-icu-59.1.patch" - "${WORKDIR}/${PN}-5.11.0-icu-60.1.patch" - ) + PATCHES+=( "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch" ) # bug 620444 - ensure local headers are used find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die