Skip to content

[Fontconfig] fix internal search paths #28236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vicroms merged 8 commits into from
Apr 6, 2023
Merged

[Fontconfig] fix internal search paths #28236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6dc0c50
[fontconfig] hardcode paths instead of using the prefix from vcpkg
Neumann-A Dec 8, 2022
221b679
v db
Neumann-A Dec 8, 2022
5681725
Merge remote-tracking branch 'upstream/master' into fix_fontconfig_paths
Neumann-A Dec 30, 2022
94c898e
bump version
Neumann-A Dec 30, 2022
42903c8
v db
Neumann-A Dec 30, 2022
8507d01
Merge remote-tracking branch 'upstream/master' into fix_fontconfig_paths
Neumann-A Apr 4, 2023
e11e3d2
make the default search dir invalid
Neumann-A Apr 4, 2023
aeb0ab8
v db
Neumann-A Apr 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ports/fontconfig/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion ports/fontconfig/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2542,7 +2542,7 @@
},
"fontconfig": {
"baseline": "2.14.1",
"port-version": 1
"port-version": 2
},
"foonathan-lexy": {
"baseline": "2022.12.1",
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/fontconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b97a0d2144c26df38257732da8e15f133a084782",
"version": "2.14.1",
"port-version": 2
},
{
"git-tree": "8d149d92c9082b4aa83474ae25f2033574a9cd84",
"version": "2.14.1",
Expand Down