From 0260d588c0671378bf9efc1310fa580ac6217452 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Sun, 8 Jan 2023 18:57:16 +0100 Subject: [PATCH 1/5] Add Grantlee port --- ports/grantlee/portfile.cmake | 25 +++++++++++++++++++++++++ ports/grantlee/vcpkg.json | 11 +++++++++++ versions/baseline.json | 4 ++++ versions/g-/grantlee.json | 14 ++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 ports/grantlee/portfile.cmake create mode 100644 ports/grantlee/vcpkg.json create mode 100644 versions/g-/grantlee.json diff --git a/ports/grantlee/portfile.cmake b/ports/grantlee/portfile.cmake new file mode 100644 index 00000000000000..8b2f962cceebe4 --- /dev/null +++ b/ports/grantlee/portfile.cmake @@ -0,0 +1,25 @@ +vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO steveire/grantlee + REF v5.3.1 + SHA512 dc7192fe0553954fffc3e2c584e4fdd80fc1f22d25846cacc5f2dcd1db2673ca62464c8492a4ed3bfc9dfc3e62ef13322809dd29bd56fa4a3a153a8d373ddde5 + HEAD_REF master +) + +vcpkg_configure_cmake( + SOURCE_PATH ${SOURCE_PATH} + PREFER_NINJA + OPTIONS -DBUILD_TESTS=off +) + +vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt [[set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )]] [[set( PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)]]) + +vcpkg_install_cmake() +vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Grantlee5) +vcpkg_copy_pdbs() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) diff --git a/ports/grantlee/vcpkg.json b/ports/grantlee/vcpkg.json new file mode 100644 index 00000000000000..b170d8ed12762f --- /dev/null +++ b/ports/grantlee/vcpkg.json @@ -0,0 +1,11 @@ +{ + "name": "grantlee", + "version-semver": "5.3.1", + "description": "Libraries for text templating with Qt", + "homepage": "https://github.com/steveire/grantlee", + "license": "LGPL-2.1-or-later", + "supports": "!staticcrt", + "dependencies": [ + "qt5-declarative" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 186f4c1c02606c..c63a0eae082e2a 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -2780,6 +2780,10 @@ "baseline": "2020-05-20", "port-version": 2 }, + "grantlee": { + "baseline": "5.3.1", + "port-version": 0 + }, "graphene": { "baseline": "1.10.8", "port-version": 0 diff --git a/versions/g-/grantlee.json b/versions/g-/grantlee.json new file mode 100644 index 00000000000000..ae203bd8245e98 --- /dev/null +++ b/versions/g-/grantlee.json @@ -0,0 +1,14 @@ +{ + "versions": [ + { + "git-tree": "afdd04d37cb8d62f9c498707ebe4e5c424b0e0e0", + "version-semver": "5.3.1", + "port-version": 0 + }, + { + "git-tree": "574d2f131680fdf26eab3f189f158ac7fce4f97e", + "version-semver": "5.2.0", + "port-version": 0 + } + ] +} From dfb350f02e2bc82777818519a8f2757d42288190 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 9 Jan 2023 00:53:02 +0100 Subject: [PATCH 2/5] Replaced deprecated functions --- ports/grantlee/portfile.cmake | 7 +++---- ports/grantlee/vcpkg.json | 10 +++++++++- versions/g-/grantlee.json | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ports/grantlee/portfile.cmake b/ports/grantlee/portfile.cmake index 8b2f962cceebe4..616b83ccd2e542 100644 --- a/ports/grantlee/portfile.cmake +++ b/ports/grantlee/portfile.cmake @@ -8,16 +8,15 @@ vcpkg_from_github( HEAD_REF master ) -vcpkg_configure_cmake( +vcpkg_cmake_configure ( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA OPTIONS -DBUILD_TESTS=off ) vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt [[set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )]] [[set( PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)]]) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/Grantlee5) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Grantlee5) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") diff --git a/ports/grantlee/vcpkg.json b/ports/grantlee/vcpkg.json index b170d8ed12762f..df8b188c7aa88b 100644 --- a/ports/grantlee/vcpkg.json +++ b/ports/grantlee/vcpkg.json @@ -6,6 +6,14 @@ "license": "LGPL-2.1-or-later", "supports": "!staticcrt", "dependencies": [ - "qt5-declarative" + "qt5-declarative", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/versions/g-/grantlee.json b/versions/g-/grantlee.json index ae203bd8245e98..b2d6a221a9e001 100644 --- a/versions/g-/grantlee.json +++ b/versions/g-/grantlee.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "afdd04d37cb8d62f9c498707ebe4e5c424b0e0e0", + "git-tree": "0a7010f408fd34c3e60285bc9a831ddc1bd27703", "version-semver": "5.3.1", "port-version": 0 }, From 9209f5de351b70f0d33b2a410cb22e9bdb401f8e Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 9 Jan 2023 21:12:35 +0100 Subject: [PATCH 3/5] Add only one version of Grantlee --- versions/g-/grantlee.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/versions/g-/grantlee.json b/versions/g-/grantlee.json index b2d6a221a9e001..38081874386d2e 100644 --- a/versions/g-/grantlee.json +++ b/versions/g-/grantlee.json @@ -4,11 +4,6 @@ "git-tree": "0a7010f408fd34c3e60285bc9a831ddc1bd27703", "version-semver": "5.3.1", "port-version": 0 - }, - { - "git-tree": "574d2f131680fdf26eab3f189f158ac7fce4f97e", - "version-semver": "5.2.0", - "port-version": 0 } ] } From 674c434248a05cd5aac8c87bf94361c36a8955f4 Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 9 Jan 2023 21:19:24 +0100 Subject: [PATCH 4/5] version-semver -> version --- ports/grantlee/vcpkg.json | 2 +- versions/g-/grantlee.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/grantlee/vcpkg.json b/ports/grantlee/vcpkg.json index df8b188c7aa88b..b52f5c554dc803 100644 --- a/ports/grantlee/vcpkg.json +++ b/ports/grantlee/vcpkg.json @@ -1,6 +1,6 @@ { "name": "grantlee", - "version-semver": "5.3.1", + "version": "5.3.1", "description": "Libraries for text templating with Qt", "homepage": "https://github.com/steveire/grantlee", "license": "LGPL-2.1-or-later", diff --git a/versions/g-/grantlee.json b/versions/g-/grantlee.json index 38081874386d2e..8cb3618e6665dd 100644 --- a/versions/g-/grantlee.json +++ b/versions/g-/grantlee.json @@ -1,8 +1,8 @@ { "versions": [ { - "git-tree": "0a7010f408fd34c3e60285bc9a831ddc1bd27703", - "version-semver": "5.3.1", + "git-tree": "eeb899677e4a1e3dd0ff0f439410e554b165fa01", + "version": "5.3.1", "port-version": 0 } ] From 3c5e6b4c9fe8b784e27d910d769f084df86f274f Mon Sep 17 00:00:00 2001 From: JoergAtGithub Date: Mon, 9 Jan 2023 21:21:45 +0100 Subject: [PATCH 5/5] Added quotes --- ports/grantlee/portfile.cmake | 6 +++--- versions/g-/grantlee.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/grantlee/portfile.cmake b/ports/grantlee/portfile.cmake index 616b83ccd2e542..f1e2061dad8a58 100644 --- a/ports/grantlee/portfile.cmake +++ b/ports/grantlee/portfile.cmake @@ -9,11 +9,11 @@ vcpkg_from_github( ) vcpkg_cmake_configure ( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTS=off ) -vcpkg_replace_string(${SOURCE_PATH}/CMakeLists.txt [[set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )]] [[set( PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)]]) +vcpkg_replace_string("${SOURCE_PATH}/CMakeLists.txt" [[set( PLUGIN_INSTALL_DIR ${LIB_INSTALL_DIR}/grantlee/${Grantlee5_MAJOR_MINOR_VERSION_STRING} )]] [[set( PLUGIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)]]) vcpkg_cmake_install() vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/Grantlee5) @@ -21,4 +21,4 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${SOURCE_PATH}/COPYING.LIB DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING.LIB" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/versions/g-/grantlee.json b/versions/g-/grantlee.json index 8cb3618e6665dd..ff295954dd2e7f 100644 --- a/versions/g-/grantlee.json +++ b/versions/g-/grantlee.json @@ -1,7 +1,7 @@ { "versions": [ { - "git-tree": "eeb899677e4a1e3dd0ff0f439410e554b165fa01", + "git-tree": "36162cae49c2b9664a73f0e2a1f74544e4447a7b", "version": "5.3.1", "port-version": 0 }