Hello community, here is the log from the commit of package libqt5-qtwebengine for openSUSE:Factory checked in at 2020-04-27 23:30:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebengine (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebengine" Mon Apr 27 23:30:33 2020 rev:58 rq:797111 version:5.14.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebengine/libqt5-qtwebengine.changes 2020-04-15 20:07:47.634158153 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebengine.new.2738/libqt5-qtwebengine.changes 2020-04-27 23:30:47.278634301 +0200 @@ -1,0 +2,6 @@ +Fri Apr 24 10:19:13 UTC 2020 - Ismail Dönmez <idon...@suse.com> + +- Add icu-v67.patch to fix compilation with icu v67, this is a backport + of https://github.com/v8/v8/commit/3f8dc4b2e5baf77b463334c769af85b79d8c1463 + +------------------------------------------------------------------- New: ---- icu-v67.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebengine.spec ++++++ --- /var/tmp/diff_new_pack.feLkPK/_old 2020-04-27 23:30:49.194638041 +0200 +++ /var/tmp/diff_new_pack.feLkPK/_new 2020-04-27 23:30:49.198638049 +0200 @@ -77,6 +77,8 @@ # PATCH-FIX-OPENSUSE Patch6: some-more-includes-gcc10.patch Patch7: fix1163766.patch +# PATCH-FIX-UPSTREAM https://chromium-review.googlesource.com/c/v8/v8/+/2136489 +Patch8: icu-v67.patch # http://www.chromium.org/blink not ported to PowerPC ExcludeArch: ppc ppc64 ppc64le s390 s390x # Try to fix i586 MemoryErrors with rpmlint ++++++ icu-v67.patch ++++++ >From 3f8dc4b2e5baf77b463334c769af85b79d8c1463 Mon Sep 17 00:00:00 2001 From: Frank Tang <ft...@chromium.org> Date: Fri, 3 Apr 2020 23:13:54 -0700 Subject: [PATCH] [intl] Remove soon-to-be removed getAllFieldPositions Needed to land ICU67.1 soon. Bug: v8:10393 Change-Id: I3c7737ca600d6ccfdc46ffaddfb318ce60bc7618 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2136489 Reviewed-by: Jakob Kummerow <jkumme...@chromium.org> Commit-Queue: Frank Tang <ft...@chromium.org> Cr-Commit-Position: refs/heads/master@{#67027} Index: qtwebengine-everywhere-src-5.15.0-beta3/src/3rdparty/chromium/v8/src/objects/js-number-format.cc =================================================================== --- qtwebengine-everywhere-src-5.15.0-beta3.orig/src/3rdparty/chromium/v8/src/objects/js-number-format.cc +++ qtwebengine-everywhere-src-5.15.0-beta3/src/3rdparty/chromium/v8/src/objects/js-number-format.cc @@ -1187,42 +1187,31 @@ MaybeHandle<JSNumberFormat> JSNumberForm } namespace { -Maybe<icu::UnicodeString> IcuFormatNumber( +Maybe<bool> IcuFormatNumber( Isolate* isolate, const icu::number::LocalizedNumberFormatter& number_format, - Handle<Object> numeric_obj, icu::FieldPositionIterator* fp_iter) { + Handle<Object> numeric_obj, icu::number::FormattedNumber* formatted) { // If it is BigInt, handle it differently. UErrorCode status = U_ZERO_ERROR; - icu::number::FormattedNumber formatted; if (numeric_obj->IsBigInt()) { Handle<BigInt> big_int = Handle<BigInt>::cast(numeric_obj); Handle<String> big_int_string; ASSIGN_RETURN_ON_EXCEPTION_VALUE(isolate, big_int_string, BigInt::ToString(isolate, big_int), - Nothing<icu::UnicodeString>()); - formatted = number_format.formatDecimal( + Nothing<bool>()); + *formatted = number_format.formatDecimal( {big_int_string->ToCString().get(), big_int_string->length()}, status); } else { double number = numeric_obj->Number(); - formatted = number_format.formatDouble(number, status); + *formatted = number_format.formatDouble(number, status); } if (U_FAILURE(status)) { // This happen because of icu data trimming trim out "unit". // See https://bugs.chromium.org/p/v8/issues/detail?id=8641 - THROW_NEW_ERROR_RETURN_VALUE(isolate, - NewTypeError(MessageTemplate::kIcuError), - Nothing<icu::UnicodeString>()); - } - if (fp_iter) { - formatted.getAllFieldPositions(*fp_iter, status); + THROW_NEW_ERROR_RETURN_VALUE( + isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<bool>()); } - icu::UnicodeString result = formatted.toString(status); - if (U_FAILURE(status)) { - THROW_NEW_ERROR_RETURN_VALUE(isolate, - NewTypeError(MessageTemplate::kIcuError), - Nothing<icu::UnicodeString>()); - } - return Just(result); + return Just(true); } } // namespace @@ -1233,10 +1222,16 @@ MaybeHandle<String> JSNumberFormat::Form Handle<Object> numeric_obj) { DCHECK(numeric_obj->IsNumeric()); - Maybe<icu::UnicodeString> maybe_format = - IcuFormatNumber(isolate, number_format, numeric_obj, nullptr); + icu::number::FormattedNumber formatted; + Maybe<bool> maybe_format = + IcuFormatNumber(isolate, number_format, numeric_obj, &formatted); MAYBE_RETURN(maybe_format, Handle<String>()); - return Intl::ToString(isolate, maybe_format.FromJust()); + UErrorCode status = U_ZERO_ERROR; + icu::UnicodeString result = formatted.toString(status); + if (U_FAILURE(status)) { + THROW_NEW_ERROR(isolate, NewTypeError(MessageTemplate::kIcuError), String); + } + return Intl::ToString(isolate, result); } namespace { @@ -1349,12 +1344,18 @@ std::vector<NumberFormatSpan> FlattenReg } namespace { -Maybe<int> ConstructParts(Isolate* isolate, const icu::UnicodeString& formatted, - icu::FieldPositionIterator* fp_iter, +Maybe<int> ConstructParts(Isolate* isolate, + icu::number::FormattedNumber* formatted, Handle<JSArray> result, int start_index, Handle<Object> numeric_obj, bool style_is_unit) { + UErrorCode status = U_ZERO_ERROR; + icu::UnicodeString formatted_text = formatted->toString(status); + if (U_FAILURE(status)) { + THROW_NEW_ERROR_RETURN_VALUE( + isolate, NewTypeError(MessageTemplate::kIcuError), Nothing<int>()); + } DCHECK(numeric_obj->IsNumeric()); - int32_t length = formatted.length(); + int32_t length = formatted_text.length(); int index = start_index; if (length == 0) return Just(index); @@ -1363,13 +1364,14 @@ Maybe<int> ConstructParts(Isolate* isola // other region covers some part of the formatted string. It's possible // there's another field with exactly the same begin and end as this backdrop, // in which case the backdrop's field_id of -1 will give it lower priority. - regions.push_back(NumberFormatSpan(-1, 0, formatted.length())); + regions.push_back(NumberFormatSpan(-1, 0, formatted_text.length())); { - icu::FieldPosition fp; - while (fp_iter->next(fp)) { - regions.push_back(NumberFormatSpan(fp.getField(), fp.getBeginIndex(), - fp.getEndIndex())); + icu::ConstrainedFieldPosition cfp; + cfp.constrainCategory(UFIELD_CATEGORY_NUMBER); + while (formatted->nextPosition(cfp, status)) { + regions.push_back( + NumberFormatSpan(cfp.getField(), cfp.getStart(), cfp.getLimit())); } } @@ -1391,7 +1393,7 @@ Maybe<int> ConstructParts(Isolate* isola Handle<String> substring; ASSIGN_RETURN_ON_EXCEPTION_VALUE( isolate, substring, - Intl::ToString(isolate, formatted, part.begin_pos, part.end_pos), + Intl::ToString(isolate, formatted_text, part.begin_pos, part.end_pos), Nothing<int>()); Intl::AddElement(isolate, result, index, field_type_string, substring); ++index; @@ -1411,14 +1413,14 @@ MaybeHandle<JSArray> JSNumberFormat::For number_format->icu_number_formatter().raw(); CHECK_NOT_NULL(fmt); - icu::FieldPositionIterator fp_iter; - Maybe<icu::UnicodeString> maybe_format = - IcuFormatNumber(isolate, *fmt, numeric_obj, &fp_iter); + icu::number::FormattedNumber formatted; + Maybe<bool> maybe_format = + IcuFormatNumber(isolate, *fmt, numeric_obj, &formatted); MAYBE_RETURN(maybe_format, Handle<JSArray>()); Handle<JSArray> result = factory->NewJSArray(0); Maybe<int> maybe_format_to_parts = ConstructParts( - isolate, maybe_format.FromJust(), &fp_iter, result, 0, numeric_obj, + isolate, &formatted, result, 0, numeric_obj, number_format->style() == JSNumberFormat::Style::UNIT); MAYBE_RETURN(maybe_format_to_parts, Handle<JSArray>());
