From 9970ef441474be816765170081fbcf6b6132709f Mon Sep 17 00:00:00 2001 From: codicodi Date: Wed, 31 May 2017 17:43:19 +0200 Subject: [PATCH] [fontconfig] update to 2.12.3 --- ports/fontconfig/CMakeLists.txt | 4 +- ports/fontconfig/CONTROL | 2 +- ports/fontconfig/include/config.h | 153 ++++++++++++++++++++++---- ports/fontconfig/include/fcobjshash.h | 108 +++++++++--------- ports/fontconfig/include/fcstdint.h | 3 +- ports/fontconfig/portfile.cmake | 19 +++- 6 files changed, 204 insertions(+), 85 deletions(-) diff --git a/ports/fontconfig/CMakeLists.txt b/ports/fontconfig/CMakeLists.txt index ff1af19555..e32af9cbd4 100644 --- a/ports/fontconfig/CMakeLists.txt +++ b/ports/fontconfig/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -project(fontconfig) +project(fontconfig C) add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS) add_definitions(-FI"${FC_INCLUDE_DIR}/config.h") @@ -45,6 +45,8 @@ add_library(fontconfig src/fcxml.c src/ftglue.c) +set_target_properties(fontconfig PROPERTIES DEFINE_SYMBOL "FcPublic=__declspec(dllexport)") + target_include_directories(fontconfig PRIVATE . ${FC_INCLUDE_DIR} ${FREETYPE_INCLUDE_DIR} diff --git a/ports/fontconfig/CONTROL b/ports/fontconfig/CONTROL index ecb371f15d..85a72c3fc6 100644 --- a/ports/fontconfig/CONTROL +++ b/ports/fontconfig/CONTROL @@ -1,4 +1,4 @@ Source: fontconfig -Version: 2.12.1 +Version: 2.12.3 Description: Library for configuring and customizing font access. Build-Depends: freetype, expat, libiconv diff --git a/ports/fontconfig/include/config.h b/ports/fontconfig/include/config.h index 8f21dda010..0fbdead6e4 100644 --- a/ports/fontconfig/include/config.h +++ b/ports/fontconfig/include/config.h @@ -1,9 +1,21 @@ +/* config.h. Generated from config.h.in by configure. */ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Define if building universal (internal helper macro) */ +/* #undef AC_APPLE_UNIVERSAL_BUILD */ #define FC_CACHEDIR "./" /* The normal alignment of `double', in bytes. */ #define ALIGNOF_DOUBLE 8 +/* The normal alignment of `void *', in bytes. */ +#if defined(_WIN64) +#define ALIGNOF_VOID_P 8 +#else +#define ALIGNOF_VOID_P 4 +#endif + /* Use libxml2 instead of Expat */ /* #undef ENABLE_LIBXML2 */ @@ -14,7 +26,10 @@ /* #undef FC_ARCHITECTURE */ /* System font directory */ -#define FC_DEFAULT_FONTS "c:/windows/fonts" +#define FC_DEFAULT_FONTS "WINDOWSFONTDIR" + +/* The type of len parameter of the gperf hash/lookup function */ +#define FC_GPERF_SIZE_T size_t /* Define to nothing if C supports flexible array members, and to 1 if it does not. That way, with a declaration like `struct s { int n; double @@ -137,13 +152,6 @@ /* Define to 1 if you have the `readlink' function. */ /* #undef HAVE_READLINK */ -/* Define to 1 if you have the 'scandir' function. */ -/* #undef HAVE_SCANDIR */ - -/* Define to 1 if you have the 'scandir' function with int (* compar)(const - void *, const void *) */ -/* #undef HAVE_SCANDIR_VOID_P */ - /* Define to 1 if you have the header file. */ /* #undef HAVE_SCHED_H */ @@ -160,7 +168,7 @@ #define HAVE_STDLIB_H 1 /* Define to 1 if you have the header file. */ -/* #undef HAVE_STRINGS_H */ +#define HAVE_STRINGS_H 1 /* Define to 1 if you have the header file. */ #define HAVE_STRING_H 1 @@ -168,9 +176,6 @@ /* Define to 1 if `d_type' is a member of `struct dirent'. */ /* #undef HAVE_STRUCT_DIRENT_D_TYPE */ -/* Define to 1 if `st_mtim' is a member of `struct stat'. */ -/* #undef HAVE_STRUCT_STAT_ST_MTIM */ - /* Define to 1 if `f_flags' is a member of `struct statfs'. */ /* #undef HAVE_STRUCT_STATFS_F_FLAGS */ @@ -183,6 +188,9 @@ /* Define to 1 if `f_fstypename' is a member of `struct statvfs'. */ /* #undef HAVE_STRUCT_STATVFS_F_FSTYPENAME */ +/* Define to 1 if `st_mtim' is a member of `struct stat'. */ +/* #undef HAVE_STRUCT_STAT_ST_MTIM */ + /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_SYS_DIR_H */ @@ -190,8 +198,7 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_MOUNT_H */ -/* Define to 1 if you have the header file, and it defines `DIR'. - */ +/* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef HAVE_SYS_NDIR_H */ /* Define to 1 if you have the header file. */ @@ -200,6 +207,9 @@ /* Define to 1 if you have the header file. */ /* #undef HAVE_SYS_STATFS_H */ +/* Define to 1 if you have the header file. */ +/* #undef HAVE_SYS_STATVFS_H */ + /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 @@ -210,10 +220,10 @@ /* #undef HAVE_SYS_VFS_H */ /* Define to 1 if `usLowerOpticalPointSize' is a member of `TT_OS2'. */ -/* #undef HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE */ +#define HAVE_TT_OS2_USLOWEROPTICALPOINTSIZE 1 /* Define to 1 if `usUpperOpticalPointSize' is a member of `TT_OS2'. */ -/* #undef HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE */ +#define HAVE_TT_OS2_USUPPEROPTICALPOINTSIZE 1 /* Define to 1 if you have the header file. */ #define HAVE_UNISTD_H 1 @@ -233,24 +243,49 @@ /* Define to 1 if you have the `_mktemp_s' function. */ #define HAVE__MKTEMP_S 1 -/* Define to necessary symbol if this constant - uses a non-standard name on +/* Define to the sub-directory where libtool stores uninstalled libraries. */ +#define LT_OBJDIR ".libs/" + +/* Name of package */ +#define PACKAGE "fontconfig" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "fontconfig" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "fontconfig 2.12.3" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "fontconfig" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "2.12.3" + +/* Define to necessary symbol if this constant uses a non-standard name on your system. */ /* #undef PTHREAD_CREATE_JOINABLE */ /* The size of `char', as computed by sizeof. */ -#define SIZEOF_CHAR 1 +/* #undef SIZEOF_CHAR */ /* The size of `int', as computed by sizeof. */ -#define SIZEOF_INT 4 +/* #undef SIZEOF_INT */ /* The size of `long', as computed by sizeof. */ -#define SIZEOF_LONG 4 +/* #undef SIZEOF_LONG */ /* The size of `short', as computed by sizeof. */ -#define SIZEOF_SHORT 2 +/* #undef SIZEOF_SHORT */ /* The size of `void*', as computed by sizeof. */ +/* #undef SIZEOF_VOIDP */ + /* The size of `void *', as computed by sizeof. */ #if defined(_WIN64) #define SIZEOF_VOIDP 8 @@ -264,4 +299,76 @@ #define STDC_HEADERS 1 /* Use iconv. */ -#define USE_ICONV 1 \ No newline at end of file +#define USE_ICONV 1 + +/* Enable extensions on AIX 3, Interix. */ +#ifndef _ALL_SOURCE +# define _ALL_SOURCE 1 +#endif +/* Enable GNU extensions on systems that have them. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif +/* Enable threading extensions on Solaris. */ +#ifndef _POSIX_PTHREAD_SEMANTICS +# define _POSIX_PTHREAD_SEMANTICS 1 +#endif +/* Enable extensions on HP NonStop. */ +#ifndef _TANDEM_SOURCE +# define _TANDEM_SOURCE 1 +#endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# define __EXTENSIONS__ 1 +#endif + + +/* Version number of package */ +#define VERSION "2.12.3" + +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +/* # undef WORDS_BIGENDIAN */ +# endif +#endif + +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + +/* Number of bits in a file offset, on hosts where this is settable. */ +#define _FILE_OFFSET_BITS 64 + +/* Define for large files, on AIX-style hosts. */ +/* #undef _LARGE_FILES */ + +/* Define to 1 if on MINIX. */ +/* #undef _MINIX */ + +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +/* #undef _POSIX_1_SOURCE */ + +/* Define to 1 if you need to in order for `stat' and other things to work. */ +/* #undef _POSIX_SOURCE */ + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ + +/* Define to `__inline__' or `__inline' if that's what the C compiler + calls it, or to nothing if 'inline' is not supported under any name. */ +#ifndef __cplusplus +/* #undef inline */ +#endif + +/* Define to `int' if does not define. */ +/* #undef pid_t */ + +#include "config-fixups.h" diff --git a/ports/fontconfig/include/fcobjshash.h b/ports/fontconfig/include/fcobjshash.h index 1fe860a2f2..15829e8737 100644 --- a/ports/fontconfig/include/fcobjshash.h +++ b/ports/fontconfig/include/fcobjshash.h @@ -1,5 +1,5 @@ /* ANSI-C code produced by gperf version 3.0.4 */ -/* Command-line: gperf -m 100 src/fcobjshash.gperf */ +/* Command-line: gperf -m 100 fcobjshash.gperf */ /* Computed positions: -k'2-3' */ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ @@ -29,9 +29,9 @@ #error "gperf generated tables don't work with this execution character set. Please report a bug to ." #endif -#line 1 "src/fcobjshash.gperf" +#line 1 "fcobjshash.gperf" -#line 13 "src/fcobjshash.gperf" +#line 13 "fcobjshash.gperf" struct FcObjectTypeInfo { int name; int id; @@ -47,7 +47,7 @@ inline #endif #endif static unsigned int -FcObjectTypeHash (register const char *str, register unsigned int len) +FcObjectTypeHash (register const char *str, register FC_GPERF_SIZE_T len) { static const unsigned char asso_values[] = { @@ -191,7 +191,7 @@ __attribute__ ((__gnu_inline__)) #endif #endif const struct FcObjectTypeInfo * -FcObjectTypeLookup (register const char *str, register unsigned int len) +FcObjectTypeLookup (register const char *str, register FC_GPERF_SIZE_T len) { enum { @@ -205,106 +205,106 @@ FcObjectTypeLookup (register const char *str, register unsigned int len) static const struct FcObjectTypeInfo wordlist[] = { {-1}, {-1}, {-1}, {-1}, -#line 38 "src/fcobjshash.gperf" +#line 38 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str4,FC_FILE_OBJECT}, -#line 64 "src/fcobjshash.gperf" +#line 64 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str5,FC_COLOR_OBJECT}, {-1}, -#line 31 "src/fcobjshash.gperf" +#line 31 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str7,FC_FOUNDRY_OBJECT}, -#line 22 "src/fcobjshash.gperf" +#line 22 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str8,FC_FULLNAME_OBJECT}, -#line 29 "src/fcobjshash.gperf" +#line 29 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str9,FC_PIXEL_SIZE_OBJECT}, -#line 61 "src/fcobjshash.gperf" +#line 61 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str10,FC_PRGNAME_OBJECT}, {-1}, -#line 23 "src/fcobjshash.gperf" +#line 23 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str12,FC_FULLNAMELANG_OBJECT}, -#line 37 "src/fcobjshash.gperf" +#line 37 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str13,FC_GLOBAL_ADVANCE_OBJECT}, -#line 63 "src/fcobjshash.gperf" +#line 63 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str14,FC_POSTSCRIPT_NAME_OBJECT}, {-1}, -#line 34 "src/fcobjshash.gperf" +#line 34 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str16,FC_HINTING_OBJECT}, -#line 46 "src/fcobjshash.gperf" +#line 46 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str17,FC_MINSPACE_OBJECT}, -#line 33 "src/fcobjshash.gperf" +#line 33 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str18,FC_HINT_STYLE_OBJECT}, -#line 54 "src/fcobjshash.gperf" +#line 54 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str19,FC_FONTFORMAT_OBJECT}, -#line 52 "src/fcobjshash.gperf" +#line 52 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str20,FC_FONTVERSION_OBJECT}, -#line 60 "src/fcobjshash.gperf" +#line 60 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str21,FC_FONT_FEATURES_OBJECT}, -#line 41 "src/fcobjshash.gperf" +#line 41 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str22,FC_OUTLINE_OBJECT}, -#line 36 "src/fcobjshash.gperf" +#line 36 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str23,FC_AUTOHINT_OBJECT}, -#line 43 "src/fcobjshash.gperf" +#line 43 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str24,FC_DPI_OBJECT}, -#line 62 "src/fcobjshash.gperf" +#line 62 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str25,FC_HASH_OBJECT}, -#line 24 "src/fcobjshash.gperf" +#line 24 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str26,FC_SLANT_OBJECT}, -#line 28 "src/fcobjshash.gperf" +#line 28 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str27,FC_ASPECT_OBJECT}, -#line 27 "src/fcobjshash.gperf" +#line 27 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str28,FC_SIZE_OBJECT}, -#line 45 "src/fcobjshash.gperf" +#line 45 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str29,FC_SCALE_OBJECT}, -#line 65 "src/fcobjshash.gperf" +#line 65 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str30,FC_SYMBOL_OBJECT}, -#line 40 "src/fcobjshash.gperf" +#line 40 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str31,FC_RASTERIZER_OBJECT}, -#line 42 "src/fcobjshash.gperf" +#line 42 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str32,FC_SCALABLE_OBJECT}, -#line 32 "src/fcobjshash.gperf" +#line 32 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str33,FC_ANTIALIAS_OBJECT}, -#line 51 "src/fcobjshash.gperf" +#line 51 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str34,FC_LANG_OBJECT}, -#line 20 "src/fcobjshash.gperf" +#line 20 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str35,FC_STYLE_OBJECT}, -#line 18 "src/fcobjshash.gperf" +#line 18 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str36,FC_FAMILY_OBJECT}, -#line 44 "src/fcobjshash.gperf" +#line 44 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str37,FC_RGBA_OBJECT}, -#line 59 "src/fcobjshash.gperf" +#line 59 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str38,FC_NAMELANG_OBJECT}, -#line 21 "src/fcobjshash.gperf" +#line 21 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str39,FC_STYLELANG_OBJECT}, -#line 19 "src/fcobjshash.gperf" +#line 19 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str40,FC_FAMILYLANG_OBJECT}, -#line 26 "src/fcobjshash.gperf" +#line 26 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str41,FC_WIDTH_OBJECT}, -#line 49 "src/fcobjshash.gperf" +#line 49 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str42,FC_MATRIX_OBJECT}, -#line 50 "src/fcobjshash.gperf" +#line 50 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str43,FC_CHARSET_OBJECT}, {-1}, -#line 47 "src/fcobjshash.gperf" - {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHAR_WIDTH_OBJECT}, -#line 48 "src/fcobjshash.gperf" +#line 47 "fcobjshash.gperf" + {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str45,FC_CHARWIDTH_OBJECT}, +#line 48 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str46,FC_CHAR_HEIGHT_OBJECT}, -#line 55 "src/fcobjshash.gperf" +#line 55 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str47,FC_EMBOLDEN_OBJECT}, -#line 58 "src/fcobjshash.gperf" +#line 58 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str48,FC_LCD_FILTER_OBJECT}, -#line 30 "src/fcobjshash.gperf" +#line 30 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str49,FC_SPACING_OBJECT}, -#line 39 "src/fcobjshash.gperf" +#line 39 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str50,FC_INDEX_OBJECT}, -#line 25 "src/fcobjshash.gperf" +#line 25 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str51,FC_WEIGHT_OBJECT}, -#line 53 "src/fcobjshash.gperf" +#line 53 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str52,FC_CAPABILITY_OBJECT}, -#line 56 "src/fcobjshash.gperf" +#line 56 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str53,FC_EMBEDDED_BITMAP_OBJECT}, {-1}, {-1}, {-1}, {-1}, -#line 57 "src/fcobjshash.gperf" +#line 57 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str58,FC_DECORATIVE_OBJECT}, -#line 35 "src/fcobjshash.gperf" +#line 35 "fcobjshash.gperf" {(int)(long)&((struct FcObjectTypeNamePool_t *)0)->FcObjectTypeNamePool_str59,FC_VERTICAL_LAYOUT_OBJECT} }; diff --git a/ports/fontconfig/include/fcstdint.h b/ports/fontconfig/include/fcstdint.h index 1a8be6ef08..e317b2aa45 100644 --- a/ports/fontconfig/include/fcstdint.h +++ b/ports/fontconfig/include/fcstdint.h @@ -1,7 +1,8 @@ #ifndef _FONTCONFIG_SRC_FCSTDINT_H #define _FONTCONFIG_SRC_FCSTDINT_H 1 #ifndef _GENERATED_STDINT_H -#define _GENERATED_STDINT_H "fontconfig 2.12.1" +#define _GENERATED_STDINT_H "fontconfig 2.12.3" +/* generated using gnu compiler gcc.exe (Rev3, Built by MSYS2 project) 6.3.0 */ #define _STDINT_HAVE_STDINT_H 1 #include #endif diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 8755ad7338..ec3122d679 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -1,10 +1,11 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fontconfig-2.12.1) +set(FONTCONFIG_VERSION 2.12.3) +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/fontconfig-${FONTCONFIG_VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-2.12.1.tar.gz" - FILENAME "fontconfig-2.12.1.tar.gz" - SHA512 0959a80522e09551e49ec7b2383b7dfb319d4e1c058ad0b55bb35d3f675acbb7ff08c9c30a8798b731070687f84dd3d2ff7e28aafac6ecfa9d3f85c5847c0955) + URLS "https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.gz" + FILENAME "fontconfig-${FONTCONFIG_VERSION}.tar.gz" + SHA512 b17725c028be1c5e6f76c136b0ed7db1be7694cbbf217310083512708e05cdc1a824427f89082e6ef259c10297900f26cbe899f7c5762e7662855739f3eff5ea) # Download single-header implementation of dirent API for Windows and it's license vcpkg_download_distfile(DIRENT_H @@ -23,8 +24,8 @@ file(RENAME ${SOURCE_PATH}/fontconfig-dirent.h ${SOURCE_PATH}/dirent.h) vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA OPTIONS - -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON -DFC_INCLUDE_DIR=${CMAKE_CURRENT_LIST_DIR}/include OPTIONS_DEBUG -DFC_SKIP_TOOLS=ON @@ -33,6 +34,14 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_copy_pdbs() +if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) + foreach(HEADER fcfreetype.h fontconfig.h) + file(READ ${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} FC_HEADER) + string(REPLACE "#define FcPublic" "#define FcPublic __declspec(dllimport)" FC_HEADER "${FC_HEADER}") + file(WRITE ${CURRENT_PACKAGES_DIR}/include/fontconfig/${HEADER} "${FC_HEADER}") + endforeach() +endif() + file(COPY ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig) file(RENAME ${CURRENT_PACKAGES_DIR}/share/fontconfig/COPYING ${CURRENT_PACKAGES_DIR}/share/fontconfig/copyright) file(COPY ${DIRENT_LICENSE} DESTINATION ${CURRENT_PACKAGES_DIR}/share/fontconfig)