[gentoo-commits] proj/qt:master commit in: dev-qt/qtwebengine/, dev-qt/qtwebengine/files/

["Jimi Huotari" <chiitoo@gentoo.org>]

commit:     c29568a3feeeb6afcb34dc6cbd32efe5e4f81be7
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 19 20:09:57 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> 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