[fontconfig] Fix FC_TEMPLATEDIR (#34430)

This commit is contained in:
Osyotr 2023-10-13 21:04:39 +03:00 committed by GitHub
parent d79815eed6
commit 582472e604
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 2 deletions

View File

@ -20,7 +20,8 @@ vcpkg_configure_meson(
-Dcache-build=disabled
-Dtests=disabled
)
#https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
# https://www.freedesktop.org/software/fontconfig/fontconfig-user.html
# Adding OPTIONS for e.g. baseconfig-dir etc. won't work since meson will try to install into those dirs!
# Since adding OPTIONS does not work use a replacement in the generated config.h instead
set(replacement "")
@ -29,9 +30,11 @@ if(VCPKG_TARGET_IS_WINDOWS)
endif()
set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h")
vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}" "${replacement}")
vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"")
if(NOT VCPKG_BUILD_TYPE)
set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.h")
vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}/debug" "${replacement}")
vcpkg_replace_string("${configfile}" "#define FC_TEMPLATEDIR \"/share/fontconfig/conf.avail\"" "#define FC_TEMPLATEDIR \"/usr/share/fontconfig/conf.avail\"")
endif()
vcpkg_install_meson(ADD_BIN_TO_PATH)

View File

@ -1,6 +1,7 @@
{
"name": "fontconfig",
"version": "2.14.2",
"port-version": 1,
"description": "Library for configuring and customizing font access.",
"homepage": "https://www.freedesktop.org/wiki/Software/fontconfig",
"license": "MIT",

View File

@ -2674,7 +2674,7 @@
},
"fontconfig": {
"baseline": "2.14.2",
"port-version": 0
"port-version": 1
},
"foonathan-lexy": {
"baseline": "2022.12.1",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "de73339d579963e68fed652ed2e206b307a0c03f",
"version": "2.14.2",
"port-version": 1
},
{
"git-tree": "26490bc4c9aa1377da98980ba6e1089525fdaa55",
"version": "2.14.2",