From 631177d3f4ce35d8ab10c07bfbd5368faf510df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Tue, 20 Apr 2021 08:28:39 +0800 Subject: [vcpkg baseline][marble] Disable find I18n (#17341) * [vcpkg baseline][marble] Disable find I18n * update version record --- ports/marble/CONTROL | 6 ------ ports/marble/portfile.cmake | 4 +++- ports/marble/vcpkg.json | 14 ++++++++++++++ versions/baseline.json | 2 +- versions/m-/marble.json | 5 +++++ 5 files changed, 23 insertions(+), 8 deletions(-) delete mode 100644 ports/marble/CONTROL create mode 100644 ports/marble/vcpkg.json diff --git a/ports/marble/CONTROL b/ports/marble/CONTROL deleted file mode 100644 index 20dd30c0c..000000000 --- a/ports/marble/CONTROL +++ /dev/null @@ -1,6 +0,0 @@ -Source: marble -Version: 19.08.2 -Homepage: https://marble.kde.org -Description: Marble KDE library -Supports: windows & x64 & !static -Build-Depends: qt5-base, qt5-svg, qt5-quickcontrols, qt5-webchannel diff --git a/ports/marble/portfile.cmake b/ports/marble/portfile.cmake index 665eb31d1..a78e854b1 100644 --- a/ports/marble/portfile.cmake +++ b/ports/marble/portfile.cmake @@ -11,7 +11,9 @@ vcpkg_from_github( vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA + PREFER_NINJA + OPTIONS + -DCMAKE_DISABLE_FIND_PACKAGE_I18n=ON ) vcpkg_install_cmake() diff --git a/ports/marble/vcpkg.json b/ports/marble/vcpkg.json new file mode 100644 index 000000000..1c72e0e70 --- /dev/null +++ b/ports/marble/vcpkg.json @@ -0,0 +1,14 @@ +{ + "name": "marble", + "version-string": "19.08.2", + "port-version": 1, + "description": "Marble KDE library", + "homepage": "https://marble.kde.org", + "supports": "windows & x64 & !static", + "dependencies": [ + "qt5-base", + "qt5-quickcontrols", + "qt5-svg", + "qt5-webchannel" + ] +} diff --git a/versions/baseline.json b/versions/baseline.json index 3d35601df..b9be6ee1f 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3826,7 +3826,7 @@ }, "marble": { "baseline": "19.08.2", - "port-version": 0 + "port-version": 1 }, "marl": { "baseline": "2020-10-10", diff --git a/versions/m-/marble.json b/versions/m-/marble.json index ea004fb06..d1d1cb0c6 100644 --- a/versions/m-/marble.json +++ b/versions/m-/marble.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "753693b3e64d7baedd61a8f57b62e467267bc741", + "version-string": "19.08.2", + "port-version": 1 + }, { "git-tree": "6da05bd09e0eb41ee05e3269fab2283c5dab2d4c", "version-string": "19.08.2", -- cgit v1.2.3