diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2020-11-17 18:18:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-17 09:18:59 -0800 |
| commit | 3a26eb3dc4d684ca6c1748dccc7a15684b9e8d0a (patch) | |
| tree | 8f48a1d104ab8329fa56ad5c49d1be1fb49b8ccd /ports/fontconfig/build.patch | |
| parent | 12ab060a3d43b56c6689ac7fe5861c6f9138c568 (diff) | |
| download | vcpkg-3a26eb3dc4d684ca6c1748dccc7a15684b9e8d0a.tar.gz vcpkg-3a26eb3dc4d684ca6c1748dccc7a15684b9e8d0a.zip | |
[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>
Diffstat (limited to 'ports/fontconfig/build.patch')
| -rw-r--r-- | ports/fontconfig/build.patch | 295 |
1 files changed, 295 insertions, 0 deletions
diff --git a/ports/fontconfig/build.patch b/ports/fontconfig/build.patch new file mode 100644 index 000000000..5b8c1b3a9 --- /dev/null +++ b/ports/fontconfig/build.patch @@ -0,0 +1,295 @@ +diff --git a/conf.d/Makefile.am b/conf.d/Makefile.am +index ff03fb2eb..769fc6005 100644 +--- a/conf.d/Makefile.am ++++ b/conf.d/Makefile.am +@@ -95,9 +95,9 @@ install-data-hook: + @(echo cd $(DESTDIR)$(configdir); \ + cd $(DESTDIR)$(configdir); \ + for i in $(CONF_LINKS); do \ +- echo $(RM) $$i";" ln -s $(templatedir)/$$i .; \ ++ echo $(RM) $$i";" $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \ + $(RM) $$i; \ +- ln -s $(templatedir)/$$i .; \ ++ $(LN_S) $(DESTDIR)$(templatedir)/$$i .; \ + done) + uninstall-local: + @(echo cd $(DESTDIR)$(configdir); \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 35e820d60..42bd7c5a2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -33,7 +33,7 @@ fontconfig_def_dependency = fontconfig.def + + install-libtool-import-lib: libfontconfig.la + $(MKDIR_P) $(DESTDIR)$(libdir) +- $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a ++# $(INSTALL) .libs/libfontconfig.dll.a $(DESTDIR)$(libdir)/libfontconfig.dll.a + $(INSTALL) fontconfig.def $(DESTDIR)$(libdir)/fontconfig.def + + uninstall-libtool-import-lib: +@@ -58,7 +58,8 @@ fontconfig.lib : libfontconfig.la + lib -name:libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll -def:fontconfig.def -out:$@ + + install-ms-import-lib: +- $(INSTALL) fontconfig.lib $(DESTDIR)$(libdir) ++ $(MKDIR_P) $(DESTDIR)$(libdir) ++ $(INSTALL) .libs/fontconfig.lib $(DESTDIR)$(libdir) + + uninstall-ms-import-lib: + $(RM) $(DESTDIR)$(libdir)/fontconfig.lib +diff --git a/fc-cache/fc-cache.c b/fc-cache/fc-cache.c +index 87e302083..8b5012110 100644 +--- a/fc-cache/fc-cache.c ++++ b/fc-cache/fc-cache.c +@@ -34,11 +34,20 @@ + #include <fontconfig/fontconfig.h> + #include <stdio.h> + #include <stdlib.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <sys/types.h> ++#if HAVE_SYS_STAT_H + #include <sys/stat.h> ++#endif + #include <errno.h> ++#if HAVE_FCNTL_H + #include <fcntl.h> ++#endif + #include <dirent.h> + #include <string.h> + #include <locale.h> +diff --git a/fc-cat/fc-cat.c b/fc-cat/fc-cat.c +index 69611bcc3..e7b0efbaa 100644 +--- a/fc-cat/fc-cat.c ++++ b/fc-cat/fc-cat.c +@@ -36,9 +36,16 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <sys/types.h> ++#if HAVE_SYS_STAT_H + #include <sys/stat.h> ++#endif + #include <errno.h> + #include <locale.h> + +diff --git a/fc-conflist/fc-conflist.c b/fc-conflist/fc-conflist.c +index 5c40a0f09..affaca09e 100644 +--- a/fc-conflist/fc-conflist.c ++++ b/fc-conflist/fc-conflist.c +@@ -35,7 +35,12 @@ + + #include <fontconfig/fontconfig.h> + #include <stdio.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include <locale.h> +diff --git a/fc-list/fc-list.c b/fc-list/fc-list.c +index 2039acd36..0e56b1c32 100644 +--- a/fc-list/fc-list.c ++++ b/fc-list/fc-list.c +@@ -24,7 +24,12 @@ + + #include <fontconfig/fontconfig.h> + #include <stdio.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include <locale.h> +diff --git a/fc-match/fc-match.c b/fc-match/fc-match.c +index dee61479d..da8d820aa 100644 +--- a/fc-match/fc-match.c ++++ b/fc-match/fc-match.c +@@ -33,7 +33,12 @@ + + #include <fontconfig/fontconfig.h> + #include <stdio.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include <locale.h> +diff --git a/fc-pattern/fc-pattern.c b/fc-pattern/fc-pattern.c +index 7989b816f..15b43e098 100644 +--- a/fc-pattern/fc-pattern.c ++++ b/fc-pattern/fc-pattern.c +@@ -33,7 +33,12 @@ + + #include <fontconfig/fontconfig.h> + #include <stdio.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include <locale.h> +diff --git a/fc-query/fc-query.c b/fc-query/fc-query.c +index fbffb8415..58c251fe3 100644 +--- a/fc-query/fc-query.c ++++ b/fc-query/fc-query.c +@@ -36,7 +36,12 @@ + #include <fontconfig/fontconfig.h> + #include <fontconfig/fcfreetype.h> + #include <stdio.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include <locale.h> +diff --git a/fc-scan/fc-scan.c b/fc-scan/fc-scan.c +index 9302ac559..3a0ccf188 100644 +--- a/fc-scan/fc-scan.c ++++ b/fc-scan/fc-scan.c +@@ -36,7 +36,12 @@ + #include <fontconfig/fontconfig.h> + #include <fontconfig/fcfreetype.h> + #include <stdio.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include <locale.h> +diff --git a/fc-validate/fc-validate.c b/fc-validate/fc-validate.c +index 2ceee2024..8f702f190 100644 +--- a/fc-validate/fc-validate.c ++++ b/fc-validate/fc-validate.c +@@ -36,7 +36,12 @@ + #include <fontconfig/fontconfig.h> + #include <fontconfig/fcfreetype.h> + #include <stdio.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <stdlib.h> + #include <string.h> + #include <locale.h> +diff --git a/src/fcatomic.c b/src/fcatomic.c +index d12d32408..da7234934 100644 +--- a/src/fcatomic.c ++++ b/src/fcatomic.c +@@ -50,7 +50,9 @@ + #include "fcint.h" + #include <sys/types.h> + #include <sys/stat.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif + #include <stdlib.h> + #include <time.h> + +diff --git a/src/fccache.c b/src/fccache.c +index 2b604014e..50fb742c6 100644 +--- a/src/fccache.c ++++ b/src/fccache.c +@@ -30,7 +30,9 @@ + #include <limits.h> + #include <sys/types.h> + #include <sys/stat.h> ++#ifndef _MSC_VER + #include <sys/time.h> ++#endif + #include <assert.h> + #if defined(HAVE_MMAP) || defined(__CYGWIN__) + # include <unistd.h> +diff --git a/src/fcint.h b/src/fcint.h +index de78cd8c9..4fb269ffa 100644 +--- a/src/fcint.h ++++ b/src/fcint.h +@@ -40,7 +40,18 @@ + #include <limits.h> + #include <float.h> + #include <math.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <direct.h> ++#include <io.h> ++#include <BaseTsd.h> ++#define ssize_t SSIZE_T ++#define F_OK 0 ++#define W_OK 2 ++typedef int mode_t; ++#endif + #include <stddef.h> + #include <sys/types.h> + #include <sys/stat.h> +diff --git a/test/test-migration.c b/test/test-migration.c +index b7d96dcce..7eac59dcc 100644 +--- a/test/test-migration.c ++++ b/test/test-migration.c +@@ -28,13 +28,16 @@ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <sys/types.h> + #include <dirent.h> + #ifndef HAVE_STRUCT_DIRENT_D_TYPE +-#include <sys/types.h> + #include <sys/stat.h> +-#include <unistd.h> + #endif + #include <fontconfig/fontconfig.h> + +diff --git a/test/test-pthread.c b/test/test-pthread.c +index fbf397d4c..38d7dea35 100644 +--- a/test/test-pthread.c ++++ b/test/test-pthread.c +@@ -24,7 +24,12 @@ + */ + #include <stdio.h> + #include <stdlib.h> ++#ifdef HAVE_UNISTD_H + #include <unistd.h> ++#endif ++#ifdef _MSC_VER ++#include <io.h> ++#endif + #include <pthread.h> + #include <fontconfig/fontconfig.h> + |
