diff options
author | Sam Bingner <sam@bingner.com> | 2019-05-08 14:23:47 -1000 |
---|---|---|
committer | Sam Bingner <sam@bingner.com> | 2019-05-08 14:23:47 -1000 |
commit | f8c9a51e12a39036aa22217f6cf65c16d686e23b (patch) | |
tree | 9183be0fb3452e378e544651e1b2f578e9980b95 /data/cmake/locale.diff | |
parent | 0bbd60daa93c408aafcfb84c769528c9c4edfed3 (diff) |
Updates for cmake
Diffstat (limited to 'data/cmake/locale.diff')
-rw-r--r-- | data/cmake/locale.diff | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/data/cmake/locale.diff b/data/cmake/locale.diff new file mode 100644 index 000000000..161b61df8 --- /dev/null +++ b/data/cmake/locale.diff @@ -0,0 +1,27 @@ +diff -ur cmake-3.14.2/Source/CPack/cmCPackDragNDropGenerator.cxx cmake-3.14.2+iPhone/Source/CPack/cmCPackDragNDropGenerator.cxx +--- cmake-3.14.2/Source/CPack/cmCPackDragNDropGenerator.cxx 2019-04-12 02:10:08.000000000 -1000 ++++ cmake-3.14.2+iPhone/Source/CPack/cmCPackDragNDropGenerator.cxx 2019-05-08 11:42:41.000000000 -1000 +@@ -22,6 +22,7 @@ + // to the old Script Manager RegionCode values needed for the 'LPic' data + // structure used for generating multi-lingual SLAs. + # include <CoreServices/CoreServices.h> ++# include <CoreFoundation/CFPriv.h> + #endif + + static const char* SLAHeader = +@@ -575,10 +576,12 @@ + kCFStringEncodingMacRoman); + LangCode lang = 0; + RegionCode region = 0; ++ ScriptCode script = 0; ++ CFStringEncoding encoding = 0; + #ifdef HAVE_CoreServices +- OSStatus err = +- LocaleStringToLangAndRegionCodes(iso_language_cstr, &lang, ®ion); +- if (err != noErr) ++ Boolean ok = ++ CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(iso_language, &lang, ®ion, &script, &encoding); ++ if (!ok) + #endif + { + cmCPackLogger(cmCPackLog::LOG_ERROR, |