mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-30 18:41:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
6982e51269
vcpkg/ports/gettext/uwp_remove_localcharset.patch

80 lines
4.4 KiB
Diff
Raw Normal View History

[intl/gettext/fontconfig] update to native build system (#11776) * [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>
2020-11-18 01:18:59 +08:00
diff --git a/gettext-runtime/intl/Makefile.in b/gettext-runtime/intl/Makefile.in
index 7999d3456..b3ef40340 100644
--- a/gettext-runtime/intl/Makefile.in
+++ b/gettext-runtime/intl/Makefile.in
@@ -252,7 +252,7 @@ am__libgnuintl_la_SOURCES_DIST = bindtextdom.c dcgettext.c dgettext.c \
gettext.c finddomain.c hash-string.c loadmsgcat.c \
localealias.c textdomain.c l10nflist.c explodename.c \
dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
- plural-exp.c localcharset.c threadlib.c lock.c relocatable.c \
+ plural-exp.c threadlib.c lock.c relocatable.c \
langprefs.c localename.c localename-table.c log.c printf.c \
setlocale.c setlocale-lock.c setlocale_null.c version.c \
xsize.c osdep.c intl-compat.c windows-mutex.c windows-rwlock.c \
@@ -264,7 +264,7 @@ am__objects_2 = bindtextdom.lo dcgettext.lo dgettext.lo gettext.lo \
finddomain.lo hash-string.lo loadmsgcat.lo localealias.lo \
textdomain.lo l10nflist.lo explodename.lo dcigettext.lo \
dcngettext.lo dngettext.lo ngettext.lo plural.lo plural-exp.lo \
- localcharset.lo threadlib.lo lock.lo relocatable.lo \
+ threadlib.lo lock.lo relocatable.lo \
langprefs.lo localename.lo localename-table.lo log.lo \
printf.lo setlocale.lo setlocale-lock.lo setlocale_null.lo \
version.lo xsize.lo osdep.lo intl-compat.lo $(am__objects_1)
@@ -282,7 +282,7 @@ am__libintl_la_SOURCES_DIST = bindtextdom.c dcgettext.c dgettext.c \
gettext.c finddomain.c hash-string.c loadmsgcat.c \
localealias.c textdomain.c l10nflist.c explodename.c \
dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \
- plural-exp.c localcharset.c threadlib.c lock.c relocatable.c \
+ plural-exp.c threadlib.c lock.c relocatable.c \
langprefs.c localename.c localename-table.c log.c printf.c \
setlocale.c setlocale-lock.c setlocale_null.c version.c \
xsize.c osdep.c intl-compat.c windows-mutex.c windows-rwlock.c \
@@ -1387,7 +1387,7 @@ AUTOMAKE_OPTIONS = 1.10 gnu no-dependencies
# Miscellaneous files.
EXTRA_DIST = gmo.h gettextP.h hash-string.h loadinfo.h plural-exp.h \
- eval-plural.h localcharset.h lock.h windows-mutex.h \
+ eval-plural.h lock.h windows-mutex.h \
windows-rwlock.h windows-recmutex.h windows-once.h \
windows-initguard.h relocatable.h arg-nonnull.h attribute.h \
filename.h flexmember.h localename-table.in.h setlocale_null.h \
@@ -1543,7 +1543,7 @@ LIBINTLSOURCES = bindtextdom.c dcgettext.c dgettext.c gettext.c \
finddomain.c hash-string.c loadmsgcat.c localealias.c \
textdomain.c l10nflist.c explodename.c dcigettext.c \
dcngettext.c dngettext.c ngettext.c plural.y plural-exp.c \
- localcharset.c threadlib.c lock.c relocatable.c langprefs.c \
+ threadlib.c lock.c relocatable.c langprefs.c \
localename.c localename-table.c log.c printf.c setlocale.c \
setlocale-lock.c setlocale_null.c version.c xsize.c osdep.c \
intl-compat.c $(am__append_2)
@@ -2016,8 +2016,6 @@ plural.lo: $(srcdir)/plural.c
$(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/plural.c
plural-exp.lo: $(srcdir)/plural-exp.c
$(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/plural-exp.c
-localcharset.lo: $(srcdir)/localcharset.c
- $(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/localcharset.c
threadlib.lo: $(srcdir)/threadlib.c
$(AM_V_CC)$(LTCOMPILE) -c -o $@ $(srcdir)/threadlib.c
lock.lo: $(srcdir)/lock.c
@@ -2074,7 +2072,6 @@ dngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo
ngettext.lo: ../config.h $(srcdir)/gettextP.h libgnuintl.h $(srcdir)/gmo.h $(srcdir)/loadinfo.h $(srcdir)/lock.h $(srcdir)/windows-mutex.h $(srcdir)/windows-rwlock.h $(srcdir)/windows-recmutex.h $(srcdir)/windows-once.h $(srcdir)/windows-initguard.h
plural.lo: ../config.h $(srcdir)/plural-exp.h $(PLURAL_DEPS)
plural-exp.lo: ../config.h $(srcdir)/plural-exp.h
-localcharset.lo: ../config.h $(srcdir)/localcharset.h
threadlib.lo: ../config.h
lock.lo: ../config.h $(srcdir)/lock.h $(srcdir)/windows-mutex.h $(srcdir)/windows-rwlock.h $(srcdir)/windows-recmutex.h $(srcdir)/windows-once.h $(srcdir)/windows-initguard.h
relocatable.lo: ../config.h $(srcdir)/relocatable.h
diff --git a/gettext-runtime/intl/localcharset.c b/gettext-runtime/intl/localcharset.c
index 1a1627888..3e6582f17 100644
--- a/gettext-runtime/intl/localcharset.c
+++ b/gettext-runtime/intl/localcharset.c
@@ -1021,7 +1021,7 @@ locale_charset (void)
# else
-# error "Add code for other platforms here."
+//# error "Add code for other platforms here."
# endif
Reference in New Issue Copy Permalink