From 2892ef50b723246e5c5b1f19f79dc4cec8d7394b Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:07:18 +0100 Subject: [PATCH] [libxfont] fix single config builds (#42730) --- ports/libxfont/portfile.cmake | 10 ++++++---- ports/libxfont/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/l-/libxfont.json | 5 +++++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ports/libxfont/portfile.cmake b/ports/libxfont/portfile.cmake index a4af82e279..4769a7bfb3 100644 --- a/ports/libxfont/portfile.cmake +++ b/ports/libxfont/portfile.cmake @@ -35,10 +35,12 @@ if(VCPKG_TARGET_IS_WINDOWS) file(READ "${_file}" _contents) string(REPLACE "-lm" "" _contents "${_contents}") file(WRITE "${_file}" "${_contents}") - set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xfont2.pc") - file(READ "${_file}" _contents) - string(REPLACE "-lm" "" _contents "${_contents}") - file(WRITE "${_file}" "${_contents}") + if(NOT VCPKG_BUILD_TYPE) + set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/xfont2.pc") + file(READ "${_file}" _contents) + string(REPLACE "-lm" "" _contents "${_contents}") + file(WRITE "${_file}" "${_contents}") + endif() endif() vcpkg_fixup_pkgconfig() diff --git a/ports/libxfont/vcpkg.json b/ports/libxfont/vcpkg.json index 8fac451fbc..c200e478fc 100644 --- a/ports/libxfont/vcpkg.json +++ b/ports/libxfont/vcpkg.json @@ -1,6 +1,7 @@ { "name": "libxfont", "version": "2.0.5", + "port-version": 1, "description": "X font handling library for server & utilities", "homepage": "https://gitlab.freedesktop.org/xorg/lib/libxfont", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 4a429ae54d..59aba31f42 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -5410,7 +5410,7 @@ }, "libxfont": { "baseline": "2.0.5", - "port-version": 0 + "port-version": 1 }, "libxft": { "baseline": "2.3.4", diff --git a/versions/l-/libxfont.json b/versions/l-/libxfont.json index 850cbd8ffd..26e78b0d14 100644 --- a/versions/l-/libxfont.json +++ b/versions/l-/libxfont.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68da445b35a06c8bdc939e363098874e80da5b14", + "version": "2.0.5", + "port-version": 1 + }, { "git-tree": "f78821d4b3573bc0b927dc76f10660665f0b2893", "version": "2.0.5",