mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 06:29:05 +08:00
3a26eb3dc4
* [fontconfig] update fontconfig * [libiconv] update to make * [gettext] update to make * [vcpkg_configure_make] Changes considering pure configure ports without the requirement to run autoconfig * [fontconfig] make it work on windows * Remove install of unofficial cmake config * add function get_cmake_vars * fine tuning. * apply to make based ports. * add log suffix on not windows platforms * fix c&p error * add previous LINK env * setup env on windows and extract cpp flags correctly. * update glib and libxml2 * fix windows regressions * Apply suggestions from code review * add windres wrapper to invoke RC. * remove wrong fi * fix libintl. * try fixing uwp * other things to update * exiv2 fix * libtool does not like -RTC1 * pass the /RTC<x> flag directly to the compiler * trust cmake instead of adding extra flags * fix expat * fix iconv wrapper install * change fontconfig intl linkage. * add appcontainer back in which is required for UWP. Why is this not in the cmake flags? * fix pkg-config in vcpkg_configure_make * fix json-c pkg-config installation * remove remnoved config * comment out debug messages + bit of tuning * finally fontconfig * comment debug messages * expat apply extra patches. * Switch back to -E instead of -EP in cpp * commit changes from fontconfig PR * [expat] fix expat details * Apply suggestions from code review Co-authored-by: nicole mazzuca <mazzucan@outlook.com> * cleanup docs * update osx pipeline so that fontconfig actually builds * fix expat the lazy way by using a higher commit than release * fix a barage of regressions due to the use of unofficial targets * [expat] use a higher commit hash with a better stabilized cmake build * forgot freexl regression * more unofficial fixes * fix downstream expat usage * fix wxwidgets * fix gcdm regression * [vtk] fix the regression due to expat * add uwp cl flags back in. Somehow those are not set by cmake * add a few other configure options for full gettext build * fix cmake regression * fix a few regressions * fix static gettext build * fix gettext static * fix libxml2 wrapper for cmake * some more regressions fixes * add conversion from somelib.lib to -lsomelib * add a few option to libiconv. * get logs from CI * add missing ar-lib wrapper * add missing ar-lib wrapper * add fatal error to gettext * remove uuid from the list of LIBS since it seems to not exist in CI? * small but important regex correction * fix regex and add debug message for libs * remove error and only build libintl. * add uuid dependency to fontconfig in qt5-base * osx install gettext for autopoint * fix io2d regression by saying the port is broken ..... (which it is; upstream needs to learn proper cmake) * restore the old libxml2 wrapper with minor modifications * fix xmlsec regression * install wrapper correctly * try actual fixing io2d * improve iconv wrapper * add latest changes from update_fontconfig PR * Apply suggestions from code review first set which don't need special attention Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Apply suggestions from code review one more simple change Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * [x264] set env AS * fix bugs due to refactor * use subpath everywhere * apply changes from CR * fix fontconfig build. * only change libs in static builds * remove unnecessary lines 41 & 44 * remove flag transformation * reintroduce the flag / to - transformation for MSVC * trying to figure out autopoint issue. using wrong (windows) find.exe instead of msys * add correct working_dir to subpath * escape stupid env paths. * fix typo * add findutils remove debug messages * add error if libtool chokes * add file to msys * pass lt_cv_deplibs_check_method=pass_all on windows (couldn't get file.exe to work so that libtool correctly ids the passed libs) * add bzip2 to msys * reenable libtool check. Lets see if CI agrees * unbreak linux try to figure out where uuid should be on windows. * add -L flag and help libtool ? * try to get ci to find uuid. * try to use cygpath * update controls * cleanup merge mistakes * correct merge issues * determine cmake vars if not done before. * move adding of -l earlier * more merge cleanup * fix uwp builds by not transforming libs * fix patches in io2d * fix xz download error * apply code review changes manually * fix the typos left behind in CR Co-authored-by: nicole mazzuca <mazzucan@outlook.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
81 lines
2.3 KiB
Diff
81 lines
2.3 KiB
Diff
diff --git "a/gettext-runtime/intl/langprefs.c" "b/gettext-runtime/intl/langprefs.c"
|
|
index aeb1c4e9..2ac531be 100644
|
|
--- "a/gettext-runtime/intl/langprefs.c"
|
|
+++ "b/gettext-runtime/intl/langprefs.c"
|
|
@@ -33,7 +33,13 @@ extern void _nl_locale_name_canonicalize (char *name);
|
|
#endif
|
|
|
|
#if defined _WIN32
|
|
-# define WIN32_NATIVE
|
|
+# if !defined(WINAPI_FAMILY)
|
|
+# define WIN32_NATIVE
|
|
+# else
|
|
+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
|
|
+# define WIN32_NATIVE
|
|
+# endif
|
|
+# endif
|
|
#endif
|
|
|
|
#ifdef WIN32_NATIVE
|
|
diff --git "a/gettext-runtime/intl/localcharset.c" "b/gettext-runtime/intl/localcharset.c"
|
|
index 670b8e6c..035a96bd 100644
|
|
--- "a/gettext-runtime/intl/localcharset.c"
|
|
+++ "b/gettext-runtime/intl/localcharset.c"
|
|
@@ -36,6 +36,16 @@
|
|
# include <locale.h>
|
|
#endif
|
|
|
|
+#if defined _WIN32
|
|
+# if !defined(WINAPI_FAMILY)
|
|
+# define HAVE_ACP
|
|
+# else
|
|
+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
|
|
+# define HAVE_ACP
|
|
+# endif
|
|
+# endif
|
|
+#endif
|
|
+
|
|
#if defined __EMX__
|
|
/* Assume EMX program runs on OS/2, even if compiled under DOS. */
|
|
# ifndef OS2
|
|
@@ -830,7 +830,7 @@ STATIC
|
|
const char *
|
|
locale_charset (void)
|
|
{
|
|
- const char *codeset;
|
|
+ const char *codeset = NULL;
|
|
|
|
/* This function must be multithread-safe. To achieve this without using
|
|
thread-local storage, we use a simple strcpy or memcpy to fill this static
|
|
@@ -912,7 +912,7 @@ locale_charset (void)
|
|
/* The canonical name cannot be determined. */
|
|
codeset = "";
|
|
|
|
-# elif defined WINDOWS_NATIVE
|
|
+# elif defined WINDOWS_NATIVE && defined HAVE_ACP
|
|
|
|
char buf[2 + 10 + 1];
|
|
static char resultbuf[2 + 10 + 1];
|
|
diff --git "a/gettext-runtime/intl/localename.c" "b/gettext-runtime/intl/localename.c"
|
|
index 108dd6f1..ace3aa88 100644
|
|
--- "a/gettext-runtime/intl/localename.c"
|
|
+++ "b/gettext-runtime/intl/localename.c"
|
|
@@ -75,10 +75,16 @@
|
|
#endif
|
|
|
|
#if defined _WIN32 && !defined __CYGWIN__
|
|
-# define WINDOWS_NATIVE
|
|
+# if !defined(WINAPI_FAMILY)
|
|
+# define WINDOWS_NATIVE
|
|
+# else
|
|
+# if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_DESKTOP | WINAPI_PARTITION_SYSTEM)
|
|
+# define WINDOWS_NATIVE
|
|
+# endif
|
|
+# endif
|
|
# if !defined IN_LIBINTL
|
|
# include "glthread/lock.h"
|
|
# endif
|
|
#endif
|
|
|
|
#if defined WINDOWS_NATIVE || defined __CYGWIN__ /* Native Windows or Cygwin */
|