From 739c65c54cb0e957df5e9b76f93fb02554e5cac3 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 4 May 2022 23:52:30 +0100 Subject: moved everything to new file formatting --- repo/system/icu/fix-ucptrietest-golden-diff.patch | 33 ++++++++++++++++++++++ repo/system/icu/icu.xibuild | 34 +++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 repo/system/icu/fix-ucptrietest-golden-diff.patch create mode 100644 repo/system/icu/icu.xibuild (limited to 'repo/system/icu') diff --git a/repo/system/icu/fix-ucptrietest-golden-diff.patch b/repo/system/icu/fix-ucptrietest-golden-diff.patch new file mode 100644 index 0000000..1b8082e --- /dev/null +++ b/repo/system/icu/fix-ucptrietest-golden-diff.patch @@ -0,0 +1,33 @@ +Patch-Source: https://github.com/unicode-org/icu/pull/1925 +Subject: [PATCH] ICU-21793 Fix ucptrietest golden diff + +diff --git a/icu4c/source/tools/toolutil/toolutil.cpp b/icu4c/source/tools/toolutil/toolutil.cpp +index 1fc68aa69c8..a9dc37377a8 100644 +--- a/tools/toolutil/toolutil.cpp ++++ b/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::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::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 diff --git a/repo/system/icu/icu.xibuild b/repo/system/icu/icu.xibuild new file mode 100644 index 0000000..0d8d798 --- /dev/null +++ b/repo/system/icu/icu.xibuild @@ -0,0 +1,34 @@ +#!/bin/sh + +MAKEDEPS="python" +DEPS="bash" + +PKG_VER=71.1 +SOURCE=https://github.com/unicode-org/icu/releases/download/release-$(echo $PKG_VER | sed 's/\./-/g')/icu4c-$(echo $PKG_VER | sed 's/\./_/g')-src.tgz +DESC="International Components for Unicode library" +ADDITIONAL=" +fix-ucptrietest-golden-diff.patch +" + +prepare () { + cd source + autoreconf -fi + sed -i -e 's,DU_HAVE_STRTOD_L=1,DU_HAVE_STRTOD_L=0,' configure +} + +build () { + ./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --with-data-packaging=library \ + --disable-samples \ + --mandir=/usr/share/man + + mkdir -p data/out + make + +} + +package () { + make DESTDIR=$PKG_DEST install +} -- cgit v1.2.1