Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions ports/ecm/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/extra-cmake-modules
REF v5.75.0
SHA512 486845a91967c89dec42f9120757c7b883006713d0957e9bd21dfacb2911225fe45680590ef3dc5e0d45a9dbc81cf99e1514fb4922b1a027bcba3864da883076
REF v5.81.0
SHA512 562e99f3368ec5c834dbcbfb055c06da3e3302ac8e03d5d71be9f2fc682bbb02836c009c41777a7f90e4d6d3a4b13412aea29fdba985588b7d59e2dc59c9beb2
HEAD_REF master
PATCHES
"do-not-override-custom-clang-format-files.patch"
)

vcpkg_configure_cmake(
Expand Down
2 changes: 1 addition & 1 deletion ports/ecm/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ecm",
"version": "5.75.0",
"version": "5.81.0",
"description": "Extra CMake Modules (ECM), extra modules and scripts for CMake",
"homepage": "https://github.com/KDE/extra-cmake-modules"
}
7 changes: 4 additions & 3 deletions ports/kf5archive/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/karchive
REF v5.75.0
SHA512 4a909626f776cc9ebf9acd0e16bcda9e2e0e5dd29bd52b27140baa9905758a028f542ccd40e98c5432a4d9eac2908e36e1f9329e40cc4cf835e15557c96175f1
REF v5.81.0
SHA512 f0dee63016f67e385f538ee82679fe7a5ca2c876cfb71d83a808107df8c1ec58ceceb8eb8d7422b0b0a08359dc7a00474b6a7b18be9d33c557c102d8492d1d57
HEAD_REF master
)

vcpkg_configure_cmake(
DISABLE_PARALLEL_CONFIGURE
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
Expand All @@ -29,4 +30,4 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)

file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
2 changes: 1 addition & 1 deletion ports/kf5archive/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5archive",
"version": "5.75.0",
"version": "5.81.0",
"description": "File compression",
"homepage": "https://api.kde.org/frameworks/karchive/html/index.html",
"dependencies": [
Expand Down
12 changes: 0 additions & 12 deletions ports/kf5completion/add-qdbus-to-required-libraries.patch

This file was deleted.

7 changes: 2 additions & 5 deletions ports/kf5completion/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kcompletion
REF v5.75.0
SHA512 f4ff54b518f51b399392ee8f4be27bcc15a45be993b6a76305a16c84d6a85629017b8c4c27f19ff2c37699eeb3a455b9b6e5c7551716a55f0f7ecce2f2a2240b
REF v5.81.0
SHA512 eedb843ffc29bd35ef758d47ea7650d4485c33552916e09ca6d0e62b35f96bf29c0e903bd318e6703b8a14d045e9e36ee60ac6d505340cf7bfefaa8f1e8f7b05
HEAD_REF master
# reported issue, just a manual workaround until the issue is fixed upstream
PATCHES
"add-qdbus-to-required-libraries.patch"
)

vcpkg_configure_cmake(
Expand Down
2 changes: 1 addition & 1 deletion ports/kf5completion/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5completion",
"version": "5.75.0",
"version": "5.81.0",
"description": "Text completion helpers and widgets",
"homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/kf5config/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kconfig
REF v5.75.0
SHA512 66789adf41114354cd2602b4bc6215f99026c1735547ab9c1449fff18dca7cf1e5786dcc8030499b8449498d14ece33aad9d9955109331f5c8c3914d1eccfd50
REF v5.81.0
SHA512 148bdca3f3548b892abacf25f82d2bb4a3eb7a3dc559b30722e7e12a8fdcb240ff86d5e56396efd17d65d40a7b7dd9568a8d204ac48c073b132fe3e93a903c98
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/kf5config/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5config",
"version": "5.75.0",
"version": "5.81.0",
"description": "Configuration system",
"homepage": "https://api.kde.org/frameworks/kconfig/html/index.html",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/kf5coreaddons/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kcoreaddons
REF v5.75.0
SHA512 bf17c323dbf2164a1d8e265ff97f01dd683b0f285c59755dd2f49a842666af0eaba3f6f73496d2f9690088b1cc7fe37e671218f039e8b3be0ce1ac5e2bbe13c3
REF v5.81.0
SHA512 438b2a6fbb040e9442bdfd7f29388165ed8df3bbb676d93efd86ccaa2106c9b5d3b9561eecb10fb14f54d46dac8f0c969c424ec9e351e18ee2c742de418596b9
)

