commit:     10100ed92d119e229b38ba0236e85f3123a5b9ab
Author:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 11 12:51:29 2018 +0000
Commit:     Jimi Huotari <chiitoo <AT> gentoo <DOT> org>
CommitDate: Wed Apr 11 12:51:29 2018 +0000
URL:        https://gitweb.gentoo.org/proj/qt.git/commit/?id=10100ed9

dev-qt/qtwebengine: move patches around

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 dev-qt/qtwebengine/Manifest                        |   2 +-
 .../qtwebengine-5.11.0-update-shim-headers.patch   | 102 +++++++++++++++++++++
 dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild    |   6 +-
 dev-qt/qtwebengine/qtwebengine-5.9999.ebuild       |   6 +-
 4 files changed, 107 insertions(+), 9 deletions(-)

diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index ff7af173..2312c90e 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -1,5 +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 7598 BLAKE2B 
4cb72bf71eba67bcbceee5e35b75b19664e0e4027e24e722d159dde1d8741d8621647c5aa7d7298e5e7209800945eadae9f203d59a604481c2c09f99578347ed
 SHA512 
50fa38962ef5203b2fc1f6df0bca8acebc18c26579077cb090dc7f14ad9def39a1325644e66a83dd52cd7943053fc0c6894a00f6939443c34961620ac93c3dd5
+DIST qtwebengine-5.11.0-system-icu-patch.tar.bz2 6661 BLAKE2B 
e15ab9af0adedbf1da55d53f2e671026f3db4aca848fb8f7a821215c17a3bd51725c23a1e8504a24cbceb37736d0135df926282161f06f2e8c9e340671863c4b
 SHA512 
2b46533c0b23b9ed6c8fa13eb579e21fb1b06019bfe7d79cf277a2e32fad8a5265df2905898ffec2a075d0252435937001fb6355035c71f1a4e34f812836a359
 DIST qtwebengine-5.11.0_beta2-icu-patches.tar.bz2 6781 BLAKE2B 
921b6d384f11ea8008be5917181aeac3eb6d8a1c7d9a9d4c0489daa276dc5096e5db640a1154214909acb898b38a4f52d9017442902b1661824689456d637c4c
 SHA512 
b8029494f851ddd6eeaa2b62f20bc3739560103ca53da4f083d7770158370fb08902de96e3be3a98df403993ee71dc5b0be252083a5452c24d515a1c94174f16
 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/files/qtwebengine-5.11.0-update-shim-headers.patch 
b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch
new file mode 100644
index 00000000..e5e38312
--- /dev/null
+++ b/dev-qt/qtwebengine/files/qtwebengine-5.11.0-update-shim-headers.patch
@@ -0,0 +1,102 @@
+--- 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.11.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
index edbb26bd..32064b19 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.11.9999.ebuild
@@ -11,10 +11,6 @@ if [[ ${QT5_BUILD_TYPE} == release ]]; then
        KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
-SRC_URI+=" system-icu? (
-       
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"
 
 RDEPEND="
@@ -84,7 +80,7 @@ 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+=( "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch" )
+               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

diff --git a/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild 
b/dev-qt/qtwebengine/qtwebengine-5.9999.ebuild
index 85042ae6..0fc2f021 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"
@@ -85,8 +85,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.11.0-system-icu-build.patch"
-                       "${WORKDIR}/${PN}-5.11.0-update-shim-headers.patch"
+                       "${WORKDIR}/${PN}-5.11.0-fix-system-icu.patch"
+                       "${FILESDIR}/${PN}-5.11.0-update-shim-headers.patch"
                )
 
        # bug 620444 - ensure local headers are used

Reply via email to