diff --git a/ports/marble/portfile.cmake b/ports/marble/portfile.cmake index d24c4c603fa30a..b2ad99a5a51093 100644 --- a/ports/marble/portfile.cmake +++ b/ports/marble/portfile.cmake @@ -8,7 +8,7 @@ vcpkg_from_github( PATCHES qtfix.patch ) - + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS @@ -21,10 +21,10 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake) # Install plugins and data files -file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") -file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") -file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") -file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") +file(GLOB_RECURSE PLUGINS "${CURRENT_PACKAGES_DIR}/plugins/*") +file(GLOB_RECURSE PLUGINS_DESIGNER "${CURRENT_PACKAGES_DIR}/lib/plugins/*") +file(GLOB_RECURSE PLUGINS_DEBUG "${CURRENT_PACKAGES_DIR}/debug/lib/plugins/*") +file(GLOB_RECURSE MKSPECS "${CURRENT_PACKAGES_DIR}/mkspecs/*") file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") file(COPY ${PLUGINS} ${PLUGINS_DESIGNER} DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/plugins") @@ -56,4 +56,5 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/debug/marblewidget-qt5d.dll" "${CURRENT_PAC vcpkg_copy_pdbs() -file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*") +vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES}) diff --git a/ports/marble/vcpkg.json b/ports/marble/vcpkg.json index 5486e7af729083..06c6ae814225cd 100644 --- a/ports/marble/vcpkg.json +++ b/ports/marble/vcpkg.json @@ -1,6 +1,7 @@ { "name": "marble", "version-string": "22.04.0", + "port-version": 1, "description": "Marble KDE library", "homepage": "https://marble.kde.org", "license": "LGPL-2.1-or-later", diff --git a/versions/baseline.json b/versions/baseline.json index 7ab081b451a7a1..0114230f450628 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4474,7 +4474,7 @@ }, "marble": { "baseline": "22.04.0", - "port-version": 0 + "port-version": 1 }, "marl": { "baseline": "2022-03-02", diff --git a/versions/m-/marble.json b/versions/m-/marble.json index b7507773fc59a5..c9d010a3da0f33 100644 --- a/versions/m-/marble.json +++ b/versions/m-/marble.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c1e722f12de290f18b92e662040c499a51d57249", + "version-string": "22.04.0", + "port-version": 1 + }, { "git-tree": "7a6e4d655adaa7043e8b347841b11472c9b36a6a", "version-string": "22.04.0",