vcpkg_configure_cmake(
Expand Down
2 changes: 1 addition & 1 deletion ports/kf5coreaddons/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5coreaddons",
"version": "5.75.0",
"version": "5.81.0",
"description": "Addons to QtCore",
"homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html",
"dependencies": [
Expand Down
15 changes: 0 additions & 15 deletions ports/kf5crash/add_x11extras.patch

This file was deleted.

6 changes: 2 additions & 4 deletions ports/kf5crash/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kcrash
REF v5.75.0
SHA512 f6784d2db20bd90194a1ae8134e344a899f8c28d934783fbc104d2719e8340955278059ea5a237eeda550b4c4484e45c6d4b7c09425b0d1bb0b0025d8e214596
REF v5.81.0
SHA512 29ab36a46f4dbbe104c2c8d1ce0d4f2f43399c7fb3cbc34210d52e51c8b6ef6261890ebc36d9010c2aea9b90867a07732a4736176fa008c85a009ebd6582dd32
HEAD_REF master
PATCHES
add_x11extras.patch
)

vcpkg_configure_cmake(
Expand Down
2 changes: 1 addition & 1 deletion ports/kf5crash/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5crash",
"version": "5.75.0",
"version": "5.81.0",
"description": "KCrash provides support for intercepting and handling application crashes.",
"homepage": "https://api.kde.org/frameworks/kcrash/html/index.html",
"supports": "linux",
Expand Down
18 changes: 15 additions & 3 deletions ports/kf5guiaddons/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,19 +1,31 @@
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
-DBUILD_HTML_DOCS=OFF
-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()
Expand All @@ -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)
file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright)
27 changes: 25 additions & 2 deletions ports/kf5guiaddons/vcpkg.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -14,5 +14,28 @@
"name": "qt5-x11extras",
"platform": "linux"
}
]
],
"default-features": [
"defaults"
Copy link
Contributor Author

@wrobelda wrobelda Apr 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If wondering, please see this conversation for details on why this approach.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Conversation is behind a login-gate and cannot be seen.

Copy link
Contributor Author

@wrobelda wrobelda Apr 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This points to official #vcpkg channel and the maintainers are there. The conversation linked was with @ras0219-msft and is intended for any other vcpkg maintainer who would be reviewing this PR. If you're not willing to create a Slack account and join that channel, I don't know how to help you, but it can be seen.

Copy link
Contributor

@Hoikas Hoikas Apr 13, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps instead of being rude, you could kindly copy and paste the discussion or a synopsis thereof into the PR for those of us who do not wish to sign up for yet another account(TM).

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I can't see that and I'm a maintainer; I would really appreciate a copy-paste of it...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oh, I see what it is: default-features can't be platform-expression'd away. This is an issue with default-features, and should be fixed (and until then, we use this workaround).

Copy link
Contributor Author

@wrobelda wrobelda Apr 29, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@strega-nil yes, this is precisely what @ras0219-msft suggested. The upstream added a default dependency on qt5-waylandon Linux (1, 2). I didn’t want to go against the wish of the maintainers, but also qt5-wayland is not stable, per its portfile's memo. As such, I needed to make it a default on Linux but also possible to disable it, should qt5-wayland fail to build for some.

],
"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"
]
}
}
}
4 changes: 2 additions & 2 deletions ports/kf5holidays/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kholidays
REF v5.75.0
SHA512 16b62a7e8fc664075cf787a7ae811bdb7f27b11f10619001994e1aa0c89e46bdb1c932091f6fcdcc3bad91614eeb9606a9b6aef62cec5e4a557a0c107e32d816
REF v5.81.0
SHA512 cb8c82b239ce3736ec8554fb201506bef40116c2ddcc2efcbdb718aaad8b283e4f7d6b005770d8e2a3640efdfef5a4065365e974062b53a7206c5f08723c5626
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/kf5holidays/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5holidays",
"version": "5.75.0",
"version": "5.81.0",
"description": "Holiday calculation library",
"dependencies": [
"ecm",
Expand Down
4 changes: 2 additions & 2 deletions ports/kf5i18n/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/ki18n
REF v5.75.0
SHA512 9e059afb8c3bd074ecdfcb1bf4cf3c9340159dc9f7276c9bb81abb1fa73fc893229abade8c4fac344ffec555889232d3a789df72974d6f9c7c6437627872a356
REF v5.81.0
SHA512 8e14c429671a51b9b231f2a965f2368b019592a29a04a9e192da25a8a963042fe7478323508c097f73e2c328fd4742f8808fe68ea439e00e6667414d7f75be3e
PATCHES ${PATCHES}
)

