mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 10:21:07 +08:00
fix freetype for macOS (#4774)
* added patch to freetype for assigning a value to macros like HAVE_UNISTD_H as using newer macOS Frameworks fail to compile if they have no value * [freetype] Modernize. Bump control version
This commit is contained in:
parent
181a7bef8d
commit
f3ccca08f5
23
ports/freetype/0004-Fix-macOS-defines.patch
Normal file
23
ports/freetype/0004-Fix-macOS-defines.patch
Normal file
@ -0,0 +1,23 @@
|
||||
--- a/CMakeLists.txt 2018-11-16 10:49:22.000000000 +0100
|
||||
+++ b/CMakeLists.txt 2018-11-16 10:50:26.000000000 +0100
|
||||
@@ -200,17 +200,17 @@
|
||||
FTCONFIG_H)
|
||||
if (HAVE_UNISTD_H)
|
||||
string(REGEX REPLACE
|
||||
- "#undef +(HAVE_UNISTD_H)" "#define \\1"
|
||||
+ "#undef +(HAVE_UNISTD_H)" "#define \\1 1"
|
||||
FTCONFIG_H "${FTCONFIG_H}")
|
||||
endif ()
|
||||
if (HAVE_FCNTL_H)
|
||||
string(REGEX REPLACE
|
||||
- "#undef +(HAVE_FCNTL_H)" "#define \\1"
|
||||
+ "#undef +(HAVE_FCNTL_H)" "#define \\1 1"
|
||||
FTCONFIG_H "${FTCONFIG_H}")
|
||||
endif ()
|
||||
if (HAVE_STDINT_H)
|
||||
string(REGEX REPLACE
|
||||
- "#undef +(HAVE_STDINT_H)" "#define \\1"
|
||||
+ "#undef +(HAVE_STDINT_H)" "#define \\1 1"
|
||||
FTCONFIG_H "${FTCONFIG_H}")
|
||||
endif ()
|
||||
string(REPLACE "/undef " "#undef "
|
@ -1,4 +1,4 @@
|
||||
Source: freetype
|
||||
Version: 2.8.1-3
|
||||
Version: 2.8.1-4
|
||||
Build-Depends: zlib, bzip2, libpng
|
||||
Description: A library to render fonts.
|
||||
|
@ -1,18 +1,20 @@
|
||||
include(vcpkg_common_functions)
|
||||
|
||||
set(FT_VERSION 2.8.1)
|
||||
set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/freetype-${FT_VERSION})
|
||||
vcpkg_download_distfile(ARCHIVE
|
||||
URLS "https://download-mirror.savannah.gnu.org/releases/freetype/freetype-${FT_VERSION}.tar.bz2"
|
||||
FILENAME "freetype-${FT_VERSION}.tar.bz2"
|
||||
SHA512 ca59e47f0fceeeb9b8032be2671072604d0c79094675df24187829c05e99757d0a48a0f8062d4d688e056f783aa8f6090d732ad116562e94784fccf1339eb823
|
||||
)
|
||||
vcpkg_extract_source_archive(${ARCHIVE})
|
||||
|
||||
vcpkg_apply_patches(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PATCHES ${CMAKE_CURRENT_LIST_DIR}/0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch
|
||||
${CMAKE_CURRENT_LIST_DIR}/0002-Add-CONFIG_INSTALL_PATH-option.patch
|
||||
${CMAKE_CURRENT_LIST_DIR}/0003-Fix-UWP.patch
|
||||
vcpkg_extract_source_archive_ex(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
ARCHIVE ${ARCHIVE}
|
||||
REF ${FT_VERSION}
|
||||
PATCHES
|
||||
0001-Support-Windows-DLLs-via-CMAKE_WINDOWS_EXPORT_ALL_SY.patch
|
||||
0002-Add-CONFIG_INSTALL_PATH-option.patch
|
||||
0003-Fix-UWP.patch
|
||||
0004-Fix-macOS-defines.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
|
Loading…
x
Reference in New Issue
Block a user