diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index bcd40e931efee2..0f482b303ff434 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -23,6 +23,20 @@ vcpkg_configure_meson( -Dcache-build=disabled -Dtests=disabled ) +#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 "") +if(VCPKG_TARGET_IS_WINDOWS) + set(replacement "**invalid-fontconfig-dir-do-not-use**") +endif() +set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/config.h") +vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}" "${replacement}") +if(NOT VCPKG_BUILD_TYPE) + set(configfile "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/config.h") + vcpkg_replace_string("${configfile}" "${CURRENT_PACKAGES_DIR}/debug" "${replacement}") +endif() + vcpkg_install_meson(ADD_BIN_TO_PATH) vcpkg_copy_pdbs() diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 7c3b8ed640496f..bc6babfe5359ef 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fontconfig", "version": "2.14.1", - "port-version": 1, + "port-version": 2, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "license": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 82c3c2d4757bdd..c55dd1964abae1 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2542,7 +2542,7 @@ }, "fontconfig": { "baseline": "2.14.1", - "port-version": 1 + "port-version": 2 }, "foonathan-lexy": { "baseline": "2022.12.1", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 2bf0901459c595..660cf3064be354 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b97a0d2144c26df38257732da8e15f133a084782", + "version": "2.14.1", + "port-version": 2 + }, { "git-tree": "8d149d92c9082b4aa83474ae25f2033574a9cd84", "version": "2.14.1",