diff --git a/mingw-qt5-qtwebkit.spec b/mingw-qt5-qtwebkit.spec index 801c029..682b683 100644 --- a/mingw-qt5-qtwebkit.spec +++ b/mingw-qt5-qtwebkit.spec @@ -21,7 +21,7 @@ Name: mingw-qt5-%{qt_module} Version: 5.212.0 -Release: 0.25%{?pre:.%pre}%{?commit:.git%{shortcommit}}%{?dist} +Release: 0.26%{?pre:.%pre}%{?commit:.git%{shortcommit}}%{?dist} Summary: Qt5 for Windows - QtWebKit component License: GPLv3 with exceptions or LGPLv2 with exceptions @@ -44,6 +44,8 @@ Patch4: qtwebkit-bison37.patch # From https://github.com/WebKit/WebKit/commit/c7d19a492d97f9282a546831beb918e03315f6ef # Ruby 3.2 removes Object#=~ completely Patch5: webkit-offlineasm-warnings-ruby27.patch +# Correctly test ICU return status with U_SUCCESS rather than comparing to U_ZERO_ERROR which fails on warnings +Patch6: qtwebkit_icu-success.patch BuildArch: noarch @@ -251,6 +253,9 @@ rmdir %{buildroot}%{mingw64_libdir}/qt5/bin/ %changelog +* Fri Jan 20 2023 Sandro Mani - 5.212.0-0.26.alpha4 +- Add qtwebkit_icu-success.patch + * Thu Jan 19 2023 Fedora Release Engineering - 5.212.0-0.25.alpha4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/qtwebkit_icu-success.patch b/qtwebkit_icu-success.patch new file mode 100644 index 0000000..3bdbceb --- /dev/null +++ b/qtwebkit_icu-success.patch @@ -0,0 +1,54 @@ +diff -rupN qtwebkit-5.212.0-alpha4/Source/WebCore/editing/TextIterator.cpp qtwebkit-5.212.0-alpha4-new/Source/WebCore/editing/TextIterator.cpp +--- qtwebkit-5.212.0-alpha4/Source/WebCore/editing/TextIterator.cpp 2020-03-04 18:16:37.000000000 +0100 ++++ qtwebkit-5.212.0-alpha4-new/Source/WebCore/editing/TextIterator.cpp 2023-01-20 12:44:22.038497915 +0100 +@@ -2050,10 +2050,10 @@ inline SearchBuffer::SearchBuffer(const + + UErrorCode status = U_ZERO_ERROR; + usearch_setAttribute(searcher, USEARCH_ELEMENT_COMPARISON, comparator, &status); +- ASSERT(status == U_ZERO_ERROR); ++ ASSERT(U_SUCCESS(status)); + + usearch_setPattern(searcher, m_targetCharacters, targetLength, &status); +- ASSERT(status == U_ZERO_ERROR); ++ ASSERT(U_SUCCESS(status)); + + // The kana workaround requires a normalized copy of the target string. + if (m_targetRequiresKanaWorkaround) +@@ -2065,9 +2065,9 @@ inline SearchBuffer::~SearchBuffer() + // Leave the static object pointing to a valid string. + UErrorCode status = U_ZERO_ERROR; + usearch_setPattern(WebCore::searcher(), &newlineCharacter, 1, &status); +- ASSERT(status == U_ZERO_ERROR); ++ ASSERT(U_SUCCESS(status)); + usearch_setText(WebCore::searcher(), &newlineCharacter, 1, &status); +- ASSERT(status == U_ZERO_ERROR); ++ ASSERT(U_SUCCESS(status)); + + unlockSearcher(); + } +@@ -2275,13 +2275,13 @@ inline size_t SearchBuffer::search(size_ + + UErrorCode status = U_ZERO_ERROR; + usearch_setText(searcher, m_buffer.data(), size, &status); +- ASSERT(status == U_ZERO_ERROR); ++ ASSERT(U_SUCCESS(status)); + + usearch_setOffset(searcher, m_prefixLength, &status); +- ASSERT(status == U_ZERO_ERROR); ++ ASSERT(U_SUCCESS(status)); + + int matchStart = usearch_next(searcher, &status); +- ASSERT(status == U_ZERO_ERROR); ++ ASSERT(U_SUCCESS(status)); + + nextMatch: + if (!(matchStart >= 0 && static_cast(matchStart) < size)) { +@@ -2316,7 +2316,7 @@ nextMatch: + || ((m_options & AtWordStarts) && !isWordStartMatch(matchStart, matchedLength)) + || ((m_options & AtWordEnds) && !isWordEndMatch(matchStart, matchedLength))) { + matchStart = usearch_next(searcher, &status); +- ASSERT(status == U_ZERO_ERROR); ++ ASSERT(U_SUCCESS(status)); + goto nextMatch; + } +