From 948820b46ed406dea12a72760b4ab152e0859e32 Mon Sep 17 00:00:00 2001 From: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> Date: Mon, 16 Dec 2024 19:08:24 +0100 Subject: [PATCH] [Kf5testeditor] fix single config (#42726) --- ports/kf5texteditor/portfile.cmake | 12 ++++++++---- ports/kf5texteditor/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/k-/kf5texteditor.json | 5 +++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ports/kf5texteditor/portfile.cmake b/ports/kf5texteditor/portfile.cmake index 226943eb73..3889db5c4e 100644 --- a/ports/kf5texteditor/portfile.cmake +++ b/ports/kf5texteditor/portfile.cmake @@ -17,13 +17,17 @@ if(VCPKG_TARGET_IS_WINDOWS) elseif(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(DATAROOT "share") endif() - file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/data") - file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/${DATAROOT}/kservicetypes5/*") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin/data") + file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/${DATAROOT}/kservicetypes5/*") + endif() file(COPY "${CURRENT_INSTALLED_DIR}/${DATAROOT}/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/bin/data") file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/${DATAROOT}/kservicetypes5/*") else() - file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share") - file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/share/kservicetypes5/*") + if(NOT VCPKG_BUILD_TYPE) + file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/share") + file(GLOB TEMP_DESKTOP_FILES_DBG "${CURRENT_PACKAGES_DIR}/debug/share/kservicetypes5/*") + endif() file(COPY "${CURRENT_INSTALLED_DIR}/share/kservicetypes5" DESTINATION "${CURRENT_PACKAGES_DIR}/share") file(GLOB TEMP_DESKTOP_FILES_REL "${CURRENT_PACKAGES_DIR}/share/kservicetypes5/*") endif() diff --git a/ports/kf5texteditor/vcpkg.json b/ports/kf5texteditor/vcpkg.json index 819d1c7a20..39e372f838 100644 --- a/ports/kf5texteditor/vcpkg.json +++ b/ports/kf5texteditor/vcpkg.json @@ -1,7 +1,7 @@ { "name": "kf5texteditor", "version": "5.98.0", - "port-version": 1, + "port-version": 2, "description": "Full text editor component", "homepage": "https://api.kde.org/frameworks/ktexteditor/html/", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index aff7c8edf2..efb31a5b20 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4106,7 +4106,7 @@ }, "kf5texteditor": { "baseline": "5.98.0", - "port-version": 1 + "port-version": 2 }, "kf5textwidgets": { "baseline": "5.98.0", diff --git a/versions/k-/kf5texteditor.json b/versions/k-/kf5texteditor.json index b6ebcddef1..b9ead60a30 100644 --- a/versions/k-/kf5texteditor.json +++ b/versions/k-/kf5texteditor.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6eaa991090763dab7139de8114bc2c715659ef35", + "version": "5.98.0", + "port-version": 2 + }, { "git-tree": "184ee77705278a5194c32d6f6d38ea3bc19b4fd2", "version": "5.98.0",