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 DBCF3138334 for ; Tue, 19 Jun 2018 20:12:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2D19E0933; Tue, 19 Jun 2018 20:12:29 +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 C1D92E0933 for ; Tue, 19 Jun 2018 20:12:29 +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 42C0B335C91 for ; Tue, 19 Jun 2018 20:12:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 62CDD2AD for ; Tue, 19 Jun 2018 20:12:26 +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: <1529438997.c29568a3feeeb6afcb34dc6cbd32efe5e4f81be7.chiitoo@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch dev-qt/qtwebengine/qtwebengine-5.9999.ebuild X-VCS-Directories: dev-qt/qtwebengine/files/ dev-qt/qtwebengine/ X-VCS-Committer: chiitoo X-VCS-Committer-Name: Jimi Huotari X-VCS-Revision: c29568a3feeeb6afcb34dc6cbd32efe5e4f81be7 X-VCS-Branch: master Date: Tue, 19 Jun 2018 20:12:26 +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: 2c68a9eb-75da-4f47-a81b-91355734baf8 X-Archives-Hash: ac9d8f26bea55b8b0360bb36e0a2a7bf commit: c29568a3feeeb6afcb34dc6cbd32efe5e4f81be7 Author: Jimi Huotari gentoo org> AuthorDate: Tue Jun 19 20:09:57 2018 +0000 Commit: Jimi Huotari gentoo org> CommitDate: Tue Jun 19 20:09:57 2018 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=c29568a3 dev-qt/qtwebengine: remove upstreamed ICU patch from 5.9999 Also remove the patch itself, as it is no longer needed. Package-Manager: Portage-2.3.40, Repoman-2.3.9 .../qtwebengine-5.11.0-update-shim-headers.patch | 102 --------------------- dev-qt/qtwebengine/qtwebengine-5.9999.ebuild | 2 - 2 files changed, 104 deletions(-) diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch deleted file mode 100644 index e5e38312..00000000 --- a/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch +++ /dev/null @@ -1,102 +0,0 @@ ---- a/src/3tdparty/chromium/third_party/icu/BUILD.gn -+++ b/src/3rdparty/chromium/third_party/icu/BUILD.gn -@@ -1153,6 +1153,8 @@ - "measunit.h", - "measure.h", - "msgfmt.h", -+ "nounit.h", -+ "numberformatter.h", - "numfmt.h", - "numsys.h", - "plurfmt.h", -@@ -1180,11 +1182,11 @@ - "tzrule.h", - "tztrans.h", - "ucal.h", -- "ucoleitr.h", - "ucol.h", -+ "ucoleitr.h", - "ucsdet.h", -- "udateintervalformat.h", - "udat.h", -+ "udateintervalformat.h", - "udatpg.h", - "ufieldpositer.h", - "uformattable.h", -@@ -1197,6 +1199,7 @@ - "upluralrules.h", - "uregex.h", - "uregion.h", -+ "ureldatefmt.h", - "usearch.h", - "uspoof.h", - "utmscale.h", -@@ -1216,13 +1219,16 @@ - "appendable.h", - "brkiter.h", - "bytestream.h", -- "bytestriebuilder.h", - "bytestrie.h", -+ "bytestriebuilder.h", - "caniter.h", -+ "casemap.h", -+ "char16ptr.h", - "chariter.h", - "dbbi.h", - "docmain.h", - "dtintrv.h", -+ "edits.h", - "enumset.h", - "errorcode.h", - "filteredbrk.h", -@@ -1245,23 +1251,26 @@ - "rep.h", - "resbund.h", - "schriter.h", -+ "simpleformatter.h", - "std_string.h", - "strenum.h", -+ "stringoptions.h", - "stringpiece.h", - "stringtriebuilder.h", - "symtable.h", - "ubidi.h", -+ "ubiditransform.h", - "ubrk.h", - "ucasemap.h", - "ucat.h", - "uchar.h", -- "ucharstriebuilder.h", - "ucharstrie.h", -+ "ucharstriebuilder.h", - "uchriter.h", - "uclean.h", -+ "ucnv.h", - "ucnv_cb.h", - "ucnv_err.h", -- "ucnv.h", - "ucnvsel.h", - "uconfig.h", - "ucurr.h", -@@ -1280,8 +1289,8 @@ - "unimatch.h", - "uniset.h", - "unistr.h", -- "unorm2.h", - "unorm.h", -+ "unorm2.h", - "uobject.h", - "urename.h", - "urep.h", -@@ -1294,10 +1303,10 @@ - "ustring.h", - "ustringtrie.h", - "utext.h", -+ "utf.h", - "utf16.h", - "utf32.h", - "utf8.h", -- "utf.h", - "utf_old.h", - "utrace.h", - "utypes.h", diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild index 39f78647..b98972ea 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild @@ -81,8 +81,6 @@ DEPEND="${RDEPEND} src_prepare() { use pax_kernel && PATCHES+=( "${FILESDIR}/${PN}-5.9.3-paxmark-mksnapshot.patch" ) - use system-icu && has_version ">=dev-libs/icu-59" && \ - PATCHES+=( "${FILESDIR}/${PN}-5.11.0-update-shim-headers.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