From b34b7ff2c97d7edcd0b744dc8917ce790fa79129 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dawid=20Wr=C3=B3bel?= Date: Fri, 21 May 2021 04:30:43 -0400 Subject: [many ports] Update KF5 frameworks to 5.81 (#17268) * [many ports] Update KF5 frameworks to 5.81 * [many ports] Update KF5 versions * [kf5guiaddons] disable parallel configure * [kf5windowsystem] disable parallel configure * [many ports] Update KF5 versions * [kf5archive] disable parallel configure * [many ports] Update KF5 versions --- ports/kf5guiaddons/portfile.cmake | 18 +++++++++++++++--- ports/kf5guiaddons/vcpkg.json | 27 +++++++++++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) (limited to 'ports/kf5guiaddons') diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index 4a933a915..16cc5b0e7 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -1,12 +1,22 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kguiaddons - REF v5.75.0 - SHA512 d016e2e8c6fecd037cab025acd129305a3c062e0f98b537f1454dccfb13d9a6765f1974588416fcd8d23ae9c9efdb2276c3cbab15e21df62aea07059142dd12b + REF v5.81.0 + SHA512 67e909f4d1fab700e087d6e5dad8ac8652ff2a42b64cf9f65be87be9ffb30324c074477af7c762689f5725d3f661e09c2f06d22eacd6870a543fb6d1e21ee9b6 HEAD_REF master ) +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + wayland WITH_WAYLAND +) + +if("wayland" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX) + message(FATAL_ERROR "Feature wayland is only supported on Linux.") +endif() + vcpkg_configure_cmake( + DISABLE_PARALLEL_CONFIGURE SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS @@ -14,6 +24,8 @@ vcpkg_configure_cmake( -DBUILD_MAN_DOCS=OFF -DBUILD_QTHELP_DOCS=OFF -DBUILD_TESTING=OFF + -DQtWaylandScanner_EXECUTABLE=${CURRENT_INSTALLED_DIR}/tools/qt5-wayland/bin/qtwaylandscanner + ${FEATURE_OPTIONS} ) vcpkg_install_cmake() @@ -31,4 +43,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) \ No newline at end of file +file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) diff --git a/ports/kf5guiaddons/vcpkg.json b/ports/kf5guiaddons/vcpkg.json index 55fd0fdb1..6058cd96e 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5guiaddons", - "version": "5.75.0", + "version": "5.81.0", "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ @@ -14,5 +14,28 @@ "name": "qt5-x11extras", "platform": "linux" } - ] + ], + "default-features": [ + "defaults" + ], + "features": { + "defaults": { + "description": "Default features", + "dependencies": [ + { + "name": "kf5guiaddons", + "features": [ + "wayland" + ], + "platform": "linux" + } + ] + }, + "wayland": { + "description": "Linux-only. Build with support for KeySequenceEditor inhibiting shortcuts on Wayland", + "dependencies": [ + "qt5-wayland" + ] + } + } } -- cgit v1.2.3