From 0c846c11aa074bb159895e79df09b0ec8cc489c9 Mon Sep 17 00:00:00 2001 From: autoantwort <41973254+autoantwort@users.noreply.github.com> Date: Tue, 23 Nov 2021 00:18:05 +0100 Subject: [PATCH] [fontconfig] no absolute paths (#21424) --- ports/fontconfig/portfile.cmake | 5 +---- ports/fontconfig/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fontconfig.json | 5 +++++ 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ports/fontconfig/portfile.cmake b/ports/fontconfig/portfile.cmake index 78cb81111b..9e04f320e3 100644 --- a/ports/fontconfig/portfile.cmake +++ b/ports/fontconfig/portfile.cmake @@ -38,10 +38,7 @@ endif() # Make path to cache in fonts.conf relative set(_file "${CURRENT_PACKAGES_DIR}/etc/fonts/fonts.conf") if(EXISTS "${_file}") - file(READ "${_file}" _contents) - string(REPLACE "${CURRENT_INSTALLED_DIR}/var/cache/fontconfig" "./../../var/cache/fontconfig" _contents "${_contents}") - string(REPLACE "/var" "/../var" _contents "${_contents}") - file(WRITE "${_file}" "${_contents}") + vcpkg_replace_string("${_file}" "${CURRENT_PACKAGES_DIR}/var/cache/fontconfig" "./../../var/cache/fontconfig") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/var" diff --git a/ports/fontconfig/vcpkg.json b/ports/fontconfig/vcpkg.json index b7f1469804..2053a79702 100644 --- a/ports/fontconfig/vcpkg.json +++ b/ports/fontconfig/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fontconfig", "version": "2.13.94", - "port-version": 1, + "port-version": 2, "description": "Library for configuring and customizing font access.", "homepage": "https://www.freedesktop.org/wiki/Software/fontconfig", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index d074e1e65e..ad10096812 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2218,7 +2218,7 @@ }, "fontconfig": { "baseline": "2.13.94", - "port-version": 1 + "port-version": 2 }, "foonathan-memory": { "baseline": "2019-07-21", diff --git a/versions/f-/fontconfig.json b/versions/f-/fontconfig.json index 51b0daf242..be253aed54 100644 --- a/versions/f-/fontconfig.json +++ b/versions/f-/fontconfig.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bc9133bf9d7f323757e7de9992ae6dbac0a92f00", + "version": "2.13.94", + "port-version": 2 + }, { "git-tree": "606b2d7ca0ba11e29552311100b66d8c5052faeb", "version": "2.13.94",