diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 2b35e1fab138c2..489b047671fe6c 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -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) diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index 25f9d8d3b3769e..1a4c499ea8ac7f 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -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", diff --git a/versions/baseline.json b/versions/baseline.json index 77e54f501f0cf2..66f1a73666e0c5 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2666,7 +2666,7 @@ }, "fontconfig": { "baseline": "2.14.2", - "port-version": 0 + "port-version": 1 }, "foonathan-lexy": { "baseline": "2022.12.1", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 00a989f7054357..48fef57f6d4084 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de73339d579963e68fed652ed2e206b307a0c03f", + "version": "2.14.2", + "port-version": 1 + }, { "git-tree": "26490bc4c9aa1377da98980ba6e1089525fdaa55", "version": "2.14.2",