From a3d4576238638f67af8e1f9add79ae0e2f4ea6f9 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 29 Apr 2024 06:19:55 +0000 Subject: [PATCH 1/6] [qtbase] --- ports/libsrt/vcpkg.json | 3 +++ ports/qtbase/cmake/qt_install_submodule.cmake | 6 +++--- ports/qtbase/vcpkg.json | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index 3114f78c8589c5..1f535fe4656745 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -16,6 +16,9 @@ "host": true } ], + "default-features": [ + "tool" + ], "features": { "bonding": { "description": "Enables the Connection Bonding feature" diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index e8e5fa76a90153..eb468c814c0e12 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -19,14 +19,14 @@ function(qt_download_submodule_impl) # qtinterfaceframework is not available in the release, so we fall back to a `git clone`. vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - URL "https://code.qt.io/qt/${_qarg_SUBMODULE}.git" + URL "https://code.qt.io/cgit/qt/${_qarg_SUBMODULE}.git" REF "${${_qarg_SUBMODULE}_REF}" PATCHES ${_qarg_PATCHES} ) if(PORT STREQUAL "qttools") # Keep this for beta & rc's vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML - URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git + URL git://code.qt.io/cgit/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git REF "${${PORT}_qlitehtml_REF}" FETCH_REF master HEAD_REF master @@ -44,7 +44,7 @@ function(qt_download_submodule_impl) elseif(PORT STREQUAL "qtwebengine") vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE - URL git://code.qt.io/qt/qtwebengine-chromium.git + URL git://code.qt.io/cgit/qt/qtwebengine-chromium.git REF "${${PORT}_chromium_REF}" ) if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium") diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 8967eced953de9..21190b2fcd97e6 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.6.1", - "port-version": 12, + "port-version": 13, "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, From af4e96cb8fac008768a2f8b06fed747f7ec0213b Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 29 Apr 2024 06:20:55 +0000 Subject: [PATCH 2/6] version --- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index c6ce73627c8436..3c6b31a1533621 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7294,7 +7294,7 @@ }, "qtbase": { "baseline": "6.6.1", - "port-version": 12 + "port-version": 13 }, "qtcharts": { "baseline": "6.6.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index f3c558e5ba93e0..601e6643363513 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "567d0f819df86207acab47745ee37705c64d0c36", + "version": "6.6.1", + "port-version": 13 + }, { "git-tree": "25f62a554ceec4eb297697d178df6ac0d231a5ea", "version": "6.6.1", From 206b1edf8c8ff200d8941bd87e3a7507c5d9e274 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 29 Apr 2024 06:27:56 +0000 Subject: [PATCH 3/6] revert --- ports/libsrt/vcpkg.json | 3 --- 1 file changed, 3 deletions(-) diff --git a/ports/libsrt/vcpkg.json b/ports/libsrt/vcpkg.json index 1f535fe4656745..3114f78c8589c5 100644 --- a/ports/libsrt/vcpkg.json +++ b/ports/libsrt/vcpkg.json @@ -16,9 +16,6 @@ "host": true } ], - "default-features": [ - "tool" - ], "features": { "bonding": { "description": "Enables the Connection Bonding feature" From da8bfbcc43b48f4f8fdc937a4dcac370a4400dac Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 29 Apr 2024 07:49:41 +0000 Subject: [PATCH 4/6] [kangaru] Update version to 4.3.2 --- ports/kangaru/portfile.cmake | 6 +++--- ports/kangaru/vcpkg.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/kangaru/portfile.cmake b/ports/kangaru/portfile.cmake index a97d1dcba089ea..1ebba9cd6b4124 100644 --- a/ports/kangaru/portfile.cmake +++ b/ports/kangaru/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO gracicot/kangaru - REF v4.3.1 - SHA512 5c1c6081b266089ad4ef310f4782505db5c514adce87091dd8164a6da71fc7ef72c0992c32e9ec3c991aa7a2ca43f1d96f2f524c7198bf899876af214fea28f3 + REF "v${VERSION}" + SHA512 03835b156d6da9239e316bfad07684b7f3197798c314f7d8f707e9e225795546887867c5af7fd8ae075b7143d2f160b0185d6be16146975c868dea99c7334129 HEAD_REF master ) @@ -30,4 +30,4 @@ file(REMOVE_RECURSE ) # Put the license file where vcpkg expects it -file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) +vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE") diff --git a/ports/kangaru/vcpkg.json b/ports/kangaru/vcpkg.json index b0b2d4d02c4ced..245f901d204923 100644 --- a/ports/kangaru/vcpkg.json +++ b/ports/kangaru/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kangaru", - "version": "4.3.1", + "version": "4.3.2", "description": "A dependency injection container for C++11, C++14 and later", "homepage": "https://github.com/gracicot/kangaru", "license": "MIT", From dcda40227eebd2930eb4b4538464248a912d388d Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 29 Apr 2024 07:50:01 +0000 Subject: [PATCH 5/6] version --- versions/baseline.json | 2 +- versions/k-/kangaru.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index 3c6b31a1533621..e368f884a673bb 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3809,7 +3809,7 @@ "port-version": 1 }, "kangaru": { - "baseline": "4.3.1", + "baseline": "4.3.2", "port-version": 0 }, "kcp": { diff --git a/versions/k-/kangaru.json b/versions/k-/kangaru.json index 8e22f10707e89e..9ebe92fbdc5f02 100644 --- a/versions/k-/kangaru.json +++ b/versions/k-/kangaru.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6fd185b55e031697a00f15694ea7037ee97ff007", + "version": "4.3.2", + "port-version": 0 + }, { "git-tree": "194f665c94fecadc626ab9431003eec963a6820d", "version": "4.3.1", From 06eb4798f5dc7700da166af5ae9983e986d7f6b8 Mon Sep 17 00:00:00 2001 From: FrankXie Date: Mon, 29 Apr 2024 07:55:05 +0000 Subject: [PATCH 6/6] Revert --- ports/qtbase/cmake/qt_install_submodule.cmake | 6 +++--- ports/qtbase/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/q-/qtbase.json | 5 ----- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/ports/qtbase/cmake/qt_install_submodule.cmake b/ports/qtbase/cmake/qt_install_submodule.cmake index eb468c814c0e12..e8e5fa76a90153 100644 --- a/ports/qtbase/cmake/qt_install_submodule.cmake +++ b/ports/qtbase/cmake/qt_install_submodule.cmake @@ -19,14 +19,14 @@ function(qt_download_submodule_impl) # qtinterfaceframework is not available in the release, so we fall back to a `git clone`. vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH - URL "https://code.qt.io/cgit/qt/${_qarg_SUBMODULE}.git" + URL "https://code.qt.io/qt/${_qarg_SUBMODULE}.git" REF "${${_qarg_SUBMODULE}_REF}" PATCHES ${_qarg_PATCHES} ) if(PORT STREQUAL "qttools") # Keep this for beta & rc's vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_QLITEHTML - URL git://code.qt.io/cgit/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git + URL git://code.qt.io/playground/qlitehtml.git # git://code.qt.io/playground/qlitehtml.git REF "${${PORT}_qlitehtml_REF}" FETCH_REF master HEAD_REF master @@ -44,7 +44,7 @@ function(qt_download_submodule_impl) elseif(PORT STREQUAL "qtwebengine") vcpkg_from_git( OUT_SOURCE_PATH SOURCE_PATH_WEBENGINE - URL git://code.qt.io/cgit/qt/qtwebengine-chromium.git + URL git://code.qt.io/qt/qtwebengine-chromium.git REF "${${PORT}_chromium_REF}" ) if(NOT EXISTS "${SOURCE_PATH}/src/3rdparty/chromium") diff --git a/ports/qtbase/vcpkg.json b/ports/qtbase/vcpkg.json index 21190b2fcd97e6..8967eced953de9 100644 --- a/ports/qtbase/vcpkg.json +++ b/ports/qtbase/vcpkg.json @@ -1,7 +1,7 @@ { "name": "qtbase", "version": "6.6.1", - "port-version": 13, + "port-version": 12, "description": "Qt Base (Core, Gui, Widgets, Network, ...)", "homepage": "https://www.qt.io/", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index e368f884a673bb..cf4d2a2c0dd4dc 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7294,7 +7294,7 @@ }, "qtbase": { "baseline": "6.6.1", - "port-version": 13 + "port-version": 12 }, "qtcharts": { "baseline": "6.6.1", diff --git a/versions/q-/qtbase.json b/versions/q-/qtbase.json index 601e6643363513..f3c558e5ba93e0 100644 --- a/versions/q-/qtbase.json +++ b/versions/q-/qtbase.json @@ -1,10 +1,5 @@ { "versions": [ - { - "git-tree": "567d0f819df86207acab47745ee37705c64d0c36", - "version": "6.6.1", - "port-version": 13 - }, { "git-tree": "25f62a554ceec4eb297697d178df6ac0d231a5ea", "version": "6.6.1",