Expand Down
2 changes: 1 addition & 1 deletion ports/kf5i18n/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5i18n",
"version": "5.75.0",
"version": "5.81.0",
"description": "Advanced internationalization framework",
"homepage": "https://api.kde.org/frameworks/ki18n/html/index.html",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/kf5itemmodels/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kitemmodels
REF v5.75.0
SHA512 24304df25d4331edccd8ef579489d6d691dcca8fb8820aedd7c89513ae79310846137aa2281b54b42377189f1ecf7bf30d771da8dce4733bc8959572b749445c
REF v5.81.0
SHA512 7942598e0ac3fd81226bb8485e721cf5424da8ef049812e9fa060c18b5dcccaa9e39a761beb81da7ccd3c7e67886752e60f96e889e6075173544968015ac45b1
)

vcpkg_configure_cmake(
Expand Down
2 changes: 1 addition & 1 deletion ports/kf5itemmodels/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5itemmodels",
"version": "5.75.0",
"version": "5.81.0",
"description": "Models for Qt Model/View system",
"homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/kf5itemviews/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kitemviews
REF v5.75.0
SHA512 929e223540d026121fd5b5d36ed2b5e5b53d55c617d9e5f9abc75f56b9441e3495530faeb7aa38a3dcffc67c551eec70a86bcdeaf22d6e9cf4921fd3812c4c89
REF v5.81.0
SHA512 7810ce7d4fdc99fa6fda508aa49e2e91e1be73190fef383eb4d00a83262ef6b231606838f8d8798419cd421b85d45d142a34aa3bc4adfeecae9838b13b9fba5e
)

vcpkg_configure_cmake(
Expand Down
2 changes: 1 addition & 1 deletion ports/kf5itemviews/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5itemviews",
"version": "5.75.0",
"version": "5.81.0",
"description": "Widget addons for Qt Model/View",
"homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/kf5plotting/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kplotting
REF v5.75.0
SHA512 1eb2320006a21b0d8a3b4fb557458954a1d82427f8b91339d606e5405ef2820f408f257d833fb4af0c5f737eacff0f0371db54b5e6f63b68093e30a8249f17bf
REF v5.81.0
SHA512 bdeb55a3949abfe9673f3b799ba157c27aade2860bfd5db4588dcedd580f4be5f452434a8c56af25bceec1391c05a9e0d522b398f38c3acf5a3bfdb8f5d7c77d
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/kf5plotting/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5plotting",
"version": "5.75.0",
"version": "5.81.0",
"description": "Lightweight plotting framework",
"homepage": "https://api.kde.org/frameworks/kplotting/html/index.html",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/kf5syntaxhighlighting/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/syntax-highlighting
REF v5.75.0
SHA512 bb3b722861823b8ebe407b859b425c2f600af6686c2b1107436c55931e50e746e0852df8b11c5ad895323236a2ee857bcfe8a17af563c26baa4541535d275f8c
REF v5.81.0
SHA512 4e6d59acc6548ffc536bc2936871f7d0d19f4506319ebb2c821086df63a0014c7246f45a52b66ee997f34a05aeed216c611c3b68cc1ba649f2f1dd7cf10a431e
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/kf5syntaxhighlighting/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5syntaxhighlighting",
"version": "5.75.0",
"version": "5.81.0",
"description": "Syntax highlighting engine for Kate syntax definitions",
"homepage": "https://github.com/KDE/syntax-highlighting",
"dependencies": [
Expand Down
4 changes: 2 additions & 2 deletions ports/kf5widgetsaddons/portfile.cmake
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kwidgetsaddons
REF v5.75.0
SHA512 8854ddc56d8a30081d69d952d035ef303b3a30760fdee3ba8889029b373cb793807f984ce3fc06bd1d377fa3d5a768d3dbf99cb44a3b29a7589b2c4f77767360
REF v5.81.0
SHA512 39adcc3c0a09c506df735da286146c42cb5346b35842c72449c4c436e201cdfb33b613097a2f8ae8ddce0b1ac02be1f51c622eeb9e02844c3c013a44aedfc2b1
HEAD_REF master
)

Expand Down
2 changes: 1 addition & 1 deletion ports/kf5widgetsaddons/vcpkg.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kf5widgetsaddons",
"version": "5.75.0",
"version": "5.81.0",
"description": "Addons to QtWidgets",
"homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html",
"dependencies": [
Expand Down
Loading