From 7724328d79b9590160a5295d7e5f9e1b128d8d92 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sat, 24 Apr 2021 20:46:45 -0700 Subject: [PATCH 1/4] [vcpkg baseline][marble] Disable dependency KF5 --- ports/marble/portfile.cmake | 3 ++- ports/marble/vcpkg.json | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ports/marble/portfile.cmake b/ports/marble/portfile.cmake index a78e854b13ad9d..173892360c496b 100644 --- a/ports/marble/portfile.cmake +++ b/ports/marble/portfile.cmake @@ -13,7 +13,8 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON + -DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON + -DWITH_KF5=OFF ) vcpkg_install_cmake() diff --git a/ports/marble/vcpkg.json b/ports/marble/vcpkg.json index 1c72e0e7082f5c..bf8d085c05819c 100644 --- a/ports/marble/vcpkg.json +++ b/ports/marble/vcpkg.json @@ -1,7 +1,7 @@ { "name": "marble", "version-string": "19.08.2", - "port-version": 1, + "port-version": 2, "description": "Marble KDE library", "homepage": "https://marble.kde.org", "supports": "windows & x64 & !static", From 4ba6c77a62116450ed7b04b55b4a4fb6bd65beb5 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sat, 24 Apr 2021 20:47:37 -0700 Subject: [PATCH 2/4] test whether it works --- ports/kf5i18n/vcpkg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index d49491e1eb8f95..8430daf9d93abc 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,6 +1,7 @@ { "name": "kf5i18n", "version": "5.75.0", + "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ From f5cc8747c8b6fb7360c0b3f123fda0e141c7583d Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sat, 24 Apr 2021 20:59:22 -0700 Subject: [PATCH 3/4] revert test code --- ports/kf5i18n/vcpkg.json | 1 - 1 file changed, 1 deletion(-) diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index 8430daf9d93abc..d49491e1eb8f95 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5i18n", "version": "5.75.0", - "port-version": 1, "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ From fa90991c1324c0e0fa6e1aca0a464dd8d4e4d326 Mon Sep 17 00:00:00 2001 From: JackBoosY Date: Sat, 24 Apr 2021 20:59:48 -0700 Subject: [PATCH 4/4] update version record --- versions/baseline.json | 2 +- versions/m-/marble.json | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/versions/baseline.json b/versions/baseline.json index e96d9fa02a460e..4c97f6b573282c 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3826,7 +3826,7 @@ }, "marble": { "baseline": "19.08.2", - "port-version": 1 + "port-version": 2 }, "marl": { "baseline": "2020-10-10", diff --git a/versions/m-/marble.json b/versions/m-/marble.json index d1d1cb0c66d2e5..d7fb3c8c1a9839 100644 --- a/versions/m-/marble.json +++ b/versions/m-/marble.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "882d37f618c122d3484dcb02cb4f35ead8580768", + "version-string": "19.08.2", + "port-version": 2 + }, { "git-tree": "753693b3e64d7baedd61a8f57b62e467267bc741", "version-string": "19.08.2",