Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package icu for openSUSE:Factory checked in at 2021-11-24 23:54:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/icu (Old) and /work/SRC/openSUSE:Factory/.icu.new.1895 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "icu" Wed Nov 24 23:54:13 2021 rev:83 rq:933062 version:70.1 Changes: -------- --- /work/SRC/openSUSE:Factory/icu/icu.changes 2021-11-20 22:47:56.931878414 +0100 +++ /work/SRC/openSUSE:Factory/.icu.new.1895/icu.changes 2021-11-24 23:54:22.392499021 +0100 @@ -1,0 +2,6 @@ +Mon Nov 22 10:22:02 UTC 2021 - Andreas Schwab <sch...@suse.de> + +- Add fix-ucptrietest-golden-diff.patch: ICU-21793 Fix + ucptrietest golden diff [boo#1192935] + +------------------------------------------------------------------- New: ---- fix-ucptrietest-golden-diff.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ icu.spec ++++++ --- /var/tmp/diff_new_pack.JxXCjd/_old 2021-11-24 23:54:23.208496282 +0100 +++ /var/tmp/diff_new_pack.JxXCjd/_new 2021-11-24 23:54:23.208496282 +0100 @@ -45,6 +45,7 @@ Patch7: icu-avoid-x87-excess-precision.diff Patch8: locale.diff Patch9: nan-undefined-conversion.patch +Patch10: fix-ucptrietest-golden-diff.patch BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: pkg-config ++++++ fix-ucptrietest-golden-diff.patch ++++++ >From 698efda42bb21a9da1c92348d3e73466c8a528fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Lal?= <kapo...@melix.org> Date: Wed, 3 Nov 2021 02:31:18 +0100 Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff References: https://bugzilla.opensuse.org/show_bug.cgi?id=1192935 --- icu4c/source/tools/toolutil/toolutil.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/icu4c/source/tools/toolutil/toolutil.cpp b/icu4c/source/tools/toolutil/toolutil.cpp index 1fc68aa69c..a9dc37377a 100644 --- icu4c/source/tools/toolutil/toolutil.cpp +++ icu4c/source/tools/toolutil/toolutil.cpp @@ -228,18 +228,19 @@ uprv_compareGoldenFiles( std::ifstream ifs(goldenFilePath, std::ifstream::in); int32_t pos = 0; char c; - while ((c = ifs.get()) != std::char_traits<char>::eof() && pos < bufferLen) { + while (ifs.get(c) && pos < bufferLen) { if (c != buffer[pos]) { // Files differ at this position - return pos; + break; } pos++; } - if (pos < bufferLen || c != std::char_traits<char>::eof()) { - // Files are different lengths - return pos; + if (pos == bufferLen && ifs.eof()) { + // Files are same lengths + pos = -1; } - return -1; + ifs.close(); + return pos; } /*U_CAPI UDate U_EXPORT2 -- 2.34.0
