From a080f7b135aef9d527d2b7192c8aeda6767d627d Mon Sep 17 00:00:00 2001 From: Johannes Date: Sat, 27 Oct 2018 23:08:11 +0200 Subject: [PATCH] icu: add patch for checkImpl to be static --- srcpkgs/icu/patches/checkImpl.patch | 26 ++++++++++++++++++++++++++ srcpkgs/icu/template | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/icu/patches/checkImpl.patch diff --git a/srcpkgs/icu/patches/checkImpl.patch b/srcpkgs/icu/patches/checkImpl.patch new file mode 100644 index 00000000000..ae7b66c8e08 --- /dev/null +++ b/srcpkgs/icu/patches/checkImpl.patch @@ -0,0 +1,26 @@ +diff --git a/icu4c/source/common/unicode/urename.h b/icu4c/source/common/unicode/urename.h +index 5812173e39c..0512be3b6e5 100644 +--- source/common/unicode/urename.h ++++ source/common/unicode/urename.h +@@ -110,7 +110,6 @@ + #define _UTF7Data U_ICU_ENTRY_POINT_RENAME(_UTF7Data) + #define _UTF8Data U_ICU_ENTRY_POINT_RENAME(_UTF8Data) + #define allowedHourFormatsCleanup U_ICU_ENTRY_POINT_RENAME(allowedHourFormatsCleanup) +-#define checkImpl U_ICU_ENTRY_POINT_RENAME(checkImpl) + #define cmemory_cleanup U_ICU_ENTRY_POINT_RENAME(cmemory_cleanup) + #define dayPeriodRulesCleanup U_ICU_ENTRY_POINT_RENAME(dayPeriodRulesCleanup) + #define deleteAllowedHourFormats U_ICU_ENTRY_POINT_RENAME(deleteAllowedHourFormats) +diff --git a/icu4c/source/i18n/uspoof.cpp b/icu4c/source/i18n/uspoof.cpp +index 8e3d69ede2b..66f228f037a 100644 +--- source/i18n/uspoof.cpp ++++ source/i18n/uspoof.cpp +@@ -547,7 +547,7 @@ uspoof_checkUnicodeString(const USpoofChecker *sc, + return uspoof_check2UnicodeString(sc, id, NULL, status); + } + +-int32_t checkImpl(const SpoofImpl* This, const UnicodeString& id, CheckResult* checkResult, UErrorCode* status) { ++static int32_t checkImpl(const SpoofImpl* This, const UnicodeString& id, CheckResult* checkResult, UErrorCode* status) { + U_ASSERT(This != NULL); + U_ASSERT(checkResult != NULL); + checkResult->clear(); + diff --git a/srcpkgs/icu/template b/srcpkgs/icu/template index 236f4541b2d..8b3a5c132dc 100644 --- a/srcpkgs/icu/template +++ b/srcpkgs/icu/template @@ -1,7 +1,7 @@ # Template file for 'icu' pkgname=icu version=63.1 -revision=1 +revision=2 wrksrc=icu build_wrksrc=source build_style=gnu-configure