From 83ee120b22571f01ac1e7ea55d4d65f00bbb09e4 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 16 Dec 2024 17:33:04 +0100 Subject: [PATCH] [fltk] Fix abs path (#42723) --- ports/fltk/portfile.cmake | 2 ++ ports/fltk/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/f-/fltk.json | 5 +++++ 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ports/fltk/portfile.cmake b/ports/fltk/portfile.cmake index 415c481580..e6180cc66e 100644 --- a/ports/fltk/portfile.cmake +++ b/ports/fltk/portfile.cmake @@ -65,10 +65,12 @@ if(EXISTS "${CURRENT_PACKAGES_DIR}/bin/fltk-config") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(RENAME "${CURRENT_PACKAGES_DIR}/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/fltk-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../.." IGNORE_UNCHANGED) if(NOT VCPKG_BUILD_TYPE) file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug") file(RENAME "${CURRENT_PACKAGES_DIR}/debug/bin/fltk-config" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config") vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "${CURRENT_PACKAGES_DIR}" "`dirname $0`/../../..") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "${CURRENT_INSTALLED_DIR}" "`dirname $0`/../../.." IGNORE_UNCHANGED) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/tools/${PORT}/debug/fltk-config" "{prefix}/include" "{prefix}/../include") endif() endif() diff --git a/ports/fltk/vcpkg.json b/ports/fltk/vcpkg.json index b1b9b58b39..ad1ac7ef0e 100644 --- a/ports/fltk/vcpkg.json +++ b/ports/fltk/vcpkg.json @@ -1,7 +1,7 @@ { "name": "fltk", "version": "1.3.9", - "port-version": 1, + "port-version": 2, "description": "FLTK (pronounced fulltick) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation.", "homepage": "https://www.fltk.org/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 74a44ad1f2..13225838e4 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2842,7 +2842,7 @@ }, "fltk": { "baseline": "1.3.9", - "port-version": 1 + "port-version": 2 }, "fluidlite": { "baseline": "2023-04-18", diff --git a/versions/f-/fltk.json b/versions/f-/fltk.json index d5af27e0ce..9887e0f075 100644 --- a/versions/f-/fltk.json +++ b/versions/f-/fltk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "338d88ae1c146411ee45b68b14f7f72af6b33239", + "version": "1.3.9", + "port-version": 2 + }, { "git-tree": "804b0353b1336322af99c478f62a824a0cabd456", "version": "1.3.9",