Simplified from #34088:
- Remove stray `--trace-expand`
- Don't require `qt5-base` default-features.
- Disable uncontrolled gssapi dependency (might be silently satisfied by
`krb5` or system libs, but `krb5` needs extra fixes).
Unblocks PRs which trigger curl and kf5kio, e.g. #37196, #38901, #37599,
#38967.
  Tested in #37196.
This commit is contained in:
Kai Pastor 2024-05-28 08:21:55 +02:00 коммит произвёл GitHub
Родитель 9828b5b935
Коммит ad808221ce
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: B5690EEEBB952194
4 изменённых файлов: 16 добавлений и 8 удалений

Просмотреть файл

@ -1,11 +1,11 @@
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static)
if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")
list(APPEND PATCHES fix_libiconv.patch)
endif()
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/kio
REF v5.98.0
REF "v${VERSION}"
SHA512 6ffb44963b266f806150bc3ff9a1c3cf13f2fe7b4bda57e27d9bd9b931bfd757d50ee29f4143f6d282a25f675c8024aff16dc2f91e00ec0c7663eb8effdfee30
HEAD_REF master
PATCHES
@ -26,14 +26,15 @@ vcpkg_cmake_configure(
OPTIONS
-DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
-DBUILD_TESTING=OFF
-DCMAKE_DISABLE_FIND_PACKAGE_GSSAPI=ON
-DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON
-DCMAKE_VERBOSE_MAKEFILE=ON
-DKDE_INSTALL_QTPLUGINDIR=plugins
-DKDE_INSTALL_PLUGINDIR=plugins
-DKDE_INSTALL_LIBEXECDIR=bin
${FEATURE_OPTIONS}
--trace-expand
MAYBE_UNUSED_VARIABLES CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications
MAYBE_UNUSED_VARIABLES
CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications
)
vcpkg_cmake_install()
@ -66,5 +67,3 @@ endif()
file(GLOB LICENSE_FILES "${SOURCE_PATH}/LICENSES/*")
vcpkg_install_copyright(FILE_LIST ${LICENSE_FILES})

Просмотреть файл

@ -1,6 +1,7 @@
{
"name": "kf5kio",
"version": "5.98.0",
"port-version": 1,
"description": "Network transparent access to files and data",
"homepage": "https://api.kde.org/frameworks/kio/html/index.html",
"license": null,
@ -47,7 +48,10 @@
"name": "libmount",
"platform": "linux"
},
"qt5-base",
{
"name": "qt5-base",
"default-features": false
},
{
"name": "qt5-macextras",
"platform": "osx"

Просмотреть файл

@ -3958,7 +3958,7 @@
},
"kf5kio": {
"baseline": "5.98.0",
"port-version": 0
"port-version": 1
},
"kf5newstuff": {
"baseline": "5.98.0",

Просмотреть файл

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "10039455cb818f3b73101008804a8e23d07ccc5a",
"version": "5.98.0",
"port-version": 1
},
{
"git-tree": "955af4dc1289c12676bac762939a7367af07c216",
"version": "5.98.0",