1 |
commit: 7e8f9bebf9a491824733739d29bbf82900f8dee6 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Jun 3 10:45:07 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Jun 3 10:45:07 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=7e8f9beb |
7 |
|
8 |
dev-qt/qtwebengine: Drop upstreamed icu-67.1 patch |
9 |
|
10 |
Package-Manager: Portage-2.3.100, Repoman-2.3.22 |
11 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
12 |
|
13 |
.../files/qtwebengine-5.14.2-icu67.patch | 169 --------------------- |
14 |
dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild | 5 +- |
15 |
2 files changed, 1 insertion(+), 173 deletions(-) |
16 |
|
17 |
diff --git a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch b/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch |
18 |
deleted file mode 100644 |
19 |
index 42ee5e87..00000000 |
20 |
--- a/dev-qt/qtwebengine/files/qtwebengine-5.14.2-icu67.patch |
21 |
+++ /dev/null |
22 |
@@ -1,169 +0,0 @@ |
23 |
-From 2b107e7670ffb43719a66ee4a55ab408a5dcf2a5 Mon Sep 17 00:00:00 2001 |
24 |
-From: Ujjwal Sharma <ryzokuken@×××××××.org> |
25 |
-Date: Wed, 22 Apr 2020 12:20:17 +0530 |
26 |
-Subject: [PATCH] deps: V8: backport 3f8dc4b2e5ba |
27 |
- |
28 |
-Original commit message: |
29 |
- |
30 |
- [intl] Remove soon-to-be removed getAllFieldPositions |
31 |
- |
32 |
- Needed to land ICU67.1 soon. |
33 |
- |
34 |
- Bug: v8:10393 |
35 |
- Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 |
36 |
- Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 |
37 |
- Reviewed-by: Jakob Kummerow <jkummerow@××××××××.org> |
38 |
- Commit-Queue: Frank Tang <ftang@××××××××.org> |
39 |
- Cr-Commit-Position: refs/heads/master@{#67027} |
40 |
- |
41 |
-Refs: https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463 |
42 |
---- |
43 |
- common.gypi | 2 +- |
44 |
- src/3rdparty/chromium/v8/src/objects/js-number-format.cc | 72 +++++++++++++------------ |
45 |
- 2 files changed, 38 insertions(+), 36 deletions(-) |
46 |
- |
47 |
-diff --git a/deps/v8/src/objects/js-number-format.cc b/deps/v8/src/objects/js-number-format.cc |
48 |
-index 92d3e2fb82e..ced408aa173 100644 |
49 |
---- a/src/3rdparty/chromium/v8/src/objects/js-number-format.cc |
50 |
-+++ b/src/3rdparty/chromium/v8/src/objects/js-number-format.cc |
51 |
-@@ -1197,42 +1197,31 @@ MaybeHandle<JSNumberFormat> JSNumberFormat::New(Isolate* isolate, |
52 |
- } |
53 |
- |
54 |
- namespace { |
55 |
--Maybe<icu::UnicodeString> IcuFormatNumber( |
56 |
-+Maybe<bool> IcuFormatNumber( |
57 |
- Isolate* isolate, |
58 |
- const icu::number::LocalizedNumberFormatter& number_format, |
59 |
-- Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) { |
60 |
-+ Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) { |
61 |
- // If it is BigInt, handle it differently. |
62 |
- UErrorCode status = U_ZERO_ERROR; |
63 |
-- icu::number::FormattedNumber formatted; |
64 |
- if (numeric_obj->IsBigInt()) { |
65 |
- Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj); |
66 |
- Handle<String> big_int_string; |
67 |
- ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, |
68 |
- BigInt::ToString(isolate, big_int), |
69 |
-- Nothing<icu::UnicodeString>()); |
70 |
-- formatted = number_format.formatDecimal( |
71 |
-+ Nothing<bool>()); |
72 |
-+ *formatted = number_format.formatDecimal( |
73 |
- {big_int_string->ToCString().get(), big_int_string->length()}, status); |
74 |
- } else { |
75 |
- double number = numeric_obj->Number(); |
76 |
-- formatted = number_format.formatDouble(number, status); |
77 |
-+ *formatted = number_format.formatDouble(number, status); |
78 |
- } |
79 |
- if (U_FAILURE(status)) { |
80 |
- // This happen because of icu data trimming trim out "unit". |
81 |
- // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 |
82 |
-- THROW_NEW_ERROR_RETURN_VALUE(isolate, |
83 |
-- NewTypeError(MessageTemplate::kIcuError), |
84 |
-- Nothing<icu::UnicodeString>()); |
85 |
-- } |
86 |
-- if (fp_iter) { |
87 |
-- formatted.getAllFieldPositions(*fp_iter, status); |
88 |
-+ THROW_NEW_ERROR_RETURN_VALUE( |
89 |
-+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>()); |
90 |
- } |
91 |
-- icu::UnicodeString result = formatted.toString(status); |
92 |
-- if (U_FAILURE(status)) { |
93 |
-- THROW_NEW_ERROR_RETURN_VALUE(isolate, |
94 |
-- NewTypeError(MessageTemplate::kIcuError), |
95 |
-- Nothing<icu::UnicodeString>()); |
96 |
-- } |
97 |
-- return Just(result); |
98 |
-+ return Just(true); |
99 |
- } |
100 |
- |
101 |
- } // namespace |
102 |
-@@ -1243,10 +1232,16 @@ MaybeHandle<String> JSNumberFormat::FormatNumeric( |
103 |
- Handle<Object> numeric_obj) { |
104 |
- DCHECK(numeric_obj->IsNumeric()); |
105 |
- |
106 |
-- Maybe<icu::UnicodeString> maybe_format = |
107 |
-- IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); |
108 |
-+ icu::number::FormattedNumber formatted; |
109 |
-+ Maybe<bool> maybe_format = |
110 |
-+ IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); |
111 |
- MAYBE_RETURN(maybe_format, Handle<String>()); |
112 |
-- return Intl::ToString(isolate, maybe_format.FromJust()); |
113 |
-+ UErrorCode status = U_ZERO_ERROR; |
114 |
-+ icu::UnicodeString result = formatted.toString(status); |
115 |
-+ if (U_FAILURE(status)) { |
116 |
-+ THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); |
117 |
-+ } |
118 |
-+ return Intl::ToString(isolate, result); |
119 |
- } |
120 |
- |
121 |
- namespace { |
122 |
-@@ -1359,12 +1354,18 @@ std::vector<NumberFormatSpan> FlattenRegionsToParts( |
123 |
- } |
124 |
- |
125 |
- namespace { |
126 |
--Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, |
127 |
-- icu::FieldPositionIterator* fp_iter, |
128 |
-+Maybe<int> ConstructParts(Isolate* isolate, |
129 |
-+ icu::number::FormattedNumber* formatted, |
130 |
- Handle<JSArray> result, int start_index, |
131 |
- Handle<Object> numeric_obj, bool style_is_unit) { |
132 |
-+ UErrorCode status = U_ZERO_ERROR; |
133 |
-+ icu::UnicodeString formatted_text = formatted->toString(status); |
134 |
-+ if (U_FAILURE(status)) { |
135 |
-+ THROW_NEW_ERROR_RETURN_VALUE( |
136 |
-+ isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>()); |
137 |
-+ } |
138 |
- DCHECK(numeric_obj->IsNumeric()); |
139 |
-- int32_t length = formatted.length(); |
140 |
-+ int32_t length = formatted_text.length(); |
141 |
- int index = start_index; |
142 |
- if (length == 0) return Just(index); |
143 |
- |
144 |
-@@ -1373,13 +1374,14 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, |
145 |
- // other region covers some part of the formatted string. It's possible |
146 |
- // there's another field with exactly the same begin and end as this backdrop, |
147 |
- // in which case the backdrop's field_id of -1 will give it lower priority. |
148 |
-- regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); |
149 |
-+ regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); |
150 |
- |
151 |
- { |
152 |
-- icu::FieldPosition fp; |
153 |
-- while (fp_iter->next(fp)) { |
154 |
-- regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), |
155 |
-- fp.getEndIndex())); |
156 |
-+ icu::ConstrainedFieldPosition cfp; |
157 |
-+ cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); |
158 |
-+ while (formatted->nextPosition(cfp, status)) { |
159 |
-+ regions.push_back( |
160 |
-+ NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); |
161 |
- } |
162 |
- } |
163 |
- |
164 |
-@@ -1401,7 +1403,7 @@ Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, |
165 |
- Handle<String> substring; |
166 |
- ASSIGN_RETURN_ON_EXCEPTION_VALUE( |
167 |
- isolate, substring, |
168 |
-- Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), |
169 |
-+ Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), |
170 |
- Nothing<int>()); |
171 |
- Intl::AddElement(isolate, result, index, field_type_string, substring); |
172 |
- ++index; |
173 |
-@@ -1421,14 +1423,14 @@ MaybeHandle<JSArray> JSNumberFormat::FormatToParts( |
174 |
- number_format->icu_number_formatter().raw(); |
175 |
- CHECK_NOT_NULL(fmt); |
176 |
- |
177 |
-- icu::FieldPositionIterator fp_iter; |
178 |
-- Maybe<icu::UnicodeString> maybe_format = |
179 |
-- IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); |
180 |
-+ icu::number::FormattedNumber formatted; |
181 |
-+ Maybe<bool> maybe_format = |
182 |
-+ IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); |
183 |
- MAYBE_RETURN(maybe_format, Handle<JSArray>()); |
184 |
- |
185 |
- Handle<JSArray> result = factory->NewJSArray(0); |
186 |
- Maybe<int> maybe_format_to_parts = ConstructParts( |
187 |
-- isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, |
188 |
-+ isolate, &formatted, result, 0, numeric_obj, |
189 |
- number_format->style() == JSNumberFormat::Style::UNIT); |
190 |
- MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>()); |
191 |
- |
192 |
|
193 |
diff --git a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
194 |
index 7c6d8e1d..84a5805b 100644 |
195 |
--- a/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
196 |
+++ b/dev-qt/qtwebengine/qtwebengine-5.15.9999.ebuild |
197 |
@@ -78,10 +78,7 @@ DEPEND="${RDEPEND} |
198 |
sys-devel/bison |
199 |
" |
200 |
|
201 |
-PATCHES=( |
202 |
- "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" # bug 695446 |
203 |
- "${FILESDIR}/${PN}-5.14.2-icu67.patch" # bug 720054 |
204 |
-) |
205 |
+PATCHES=( "${FILESDIR}/${PN}-5.15.0-disable-fatal-warnings.patch" ) # bug 695446 |
206 |
|
207 |
src_prepare() { |
208 |
if ! use jumbo-build; then |