diff --git a/ports/ecm/fix_canberra.patch b/ports/ecm/fix_canberra.patch index dcfcaba6f0..1a6d72a94e 100644 --- a/ports/ecm/fix_canberra.patch +++ b/ports/ecm/fix_canberra.patch @@ -22,7 +22,7 @@ index c54adf99..f9561118 100644 find_package(PkgConfig QUIET) -pkg_check_modules(PC_Canberra libcanberra QUIET) -+pkg_check_modules(PC_Canberra REQUIRED IMPORTED_TARGET libcanberra QUIET) ++pkg_check_modules(PC_Canberra IMPORTED_TARGET libcanberra QUIET) find_library(Canberra_LIBRARIES NAMES canberra diff --git a/ports/ecm/fix_python_version.patch b/ports/ecm/fix_python_version.patch deleted file mode 100644 index a443bb1a64..0000000000 --- a/ports/ecm/fix_python_version.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 12f4266eb71b30da1df92a5d628d402ea1a45b3b Mon Sep 17 00:00:00 2001 -From: Michael Pyne -Date: Sun, 4 Jul 2021 18:47:45 -0400 -Subject: [PATCH] python: Bump maximum version for Python 3 module generator - check. - -The proximate problem is that the Python Module generator cmake script -has started failing for people with Python 3.10, which a CMake backtrace -pointing into FindPythonModuleGeneration.cmake with an error of the form -"The max python version in PythonModuleGeneration must be updated." - -At least one distro has addressed this by simply patching out modules -that happen to use this CMake module [1]. - -From what I can tell and the testing I've done, the cause is pretty -simple: The CMake script attempts to find the best Python 3 version by -starting from an impossible version and working backwards until it finds -a version that is installed. - -As a sanity check, if the "impossible" version is actually present, it -aborts. But this appears to be just a sanity check, and not any sort of -guard against buggy version handling code later. - -While the best fix is probably to start from a known *good* version and -move up until we stop finding better versions, there's problems here -(e.g. a user with 3.6 and 3.8 installed would fail to see 3.7 and so be -left with 3.6 as the "best" match), so I opted just to increase the max -version significantly, and improve the documentation as to what's -happening and whether it is safe to repeat the step again later. - -[1]: https://bugs.gentoo.org/746866 ---- - find-modules/FindPythonModuleGeneration.cmake | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/find-modules/FindPythonModuleGeneration.cmake b/find-modules/FindPythonModuleGeneration.cmake -index 210ba662..6104c1f4 100644 ---- a/find-modules/FindPythonModuleGeneration.cmake -+++ b/find-modules/FindPythonModuleGeneration.cmake -@@ -162,14 +162,19 @@ endif() - - if (NOT GPB_PYTHON3_LIBRARY) - set(_PYTHON3_MIN_VERSION 4) -- set(_PYTHON3_MAX_VERSION 10) - -- _find_python(3 ${_PYTHON3_MAX_VERSION}) # Canary check -+ # This value is safe to increment over time, it is used only as a reasonable -+ # upper bound to start searching from -+ set(_PYTHON3_MAX_VERSION 50) -+ -+ _find_python(3 ${_PYTHON3_MAX_VERSION}) - - if (GPB_PYTHON3_LIBRARY) - message(FATAL_ERROR "The max python version in ${CMAKE_FIND_PACKAGE_NAME} must be updated.") - endif() - -+ # Look for the highest supported version of Python 3 by looking for a minor -+ # version that doesn't exist and decrementing until we find a match. - set(_PYTHON3_FIND_VERSION ${_PYTHON3_MAX_VERSION}) - - while(NOT GPB_PYTHON3_LIBRARY diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake index 5791fce507..b8ac1869d1 100644 --- a/ports/ecm/portfile.cmake +++ b/ports/ecm/portfile.cmake @@ -1,13 +1,12 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/extra-cmake-modules - REF v5.84.0 - SHA512 d49397bcf0d49a95c86c9d9a4e653015ee8b3ef1261b2842439bba7ff3363ac06351fa2df4035c2cb36397d2fc64375a14966ada29f231df51ba26d8e196d6ef + REF v5.87.0 + SHA512 024dd6631d975228d3a2b681266d84bf336bd3152b88d641761a18f5367e740f968240517040ec0d97135b69fd16f4de607e01e76c2c689f65d96ebd520feed5 HEAD_REF master PATCHES fix_canberra.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/187 fix_libmount.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/200 - fix_python_version.patch # Remove on next release ) vcpkg_cmake_configure( @@ -30,3 +29,4 @@ file(INSTALL "${SOURCE_PATH}/COPYING-CMAKE-SCRIPTS" DESTINATION "${CURRENT_PACKA # Allow empty include directory set(VCPKG_POLICY_EMPTY_INCLUDE_FOLDER enabled) + diff --git a/ports/ecm/vcpkg.json b/ports/ecm/vcpkg.json index 6cc48bbdad..4af353b1f3 100644 --- a/ports/ecm/vcpkg.json +++ b/ports/ecm/vcpkg.json @@ -1,17 +1,12 @@ { "name": "ecm", - "version": "5.84.0", - "port-version": 3, + "version": "5.87.0", "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake", "homepage": "https://github.com/KDE/extra-cmake-modules", "dependencies": [ { "name": "vcpkg-cmake", "host": true - }, - { - "name": "vcpkg-cmake-config", - "host": true } ] } diff --git a/ports/kf5archive/add_support_for_static_builds.patch b/ports/kf5archive/add_support_for_static_builds.patch deleted file mode 100644 index 7ad973d393..0000000000 --- a/ports/kf5archive/add_support_for_static_builds.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 5dc3f846c27ee6d55131db475975e3c24cd0c19c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Wed, 28 Jul 2021 11:39:30 +0200 -Subject: [PATCH] Add support for static builds - ---- - KF5ArchiveConfig.cmake.in | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/KF5ArchiveConfig.cmake.in b/KF5ArchiveConfig.cmake.in -index 3d32642..0a738c2 100644 ---- a/KF5ArchiveConfig.cmake.in -+++ b/KF5ArchiveConfig.cmake.in -@@ -4,9 +4,29 @@ include(CMakeFindDependencyMacro) - find_dependency(Qt5Core @REQUIRED_QT_VERSION@) - - -+set(KArchive_HAVE_ZLIB "@ZLIB_FOUND@") - set(KArchive_HAVE_BZIP2 "@BZIP2_FOUND@") - set(KArchive_HAVE_LZMA "@LIBLZMA_FOUND@") - set(KArchive_HAVE_ZSTD "@LibZstd_FOUND@") - -+if (NOT @BUILD_SHARED_LIBS@) -+ if (@ZLIB_FOUND@) -+ find_dependency(ZLIB) -+ endif() -+ -+ if (@BZIP2_FOUND@) -+ find_dependency(BZip2) -+ endif() -+ -+ if (@LIBLZMA_FOUND@) -+ find_dependency(LibLZMA) -+ endif() -+ -+ if (@LibZstd_FOUND@) -+ find_package(PkgConfig) -+ pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") -+ endif() -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/KF5ArchiveTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5archive/add_zstd_to_cmake_config.patch b/ports/kf5archive/add_zstd_to_cmake_config.patch deleted file mode 100644 index 8b960bb4f0..0000000000 --- a/ports/kf5archive/add_zstd_to_cmake_config.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5a79756f381e1a1843cb2171bdc151dad53fb7db Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" -Date: Wed, 7 Jul 2021 03:09:38 +0200 -Subject: [PATCH] Report KArchive_HAVE_ZSTD in CMake Config file to consumers - -Allows users of KArchive to query whether zstd is available, -in the same way as lzma & bzip2 ---- - KF5ArchiveConfig.cmake.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/KF5ArchiveConfig.cmake.in b/KF5ArchiveConfig.cmake.in -index 0d59d63..3d32642 100644 ---- a/KF5ArchiveConfig.cmake.in -+++ b/KF5ArchiveConfig.cmake.in -@@ -6,6 +6,7 @@ find_dependency(Qt5Core @REQUIRED_QT_VERSION@) - - set(KArchive_HAVE_BZIP2 "@BZIP2_FOUND@") - set(KArchive_HAVE_LZMA "@LIBLZMA_FOUND@") -+set(KArchive_HAVE_ZSTD "@LibZstd_FOUND@") - - include("${CMAKE_CURRENT_LIST_DIR}/KF5ArchiveTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch b/ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch deleted file mode 100644 index f3db3a4fb7..0000000000 --- a/ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 9ab5f2bfbe59038b0d0b6ca7f1b22d1c9229c67e Mon Sep 17 00:00:00 2001 -From: Dawid Wrobel -Date: Fri, 30 Jul 2021 10:23:48 +0000 -Subject: [PATCH] Only pkg_check_modules() if PkgConfig is found - ---- - CMakeLists.txt | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bab7661..2cdda70 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -45,7 +45,9 @@ set_package_properties(LibLZMA PROPERTIES - ) - - find_package(PkgConfig) --pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") -+if (PkgConfig_FOUND) -+ pkg_check_modules(LibZstd IMPORTED_TARGET "libzstd") -+endif() - add_feature_info(LibZstd LibZstd_FOUND - "Support for zstd compressed files and data streams" - ) --- -GitLab - diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake index ef1582bc03..165ca84e4f 100644 --- a/ports/kf5archive/portfile.cmake +++ b/ports/kf5archive/portfile.cmake @@ -1,13 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/karchive - REF v5.84.0 - SHA512 82926f62424446df0f4fc300f57ae9bd5baf8e13da2ce4135ac56c0c52a0307bffb06f84ac7e8e658e96ace2ae3d530f27e232061284ac87271404f218e9fdd4 + REF v5.87.0 + SHA512 5c4f2a8d4863f9f0c90b9a12aee2dd00d43797a2c2c778bb4cb6f61fe5c7cd49b4e54d4bee0d811da52a8b86d673b23db62f0810b170bd4b2f2bd0ae2ebbb14f HEAD_REF master PATCHES - only_pkg_check_modules_if_pkgconfig_found.patch # https://invent.kde.org/frameworks/karchive/-/commit/9ab5f2bfbe59038b0d0b6ca7f1b22d1c9229c67e - add_zstd_to_cmake_config.patch # https://invent.kde.org/frameworks/karchive/-/commit/5a79756f381e1a1843cb2171bdc151dad53fb7db - add_support_for_static_builds.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/23 use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24 ) @@ -21,7 +18,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ${FEATURE_OPTIONS} @@ -36,8 +33,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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") + diff --git a/ports/kf5archive/vcpkg.json b/ports/kf5archive/vcpkg.json index 227be8c662..c29c0eb5c9 100644 --- a/ports/kf5archive/vcpkg.json +++ b/ports/kf5archive/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5archive", - "version-semver": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "File compression", "homepage": "https://api.kde.org/frameworks/karchive/html/index.html", "dependencies": [ diff --git a/ports/kf5attica/portfile.cmake b/ports/kf5attica/portfile.cmake index ed6183e4bc..1a9bb1183e 100644 --- a/ports/kf5attica/portfile.cmake +++ b/ports/kf5attica/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/attica - REF v5.84.0 - SHA512 dedaac49d85c791027a567f82909953f06337734c9302ab4147341eb5ebdb14e2a1ffcfdf49d9e0c97e17e065498392f9a1a900557fe8937fa0e680cda2235ea + REF v5.87.0 + SHA512 8d6635e9670713c2ef3101d3c0dbeaab7c34d046010cfef898783eac68980c9bf07d5d09cf00fe3e8862e1e4f5f34b48fd10dfdb69b3744dc5cf13b034522b10 HEAD_REF master ) @@ -16,7 +16,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Attica) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Attica CONFIG_PATH lib/cmake/KF5Attica) vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") @@ -27,3 +27,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + diff --git a/ports/kf5attica/vcpkg.json b/ports/kf5attica/vcpkg.json index 4234fb9a88..9679f4ae4e 100644 --- a/ports/kf5attica/vcpkg.json +++ b/ports/kf5attica/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5attica", - "version-semver": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "A Qt library that implements the Open Collaboration Services API", "homepage": "https://api.kde.org/frameworks/attica/html/index.html", "dependencies": [ diff --git a/ports/kf5auth/portfile.cmake b/ports/kf5auth/portfile.cmake index 806e81226c..d6d8f2a890 100644 --- a/ports/kf5auth/portfile.cmake +++ b/ports/kf5auth/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kauth - REF v5.84.0 - SHA512 9f08f5e7de240c100e7ea6fcd6c71947cacfafbf0631f7e441a64ef36b0d51fa097b8ccc164c7b20441524a7211d84f9fc62d9a2bc62342e26938c133faf0940 + REF v5.87.0 + SHA512 c2e885a6d1db3b5611562768c97e0d2aa50ddef31d99a77e1bcdc13fc760c68b797c0c78ec347ed8b01b573427ac2bd524792fb732e44c60fcef7ec475102f08 HEAD_REF master ) @@ -10,12 +10,10 @@ vcpkg_from_github( file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins - -DKDE_INSTALL_DATAROOTDIR=data - ) vcpkg_cmake_install() @@ -27,10 +25,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + diff --git a/ports/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json index 2942db273a..10db340d1b 100644 --- a/ports/kf5auth/vcpkg.json +++ b/ports/kf5auth/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5auth", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Execute actions as privileged user", "homepage": "https://api.kde.org/frameworks/kauth/html/index.html", "dependencies": [ diff --git a/ports/kf5bookmarks/fix_config_cmake.patch b/ports/kf5bookmarks/fix_config_cmake.patch deleted file mode 100644 index 1a034ccc53..0000000000 --- a/ports/kf5bookmarks/fix_config_cmake.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/KF5BookmarksConfig.cmake.in b/KF5BookmarksConfig.cmake.in -index 0c4494a..de973f7 100644 ---- a/KF5BookmarksConfig.cmake.in -+++ b/KF5BookmarksConfig.cmake.in -@@ -6,6 +6,17 @@ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") - find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) - find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) - -+if (NOT @BUILD_SHARED_LIBS@) -+ if (@Qt5DBus_FOUND@) -+ find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) -+ endif() -+ -+ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5Codecs "@KF_DEP_VERSION@") -+ find_dependency(KF5Config "@KF_DEP_VERSION@") -+ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") -+ find_dependency(KF5XmlGui "@KF_DEP_VERSION@") -+endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KF5BookmarksTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake index 5d509a4bf3..0e10e67868 100644 --- a/ports/kf5bookmarks/portfile.cmake +++ b/ports/kf5bookmarks/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kbookmarks - REF v5.84.0 - SHA512 3ba70c7fb312cd7715f0c14f78a4380150fd8716e93186302c39692609dbedda96d5e82d316ea683ffc9338cc5b4f2c689b24e06d66c3d5d735bae57f36ccad0 + REF v5.87.0 + SHA512 0ba852d6ce908a61073e048dc1556f20d4e45c2312f2401e57c160f30099fe6f17f5368be2e4b536e7fa41f8a106fbde986dec04d214c3d74ee3029ddc575e44 HEAD_REF master - PATCHES - fix_config_cmake.patch ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF @@ -26,4 +26,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json index e07d045695..e4a93e095a 100644 --- a/ports/kf5bookmarks/vcpkg.json +++ b/ports/kf5bookmarks/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5bookmarks", - "version": "5.84.0", + "version": "5.87.0", "description": "Bookmarks management library", "homepage": "https://api.kde.org/frameworks/kbookmarks/html/index.html", "dependencies": [ diff --git a/ports/kf5codecs/portfile.cmake b/ports/kf5codecs/portfile.cmake index a8178e2b62..2cd355450b 100644 --- a/ports/kf5codecs/portfile.cmake +++ b/ports/kf5codecs/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcodecs - REF v5.84.0 - SHA512 77f27883f588e9f4bd5458e4e4a596c494ff4fc0a7230ac757926db13d69f010a72f84d828ae83f48e5019ea96da58251c190dd6d38408f64089ac42501b7439 + REF v5.87.0 + SHA512 119ada2dfae2a74864c1d2cd7873e5a9c8491a2b7e4592e31bf56157fb5957fb4d4ef6e70f50a976f002c1d87232798ba9695c9773fd841bba59f8fbffa0e815 HEAD_REF master ) @@ -27,8 +27,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/data") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json index 5b23da83c4..2aa26730a1 100644 --- a/ports/kf5codecs/vcpkg.json +++ b/ports/kf5codecs/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5codecs", - "version": "5.84.0", - "port-version": 3, + "version": "5.87.0", "description": "String encoding library", "homepage": "https://api.kde.org/frameworks/kcodecs/html/index.html", "dependencies": [ diff --git a/ports/kf5completion/portfile.cmake b/ports/kf5completion/portfile.cmake index a24e0c803b..7315c22d76 100644 --- a/ports/kf5completion/portfile.cmake +++ b/ports/kf5completion/portfile.cmake @@ -1,35 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcompletion - REF v5.84.0 - SHA512 1aee65de9e8aa83274d772afcce764ab800e94cffb8ab203c53ffdb944c53e46115afe4148dadf777c0a1afc815b9382e4e319ba09e266b4487405307d838322 + REF v5.87.0 + SHA512 39b8fdb11122c35e97592db84005729fa500b3d0f558573b9f632079f3ce9aef1dff7f62c80f927788e302fc11bb7173589ea5474ea4f4177e43e0aae33e35f9 HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Completion) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Completion CONFIG_PATH lib/cmake/KF5Completion) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json index 9a185f1a13..ea7b308e93 100644 --- a/ports/kf5completion/vcpkg.json +++ b/ports/kf5completion/vcpkg.json @@ -1,13 +1,20 @@ { "name": "kf5completion", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Text completion helpers and widgets", "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html", "dependencies": [ "ecm", "kf5config", "kf5widgetsaddons", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake index ddd8427662..ca548d3460 100644 --- a/ports/kf5config/portfile.cmake +++ b/ports/kf5config/portfile.cmake @@ -1,53 +1,49 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kconfig - REF v5.84.0 - SHA512 54d28ce5dae8c3b40c338d7aa848296b0aa4f56f94ca32d123df182e34e50c9969bdc1672c28e5412f7df7d94ff4305377dbf42c05c69965c023af762cfc29bf + REF v5.87.0 + SHA512 b9ad658f75c0ea97e69f203b60e1755cbcc3eadf807b72a9fcd063d1d544bc916a3bee8308a69d45c2f00291376f6ef63565b93d90bc426b171c6ad734016c82 HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DKDE_INSTALL_LIBEXECDIR=bin ) -vcpkg_install_cmake() +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Config CONFIG_PATH lib/cmake/KF5Config) +vcpkg_copy_pdbs() -file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/${PORT}) +vcpkg_copy_tools( + TOOL_NAMES kreadconfig5 kwriteconfig5 + AUTO_CLEAN +) -if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconfig_compiler_kf5.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kconfig_compiler_kf5.exe) - file(RENAME ${CURRENT_PACKAGES_DIR}/bin/kconf_update.exe ${CURRENT_PACKAGES_DIR}/tools/${PORT}/kconf_update.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5.exe) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5.exe) - file (GLOB EXES ${CURRENT_PACKAGES_DIR}/debug/bin/*.exe) - file(REMOVE ${EXES}) -else() - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kreadconfig5) - file(REMOVE ${CURRENT_PACKAGES_DIR}/bin/kwriteconfig5) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kreadconfig5) - file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/kwriteconfig5) +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(LIBEXEC_SUBFOLDER "kf5/") endif() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Config) +vcpkg_copy_tools( + TOOL_NAMES kconf_update kconfig_compiler_kf5 + SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/${LIBEXEC_SUBFOLDER}" + DESTINATION "${CURRENT_PACKAGES_DIR}/tools/${PORT}/${LIBEXEC_SUBFOLDER}" + AUTO_CLEAN +) -vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/${PORT}) -file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../data") -vcpkg_copy_pdbs() +file(APPEND ${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf "Data = ../../share") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -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(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") + +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + diff --git a/ports/kf5config/vcpkg.json b/ports/kf5config/vcpkg.json index cccf3ac82a..5be6027ca9 100644 --- a/ports/kf5config/vcpkg.json +++ b/ports/kf5config/vcpkg.json @@ -1,12 +1,19 @@ { "name": "kf5config", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Configuration system", "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html", "dependencies": [ "ecm", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5configwidgets/add_support_for_static_builds.patch b/ports/kf5configwidgets/add_support_for_static_builds.patch deleted file mode 100644 index 2578a9e66e..0000000000 --- a/ports/kf5configwidgets/add_support_for_static_builds.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 743ec1f30b449b048c942f194ad665bf2170bbf1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Thu, 26 Aug 2021 16:48:23 +0200 -Subject: [PATCH] Add support for static builds - ---- - KF5ConfigWidgetsConfig.cmake.in | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -diff --git a/KF5ConfigWidgetsConfig.cmake.in b/KF5ConfigWidgetsConfig.cmake.in -index 57c83f0..78fc736 100644 ---- a/KF5ConfigWidgetsConfig.cmake.in -+++ b/KF5ConfigWidgetsConfig.cmake.in -@@ -8,5 +8,19 @@ find_dependency(KF5Codecs "@KF_DEP_VERSION@") - find_dependency(KF5Config "@KF_DEP_VERSION@") - find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") - -+ -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") -+ -+ if (NOT ANDROID) -+ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") -+ endif() -+ -+ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5I18n "@KF_DEP_VERSION@") -+endif() -+ -+ - include("${CMAKE_CURRENT_LIST_DIR}/KF5ConfigWidgetsTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5configwidgets/portfile.cmake b/ports/kf5configwidgets/portfile.cmake index 2f1a73a5f3..6fa012052f 100644 --- a/ports/kf5configwidgets/portfile.cmake +++ b/ports/kf5configwidgets/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kconfigwidgets - REF v5.84.0 - SHA512 da03f4cfc2a64b3ccccfe2b6b7f392f84aba2b975edbf6a5b08a14604ccb565a4491c7eb707af7191345b55ca81e864b7ee13fe648589a56f3226c26160ed024 + REF v5.87.0 + SHA512 0c7205394d270ca867387c4db01af9517fc9a19a2f134dc0ec53aa78bd49ec645c66aab5f2b6d023b68a1e0b0fbddfe17e85db77b90c26df8d40cffe9e6a61ec HEAD_REF master - PATCHES - add_support_for_static_builds.patch # https://invent.kde.org/frameworks/kconfigwidgets/-/merge_requests/71 ) vcpkg_check_features( @@ -21,6 +19,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON -DKDE_INSTALL_PLUGINDIR=plugins -DKDE_INSTALL_QTPLUGINDIR=plugins ${FEATURE_OPTIONS} @@ -37,4 +36,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json index 4950f72f91..35baff79cf 100644 --- a/ports/kf5configwidgets/vcpkg.json +++ b/ports/kf5configwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5configwidgets", - "version-semver": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Widgets for configuration dialogs", "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5coreaddons/fix_static_build.patch b/ports/kf5coreaddons/fix_static_build.patch deleted file mode 100644 index 400af0032c..0000000000 --- a/ports/kf5coreaddons/fix_static_build.patch +++ /dev/null @@ -1,51 +0,0 @@ -From de4e22fe644d5df9066ba78f778032a42c2f19b9 Mon Sep 17 00:00:00 2001 -From: Nicolas Fella -Date: Sat, 7 Aug 2021 17:24:44 +0200 -Subject: [PATCH] Fix issue when building KCrash static - -KCoreAddons forward declares a function from KCrash. - -It contains a Q_DECL_IMPORT but that breaks when doing a static build. - -Only add the Q_DECL_IMPORT when we are doing a dynamic build. - -BUG: 440416 ---- - src/lib/CMakeLists.txt | 4 ++++ - src/lib/kaboutdata.h | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/lib/CMakeLists.txt b/src/lib/CMakeLists.txt -index 8e9006fd..b3ea957f 100644 ---- a/src/lib/CMakeLists.txt -+++ b/src/lib/CMakeLists.txt -@@ -16,6 +16,10 @@ configure_file(util/config-accountsservice.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/c - add_library(KF5CoreAddons) - add_library(KF5::CoreAddons ALIAS KF5CoreAddons) - -+if(NOT BUILD_SHARED_LIBS) -+ target_compile_definitions(KF5CoreAddons PUBLIC -DKCOREADDONS_STATIC) -+endif() -+ - ecm_create_qm_loader(KF5CoreAddons kcoreaddons5_qt) - - if (FAM_FOUND) -diff --git a/src/lib/kaboutdata.h b/src/lib/kaboutdata.h -index 4309b145..a0222861 100644 ---- a/src/lib/kaboutdata.h -+++ b/src/lib/kaboutdata.h -@@ -27,7 +27,11 @@ class KAboutData; - class KPluginMetaData; - namespace KCrash - { -+#ifdef KCOREADDONS_STATIC -+void defaultCrashHandler(int sig); -+#else - Q_DECL_IMPORT void defaultCrashHandler(int sig); -+#endif - } - - /** --- -GitLab - diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake index e137973256..7403138bba 100644 --- a/ports/kf5coreaddons/portfile.cmake +++ b/ports/kf5coreaddons/portfile.cmake @@ -1,10 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcoreaddons - REF v5.84.0 - SHA512 58a802d03bea135c192265651540f9f87066b20ee4af620a94a874ec3992c5e734d1ab1e4ccb082de97389fa3479fd3672ec586c3dd36c9b4a5422c7be98d119 + REF v5.87.0 + SHA512 bbba155cf347add1a364bd8a3d727096afa47bb91b9bdcf87abf9b66de9f5822e301f67531e8de186b3e912c7a20816aab11f31e4b64a0a00f5be1e8ba74f17e PATCHES - fix_static_build.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/122 fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129 ) @@ -12,7 +11,7 @@ vcpkg_from_github( file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) @@ -35,4 +34,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -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/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json index 2237369821..00eaa7889b 100644 --- a/ports/kf5coreaddons/vcpkg.json +++ b/ports/kf5coreaddons/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5coreaddons", - "version-semver": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Addons to QtCore", "homepage": "https://api.kde.org/frameworks/kcoreaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5crash/portfile.cmake b/ports/kf5crash/portfile.cmake index b6382e19c0..a76f24f82b 100644 --- a/ports/kf5crash/portfile.cmake +++ b/ports/kf5crash/portfile.cmake @@ -1,18 +1,16 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcrash - REF v5.84.0 - SHA512 db37a481e0d34e0024cabd77c22680171fa383ea300c56c73f807380fd818263d27f36fb012fc6604b462dbf9374db39bab94c4dc2c3bff488ac9812d01eb2dd + REF v5.87.0 + SHA512 c239419dd1a9a48ef87d901a0d54f8f918782b84a10be9c903d6b6c92490b710ab86c8049d4a950aa452ca2e29f90ce8ada4b3b4b90e57d3504925efa14915e6 HEAD_REF master - PATCHES - support_static_builds.patch # https://invent.kde.org/frameworks/kcrash/-/merge_requests/23 ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) @@ -21,13 +19,12 @@ vcpkg_cmake_install() vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Crash CONFIG_PATH lib/cmake/KF5Crash) vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin/data") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + diff --git a/ports/kf5crash/support_static_builds.patch b/ports/kf5crash/support_static_builds.patch deleted file mode 100644 index 4c5eb8e529..0000000000 --- a/ports/kf5crash/support_static_builds.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dc45a01fec854b5e2a49196e82e1a336ab642764 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Wed, 28 Jul 2021 03:04:39 +0200 -Subject: [PATCH] Support static builds - ---- - KF5CrashConfig.cmake.in | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/KF5CrashConfig.cmake.in b/KF5CrashConfig.cmake.in -index 0222495..494c810 100644 ---- a/KF5CrashConfig.cmake.in -+++ b/KF5CrashConfig.cmake.in -@@ -5,6 +5,14 @@ - include(CMakeFindDependencyMacro) - find_dependency(Qt5Core @REQUIRED_QT_VERSION@) - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(KF5CoreAddons REQUIRED) -+ find_dependency(KF5WindowSystem REQUIRED) -+ -+ if (@X11_FOUND@) -+ find_dependency(Qt5X11Extras REQUIRED) -+ endif() -+endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KF5CrashTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json index 9b6b62bc91..2a8a491274 100644 --- a/ports/kf5crash/vcpkg.json +++ b/ports/kf5crash/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5crash", - "version-semver": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "KCrash provides support for intercepting and handling application crashes.", "homepage": "https://api.kde.org/frameworks/kcrash/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/portfile.cmake b/ports/kf5dbusaddons/portfile.cmake index 73aab78ae3..56addda578 100644 --- a/ports/kf5dbusaddons/portfile.cmake +++ b/ports/kf5dbusaddons/portfile.cmake @@ -1,16 +1,18 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kdbusaddons - REF v5.84.0 - SHA512 cef640da611ead5fc002f365a9918db1bebe494d7dc456dca8a239873b7f53c1aee81d122cbc15d88cb1deeae1ab7db8c2a79a2847deb87f29c5f1c19a46ab46 + REF v5.87.0 + SHA512 d37a0e28d6a78bbde3fbf0cb4669711edebc27b295beb7a29f60751cbd21448c3ea6f82e487b889e466908f2217d1477552cd4ae3399b761700f0789edfc02d4 HEAD_REF master + PATCHES + x11_private_dependency.diff ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) @@ -27,9 +29,7 @@ elseif(VCPKG_TARGET_IS_WINDOWS) file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin/kquitapp5${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/debug/bin/kquitapp5${VCPKG_HOST_EXECUTABLE_SUFFIX}") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json index dd485ad52e..464ed0b7f9 100644 --- a/ports/kf5dbusaddons/vcpkg.json +++ b/ports/kf5dbusaddons/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5dbusaddons", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Convenience classes for D-Bus", "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5dbusaddons/x11_private_dependency.diff b/ports/kf5dbusaddons/x11_private_dependency.diff new file mode 100644 index 0000000000..1054028bf4 --- /dev/null +++ b/ports/kf5dbusaddons/x11_private_dependency.diff @@ -0,0 +1,16 @@ +diff --git a/KF5DBusAddonsConfig.cmake.in b/KF5DBusAddonsConfig.cmake.in +index 36f55e452635a8edc3a883fe58ac69d490e5e596..2f6f02fc4f3f70052b7206156e74d94f10037936 100644 +--- a/KF5DBusAddonsConfig.cmake.in ++++ b/KF5DBusAddonsConfig.cmake.in +@@ -3,6 +3,11 @@ + include(CMakeFindDependencyMacro) + find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) + ++if(NOT @BUILD_SHARED_LIBS@) ++ if(@Qt5X11Extras_FOUND@) ++ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) ++ endif() ++endif() + + include("${CMAKE_CURRENT_LIST_DIR}/KF5DBusAddonsTargets.cmake") + @PACKAGE_INCLUDE_QCHTARGETS@ diff --git a/ports/kf5declarative/fix_config_cmake.patch b/ports/kf5declarative/fix_config_cmake.patch deleted file mode 100644 index 1ca8e9ed64..0000000000 --- a/ports/kf5declarative/fix_config_cmake.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/KF5DeclarativeConfig.cmake.in b/KF5DeclarativeConfig.cmake.in -index d66617c..1bf4e0a 100644 ---- a/KF5DeclarativeConfig.cmake.in -+++ b/KF5DeclarativeConfig.cmake.in -@@ -6,5 +6,15 @@ find_dependency(KF5Config "@KF_DEP_VERSION@") - find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") - find_dependency(KF5Package "@KF_DEP_VERSION@") - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(KF5I18n "@KF_DEP_VERSION@") -+ find_dependency(KF5KIO "@KF_DEP_VERSION@") -+ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") -+ -+ if (ANDROID) -+ find_dependency(epoxy) -+ endif() -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/KF5DeclarativeTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5declarative/portfile.cmake b/ports/kf5declarative/portfile.cmake index 6d429c2e87..0378396e1c 100644 --- a/ports/kf5declarative/portfile.cmake +++ b/ports/kf5declarative/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kdeclarative - REF v5.84.0 - SHA512 5785c49173ccd22aaed040b2590d0f44b6e138bd5c8980ce0d4a31e2bd364f830a256be3dfb7806d206b2197d882c791f73c60f7c973749c4c3e1c7bbf541822 + REF v5.87.0 + SHA512 48480a30f91ffec9841668a0c263c8fab3144b0a973b2100715cfee7c132e159b004e6ddb3ed46ddb9e08f2be4251596a14e23a9184d2de4b256bd4c3df216d3 HEAD_REF master PATCHES - fix_config_cmake.patch dont_force_shared.diff ) diff --git a/ports/kf5declarative/vcpkg.json b/ports/kf5declarative/vcpkg.json index 500af770ad..b37e47ad6e 100644 --- a/ports/kf5declarative/vcpkg.json +++ b/ports/kf5declarative/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5declarative", - "version": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Integration of QML and KDE work spaces", "homepage": "https://api.kde.org/frameworks/kdeclarative/html/index.html", "dependencies": [ diff --git a/ports/kf5globalaccel/portfile.cmake b/ports/kf5globalaccel/portfile.cmake index decf668c1d..0d6646aa92 100644 --- a/ports/kf5globalaccel/portfile.cmake +++ b/ports/kf5globalaccel/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kglobalaccel - REF v5.84.0 - SHA512 2b18c708175572dd9787fde799f6dc01ab2e0006dfb75ef95d357ae91cf4dda6c719c58e4b08fd10038ad5b6e404adeb359f63371ec7ee0887e349e8ce469c51 + REF v5.87.0 + SHA512 2fde268730d840a56e09809e2486182b6df4b7567685bc5dce41fea48ae04d504f780ff5698ff1794142b6e25321296dc2b6332bf2f4160f68f9567123d3a96a HEAD_REF master + PATCHES + xcb_xtest_optional.diff # https://invent.kde.org/frameworks/kglobalaccel/-/merge_requests/30 ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure @@ -20,8 +22,8 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5GlobalAccel CONFIG_PATH lib/cmake/KF5Gl vcpkg_copy_pdbs() vcpkg_copy_tools( - TOOL_NAMES kglobalaccel5 - AUTO_CLEAN + TOOL_NAMES kglobalaccel5 + AUTO_CLEAN ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") diff --git a/ports/kf5globalaccel/vcpkg.json b/ports/kf5globalaccel/vcpkg.json index 25aefeecae..71285edbde 100644 --- a/ports/kf5globalaccel/vcpkg.json +++ b/ports/kf5globalaccel/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5globalaccel", - "version-semver": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "lobal desktop keyboard shortcuts", "homepage": "https://api.kde.org/frameworks/kglobalaccel/html/index.html", "dependencies": [ diff --git a/ports/kf5globalaccel/xcb_xtest_optional.diff b/ports/kf5globalaccel/xcb_xtest_optional.diff new file mode 100644 index 0000000000..affb39e4d5 --- /dev/null +++ b/ports/kf5globalaccel/xcb_xtest_optional.diff @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b5b58f6..17eaed8 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -49,7 +49,7 @@ find_package(KF5WindowSystem ${KF_DEP_VERSION} REQUIRED) + + # no X11 stuff on mac + if (NOT APPLE) +- find_package(XCB MODULE COMPONENTS XCB KEYSYMS XTEST XKB) ++ find_package(XCB MODULE COMPONENTS XCB KEYSYMS XKB OPTIONAL_COMPONENTS XTEST) + set_package_properties(XCB PROPERTIES DESCRIPTION "X protocol C-language Binding" + URL "http://xcb.freedesktop.org" + TYPE OPTIONAL diff --git a/ports/kf5guiaddons/add_missing_static_dependencies.patch b/ports/kf5guiaddons/add_missing_static_dependencies.patch deleted file mode 100644 index c8a5fcd667..0000000000 --- a/ports/kf5guiaddons/add_missing_static_dependencies.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 7b0a5566acbdb6ff8e7eca3e5e75aacbf2abff9f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Sat, 28 Aug 2021 17:08:46 +0200 -Subject: [PATCH] Add missing static dependency to Config.cmake.in - -- move find_package(Qt5X11Extras) to root CMakeLists.txt ---- - CMakeLists.txt | 5 +++++ - KF5GuiAddonsConfig.cmake.in | 5 ++++- - src/CMakeLists.txt | 24 ++++++++++-------------- - 3 files changed, 19 insertions(+), 15 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 337122e..80633e5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -39,6 +39,11 @@ if (NOT APPLE AND NOT WIN32) - find_package(XCB MODULE COMPONENTS XCB) - endif() - -+set(WITH_XCB) -+if (NOT APPLE AND X11_FOUND AND X11_Xkb_FOUND AND XCB_XCB_FOUND) -+ find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) -+endif() -+ - if (WITH_WAYLAND) - find_package(Qt5WaylandClient ${REQUIRED_QT_VERSION} NO_MODULE) - find_package(QtWaylandScanner REQUIRED) -diff --git a/KF5GuiAddonsConfig.cmake.in b/KF5GuiAddonsConfig.cmake.in -index a3c3e58..ae17f6b 100644 ---- a/KF5GuiAddonsConfig.cmake.in -+++ b/KF5GuiAddonsConfig.cmake.in -@@ -6,9 +6,12 @@ include(CMakeFindDependencyMacro) - find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) - - if (NOT @BUILD_SHARED_LIBS@) -+ if (@Qt5X11Extras_FOUND@) -+ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) -+ endif() - if (@WITH_WAYLAND@) - find_dependency(Wayland REQUIRED Client) -- find_dependency(Qt5WaylandClient) -+ find_dependency(Qt5WaylandClient @REQUIRED_QT_VERSION@) - find_dependency(QtWaylandScanner) - endif() - endif() -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 1dd66e8..ae0e0aa 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -58,20 +58,16 @@ target_include_directories(KF5GuiAddons INTERFACE "$") - target_link_libraries(KF5GuiAddons PUBLIC Qt5::Gui) - --set(WITH_XCB) --if (NOT APPLE AND X11_FOUND AND X11_Xkb_FOUND AND XCB_XCB_FOUND) -- find_package(Qt5X11Extras ${REQUIRED_QT_VERSION} NO_MODULE) -- if (Qt5X11Extras_FOUND) -- add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp) -- target_include_directories (kmodifierkey_xcb PRIVATE -- ${X11_Xkb_INCLUDE_PATH} -- ${X11_Xlib_INCLUDE_PATH} -- ${XCB_XCB_INCLUDE_DIR} -- ) -- target_link_libraries(kmodifierkey_xcb PRIVATE ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} Qt5::X11Extras KF5::GuiAddons) -- install( TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kguiaddons/kmodifierkey/) -- endif() --endif () -+if (Qt5X11Extras_FOUND) -+ add_library(kmodifierkey_xcb MODULE util/kmodifierkeyinfoprovider_xcb.cpp) -+ target_include_directories (kmodifierkey_xcb PRIVATE -+ ${X11_Xkb_INCLUDE_PATH} -+ ${X11_Xlib_INCLUDE_PATH} -+ ${XCB_XCB_INCLUDE_DIR} -+ ) -+ target_link_libraries(kmodifierkey_xcb PRIVATE ${X11_LIBRARIES} ${XCB_XCB_LIBRARY} Qt5::X11Extras KF5::GuiAddons) -+ install( TARGETS kmodifierkey_xcb DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kguiaddons/kmodifierkey/) -+endif() - - ecm_generate_headers(KGuiAddons_HEADERS - HEADER_NAMES --- -GitLab - diff --git a/ports/kf5guiaddons/portfile.cmake b/ports/kf5guiaddons/portfile.cmake index f6da2d131a..715e33b51c 100644 --- a/ports/kf5guiaddons/portfile.cmake +++ b/ports/kf5guiaddons/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kguiaddons - REF v5.84.0 - SHA512 e5905c0aa5343ce3d4cd3765cb81390fc89fb78aec3c8de8b31d1dada8074d04f549ff785f3988498d2e274d7cb08a35a83ba031d18562049e6ca41d18ea52ee + REF v5.87.0 + SHA512 20d55c05d5cc2223667a6ca888c7d3e61ec3e1b0f576f0aeff57fce13edb763910fb0bb84d93f53d3965d4a48169fd0fdf2cb5f49946b0e32b25ba4d7645123b HEAD_REF master PATCHES - add_missing_static_dependencies.patch # https://invent.kde.org/frameworks/kguiaddons/-/merge_requests/25 fix_cmake.patch # https://github.com/microsoft/vcpkg/issues/17607#issuecomment-831518812 ) @@ -43,3 +42,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") 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 c152961a8f..370074475f 100644 --- a/ports/kf5guiaddons/vcpkg.json +++ b/ports/kf5guiaddons/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5guiaddons", - "version-semver": "5.84.0", - "port-version": 3, + "version": "5.87.0", "description": "Addons to QtGui", "homepage": "https://api.kde.org/frameworks/kguiaddons/html/index.html", "dependencies": [ diff --git a/ports/kf5holidays/portfile.cmake b/ports/kf5holidays/portfile.cmake index ee0ae5f446..317a47e09c 100644 --- a/ports/kf5holidays/portfile.cmake +++ b/ports/kf5holidays/portfile.cmake @@ -1,35 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kholidays - REF v5.84.0 - SHA512 2e4813b3ca36694e1231b41372baf9a29f80ba44f28525863cedda97ebb766a5d04dbb65422186d97ec753768bd772081fbaf1a91a33ab4556acbea6eb2510f5 + REF v5.87.0 + SHA512 818c9bb33fb18f9e0cb2943458cf1f0ca868c9e406225d7b33eff441d8c22a0598a83003a8afb0af1af00c133c578791ded21b62bcadf89600bb871e0c927f65 HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Holidays) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Holidays CONFIG_PATH lib/cmake/KF5Holidays) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/qml ${CURRENT_PACKAGES_DIR}/debug/qml ) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/qml ${CURRENT_PACKAGES_DIR}/qml ) - -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5holidays/vcpkg.json b/ports/kf5holidays/vcpkg.json index 1993091f78..f5b26870f9 100644 --- a/ports/kf5holidays/vcpkg.json +++ b/ports/kf5holidays/vcpkg.json @@ -1,11 +1,18 @@ { "name": "kf5holidays", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Holiday calculation library", "dependencies": [ "ecm", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index e7825c86ef..d1f0177497 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -5,8 +5,8 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/ki18n - REF v5.84.0 - SHA512 611481b0d5f387b6e1201c1d38e050bd6c956607d059679c68f39d8560cdde666709f5aa1ae770e200fb81e902da85160eb3eeaf5c0bdb02c0ff13782df1d907 + REF v5.87.0 + SHA512 75f5989fe25e2d192aaf91c69cd84a8a0eff21dd64a668f1cab36f9c55e03c83847a900823f2affe89447c9402fbc3efb6531733e8282d61c959f212f886f91f PATCHES ${PATCHES} ) @@ -15,28 +15,24 @@ vcpkg_find_acquire_program(PYTHON3) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DPYTHON_EXECUTABLE=${PYTHON3} ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5I18n) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5I18n CONFIG_PATH lib/cmake/KF5I18n) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +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) diff --git a/ports/kf5i18n/vcpkg.json b/ports/kf5i18n/vcpkg.json index bab7f151de..d5c17c0633 100644 --- a/ports/kf5i18n/vcpkg.json +++ b/ports/kf5i18n/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5i18n", - "version": "5.84.0", - "port-version": 3, + "version": "5.87.0", "description": "Advanced internationalization framework", "homepage": "https://api.kde.org/frameworks/ki18n/html/index.html", "dependencies": [ @@ -16,6 +15,14 @@ }, "libiconv", "qt5-declarative", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5iconthemes/fix_config_cmake.patch b/ports/kf5iconthemes/fix_config_cmake.patch deleted file mode 100644 index 6fa107c37b..0000000000 --- a/ports/kf5iconthemes/fix_config_cmake.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 2d9a393978ff6ae9c5577a3595cd761b199dc4fd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Thu, 26 Aug 2021 12:06:54 +0200 -Subject: [PATCH] Add support for static builds - ---- - KF5IconThemesConfig.cmake.in | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) - -diff --git a/KF5IconThemesConfig.cmake.in b/KF5IconThemesConfig.cmake.in -index 79688bb..d91f546 100644 ---- a/KF5IconThemesConfig.cmake.in -+++ b/KF5IconThemesConfig.cmake.in -@@ -3,6 +3,21 @@ - include(CMakeFindDependencyMacro) - find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(Qt5Widgets "@REQUIRED_QT_VERSION@") -+ find_dependency(Qt5Svg "@REQUIRED_QT_VERSION@") -+ -+ if (NOT ANDROID) -+ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") -+ endif() -+ -+ find_dependency(KF5Archive "@KF_DEP_VERSION@") -+ find_dependency(KF5I18n "@KF_DEP_VERSION@") -+ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") -+ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") -+endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KF5IconThemesTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5iconthemes/portfile.cmake b/ports/kf5iconthemes/portfile.cmake index 03d00588be..3601289007 100644 --- a/ports/kf5iconthemes/portfile.cmake +++ b/ports/kf5iconthemes/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kiconthemes - REF v5.84.0 - SHA512 ca5645d6e4fde4f60c6f16c911539f4056060cc22afae275459632bc7069352b068b1727eb75b898d319e6eef3df9ddc35d8e22d4c1d05a657b112378e56731e + REF v5.87.0 + SHA512 891b9667cbe57878ad08c81c9304ff380b8cb954dc09b3cd1d6ea7fd6c9efb0b1a08ef0d734fa17563e72196abc3e7674fb83957df0a0e2aa0ce868aa7505925 HEAD_REF master - PATCHES - fix_config_cmake.patch ) vcpkg_check_features( @@ -48,4 +46,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5iconthemes/vcpkg.json b/ports/kf5iconthemes/vcpkg.json index 3c7db55beb..d0ea0c7561 100644 --- a/ports/kf5iconthemes/vcpkg.json +++ b/ports/kf5iconthemes/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5iconthemes", - "version": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Icon GUI utilities", "homepage": "https://api.kde.org/frameworks/kiconthemes/html/index.html", "dependencies": [ diff --git a/ports/kf5itemmodels/portfile.cmake b/ports/kf5itemmodels/portfile.cmake index 5e9616cb72..85543109bc 100644 --- a/ports/kf5itemmodels/portfile.cmake +++ b/ports/kf5itemmodels/portfile.cmake @@ -1,34 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kitemmodels - REF v5.84.0 - SHA512 1fd6a6194a718184dcbed0131a2b93575382b3ef7620049cb7a1ac2e55f271113c880d90b76fd6967b720fc44762f10119e8629bda30e6dea10f61ce22f9e02c + REF v5.87.0 + SHA512 bb42c4c5c8518de2114fc50a1e3f263de55594e3dfe88ce7a8111ebd9760976e282ca07d36af05911dbe70ed5cf6c6b787f667457d385a41e8dac7abb046babe ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_QMLDIR=qml ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5ItemModels) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemModels CONFIG_PATH lib/cmake/KF5ItemModels) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +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) diff --git a/ports/kf5itemmodels/vcpkg.json b/ports/kf5itemmodels/vcpkg.json index 5e628b41a7..1c0519bfb6 100644 --- a/ports/kf5itemmodels/vcpkg.json +++ b/ports/kf5itemmodels/vcpkg.json @@ -1,12 +1,19 @@ { "name": "kf5itemmodels", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Models for Qt Model/View system", "homepage": "https://api.kde.org/frameworks/kitemmodels/html/index.html", "dependencies": [ "ecm", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5itemviews/portfile.cmake b/ports/kf5itemviews/portfile.cmake index 567e8f7708..9c554c77d7 100644 --- a/ports/kf5itemviews/portfile.cmake +++ b/ports/kf5itemviews/portfile.cmake @@ -1,34 +1,30 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kitemviews - REF v5.84.0 - SHA512 d6a16ebbe57b6ac1b766d77b8b262b0ec72a5e256e5b3fbf7b95d901b4e45300eda2933f74a5a66cb6b2fec062fb4a6c9253e3376b13ab889f0bfd52c23cf5d4 + REF v5.87.0 + SHA512 a30b4da714e7ef6729cbe30248636a8f7db93de4580e56690bb6ed5c8033aa87cb8fd2bb46367b658984207aad4105e8b4889ee345efae9800e47cd755991bdb ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5ItemViews) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5ItemViews CONFIG_PATH lib/cmake/KF5ItemViews) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +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) diff --git a/ports/kf5itemviews/vcpkg.json b/ports/kf5itemviews/vcpkg.json index d80af211cb..e73617105e 100644 --- a/ports/kf5itemviews/vcpkg.json +++ b/ports/kf5itemviews/vcpkg.json @@ -1,12 +1,19 @@ { "name": "kf5itemviews", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Widget addons for Qt Model/View", "homepage": "https://api.kde.org/frameworks/kitemviews/html/index.html", "dependencies": [ "ecm", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5jobwidgets/portfile.cmake b/ports/kf5jobwidgets/portfile.cmake index f285c8a50d..237d814c5b 100644 --- a/ports/kf5jobwidgets/portfile.cmake +++ b/ports/kf5jobwidgets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kjobwidgets - REF v5.84.0 - SHA512 57aa8d5756e1c9ce955975bfb5dc33ed78aaa984420effbb3b79984f9fd46794f3da092185bbcefe0464228d8f504349f7efd3a0ae79406954dc9ea84b3553f8 + REF v5.87.0 + SHA512 f5b2d4d36bf9b5a3e29e2fdceb532906632e13af7833c6ef4a8e2f81e3576f612925c7bc95c353eb94b2816af3b48b4d1cc02c4aa0ff6cbe89dbf9006a07c94b HEAD_REF master ) @@ -16,7 +16,7 @@ vcpkg_cmake_configure( ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5JobWidgets) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5JobWidgets CONFIG_PATH lib/cmake/KF5JobWidgets) vcpkg_copy_pdbs() @@ -25,7 +25,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -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") + diff --git a/ports/kf5jobwidgets/vcpkg.json b/ports/kf5jobwidgets/vcpkg.json index b02a341d0b..7c78986cf3 100644 --- a/ports/kf5jobwidgets/vcpkg.json +++ b/ports/kf5jobwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5jobwidgets", - "version-semver": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Widgets for showing progress of asynchronous jobs", "homepage": "https://api.kde.org/frameworks/kjobwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5kcmutils/fix_cmake_config.patch b/ports/kf5kcmutils/fix_cmake_config.patch deleted file mode 100644 index 0932e46ad3..0000000000 --- a/ports/kf5kcmutils/fix_cmake_config.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/KF5KCMUtilsConfig.cmake.in b/KF5KCMUtilsConfig.cmake.in -index 9871fba..ddcf6ea 100644 ---- a/KF5KCMUtilsConfig.cmake.in -+++ b/KF5KCMUtilsConfig.cmake.in -@@ -4,6 +4,20 @@ include(CMakeFindDependencyMacro) - find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") - find_dependency(KF5Service "@KF_DEP_VERSION@") - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(Qt5DBus "@REQUIRED_QT_VERSION@") -+ find_dependency(Qt5Qml "@REQUIRED_QT_VERSION@") -+ find_dependency(Qt5Quick "@REQUIRED_QT_VERSION@") -+ find_dependency(Qt5QuickWidgets "@REQUIRED_QT_VERSION@") -+ -+ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5I18n "@KF_DEP_VERSION@") -+ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") -+ find_dependency(KF5XmlGui "@KF_DEP_VERSION@") -+ find_dependency(KF5Declarative "@KF_DEP_VERSION@") -+endif() -+ - @PACKAGE_SETUP_AUTOMOC_VARIABLES@ - - include("${CMAKE_CURRENT_LIST_DIR}/KF5KCMUtilsTargets.cmake") --- -GitLab - diff --git a/ports/kf5kcmutils/portfile.cmake b/ports/kf5kcmutils/portfile.cmake index 58678e7142..260e1a6bc1 100644 --- a/ports/kf5kcmutils/portfile.cmake +++ b/ports/kf5kcmutils/portfile.cmake @@ -1,15 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kcmutils - REF v5.84.0 - SHA512 e5f6347416143775e660430d582db3a60153b75063e7079bb3743043132f2e2f0d01234229f5eb1b4678e29d6981d03bd826622924ec7e385900df9067676f5b + REF v5.87.0 + SHA512 8d0362cf75acc47b6fffe178f76881937180b9143472e8ae69930967f63205ae52c5f300fda122ab3d4641d5f5b1b5d3e19d2e9797963d1ae1765f223f053277 HEAD_REF master - PATCHES - fix_cmake_config.patch ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF diff --git a/ports/kf5kcmutils/vcpkg.json b/ports/kf5kcmutils/vcpkg.json index ac0a6a3b97..c63fe418a8 100644 --- a/ports/kf5kcmutils/vcpkg.json +++ b/ports/kf5kcmutils/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5kcmutils", - "version": "5.84.0", + "version": "5.87.0", "description": "Utilities for KDE System Settings modules", "homepage": "https://api.kde.org/frameworks/kcmutils/html/index.html", "dependencies": [ diff --git a/ports/kf5kio/fix_config_cmake.patch b/ports/kf5kio/fix_config_cmake.patch deleted file mode 100644 index 608ee53675..0000000000 --- a/ports/kf5kio/fix_config_cmake.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 0202616076e6b05b7100ae67d7d012e2c22f79fb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Tue, 31 Aug 2021 03:40:09 +0200 -Subject: [PATCH] Add support for static builds - ---- - KF5KIOConfig.cmake.in | 23 ++++++++++++++++------- - 1 file changed, 16 insertions(+), 7 deletions(-) - -diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in -index 41699cb03..05922f769 100644 ---- a/KF5KIOConfig.cmake.in -+++ b/KF5KIOConfig.cmake.in -@@ -11,13 +11,22 @@ find_dependency(KF5Config "@KF_DEP_VERSION@") - find_dependency(KF5Service "@KF_DEP_VERSION@") - - if (NOT @KIOCORE_ONLY@) --find_dependency(KF5Bookmarks "@KF_DEP_VERSION@") --find_dependency(KF5Completion "@KF_DEP_VERSION@") --find_dependency(KF5ItemViews "@KF_DEP_VERSION@") --find_dependency(KF5JobWidgets "@KF_DEP_VERSION@") --find_dependency(KF5Solid "@KF_DEP_VERSION@") --find_dependency(KF5XmlGui "@KF_DEP_VERSION@") --find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") -+ find_dependency(KF5Bookmarks "@KF_DEP_VERSION@") -+ find_dependency(KF5Completion "@KF_DEP_VERSION@") -+ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") -+ find_dependency(KF5JobWidgets "@KF_DEP_VERSION@") -+ find_dependency(KF5Solid "@KF_DEP_VERSION@") -+ find_dependency(KF5XmlGui "@KF_DEP_VERSION@") -+ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") -+ -+ if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") -+ find_dependency(KF5Crash "@KF_DEP_VERSION@") -+ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") -+ find_dependency(KF5DBusAddons "@KF_DEP_VERSION@") -+ endif() - endif() - - find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") --- -GitLab - diff --git a/ports/kf5kio/fix_dbusmetatypes.patch b/ports/kf5kio/fix_dbusmetatypes.patch deleted file mode 100644 index d59f19a60b..0000000000 --- a/ports/kf5kio/fix_dbusmetatypes.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/src/core/kssld_dbusmetatypes.h b/src/core/kssld_dbusmetatypes.h -index 2fb9fa25..958f4ff7 100644 ---- a/src/core/kssld_dbusmetatypes.h -+++ b/src/core/kssld_dbusmetatypes.h -@@ -17,7 +17,7 @@ - Q_DECLARE_METATYPE(KSslCertificateRule) - Q_DECLARE_METATYPE(QSslError::SslError) - --QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert) -+inline QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert) - { - argument.beginStructure(); - argument << cert.toDer(); -@@ -25,7 +25,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const QSslCertificate &cert) - return argument; - } - --const QDBusArgument &operator>>(const QDBusArgument &argument, QSslCertificate &cert) -+inline const QDBusArgument &operator>>(const QDBusArgument &argument, QSslCertificate &cert) - { - QByteArray data; - argument.beginStructure(); -@@ -35,7 +35,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, QSslCertificate & - return argument; - } - --QDBusArgument &operator<<(QDBusArgument &argument, const KSslCertificateRule &rule) -+inline QDBusArgument &operator<<(QDBusArgument &argument, const KSslCertificateRule &rule) - { - argument.beginStructure(); - argument << rule.certificate() << rule.hostName() << rule.isRejected() << rule.expiryDateTime().toString(Qt::ISODate) -@@ -44,7 +44,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const KSslCertificateRule &ru - return argument; - } - --const QDBusArgument &operator>>(const QDBusArgument &argument, KSslCertificateRule &rule) -+inline const QDBusArgument &operator>>(const QDBusArgument &argument, KSslCertificateRule &rule) - { - QSslCertificate cert; - QString hostName; -@@ -63,7 +63,7 @@ const QDBusArgument &operator>>(const QDBusArgument &argument, KSslCertificateRu - return argument; - } - --QDBusArgument &operator<<(QDBusArgument &argument, const QSslError::SslError &error) -+inline QDBusArgument &operator<<(QDBusArgument &argument, const QSslError::SslError &error) - { - argument.beginStructure(); // overhead ho! - argument << static_cast(error); -@@ -71,7 +71,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const QSslError::SslError &er - return argument; - } - --const QDBusArgument &operator>>(const QDBusArgument &argument, QSslError::SslError &error) -+inline const QDBusArgument &operator>>(const QDBusArgument &argument, QSslError::SslError &error) - { - int data; - argument.beginStructure(); diff --git a/ports/kf5kio/fix_libiconv.patch b/ports/kf5kio/fix_libiconv.patch index 7212b906ce..e45e7b8080 100644 --- a/ports/kf5kio/fix_libiconv.patch +++ b/ports/kf5kio/fix_libiconv.patch @@ -1,8 +1,8 @@ diff --git a/src/ioslaves/file/CMakeLists.txt b/src/ioslaves/file/CMakeLists.txt -index 20fca30..bcd795e 100644 +index fec216af..8595f36e 100644 --- a/src/ioslaves/file/CMakeLists.txt +++ b/src/ioslaves/file/CMakeLists.txt -@@ -33,7 +33,9 @@ ecm_qt_export_logging_category( +@@ -28,7 +28,9 @@ ecm_qt_export_logging_category( EXPORT KIO ) @@ -14,10 +14,10 @@ index 20fca30..bcd795e 100644 if(UNIX) target_link_libraries(kio_file Qt5::Network KF5::AuthCore) diff --git a/src/ioslaves/ftp/CMakeLists.txt b/src/ioslaves/ftp/CMakeLists.txt -index b9602fa..e80f7ce 100644 +index 44abb409..61eb3836 100644 --- a/src/ioslaves/ftp/CMakeLists.txt +++ b/src/ioslaves/ftp/CMakeLists.txt -@@ -21,6 +21,8 @@ ecm_qt_export_logging_category( +@@ -16,4 +16,6 @@ ecm_qt_export_logging_category( EXPORT KIO ) @@ -25,10 +25,9 @@ index b9602fa..e80f7ce 100644 +find_package(Iconv REQUIRED) +include_directories(${Iconv_INCLUDE_DIRS}) +target_link_libraries(kio_ftp Qt5::Network KF5::KIOCore KF5::I18n KF5::ConfigCore ${Iconv_LIBRARIES}) - - install(TARGETS kio_ftp DESTINATION ${KDE_INSTALL_PLUGINDIR}/kf5/kio) +\ No newline at end of file diff --git a/src/ioslaves/http/CMakeLists.txt b/src/ioslaves/http/CMakeLists.txt -index 51bd392..db43701 100644 +index e616d08b..0631edb6 100644 --- a/src/ioslaves/http/CMakeLists.txt +++ b/src/ioslaves/http/CMakeLists.txt @@ -37,11 +37,15 @@ target_sources(kio_http_cache_cleaner PRIVATE @@ -48,7 +47,7 @@ index 51bd392..db43701 100644 install(TARGETS kio_http_cache_cleaner DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5} ) -@@ -96,6 +100,7 @@ target_link_libraries(kio_http +@@ -91,6 +95,7 @@ target_link_libraries(kio_http KF5::KIONTLM KF5::Archive KF5::I18n @@ -57,7 +56,7 @@ index 51bd392..db43701 100644 if(GSSAPI_FOUND) target_link_libraries(kio_http ${GSSAPI_LIBS} ) diff --git a/src/ioslaves/http/kcookiejar/CMakeLists.txt b/src/ioslaves/http/kcookiejar/CMakeLists.txt -index 0f770ae..2600d2d 100644 +index 0f770ae4..2600d2d2 100644 --- a/src/ioslaves/http/kcookiejar/CMakeLists.txt +++ b/src/ioslaves/http/kcookiejar/CMakeLists.txt @@ -13,10 +13,13 @@ target_sources(kcookiejar5 PRIVATE @@ -83,10 +82,10 @@ index 0f770ae..2600d2d 100644 ########### install files ############### diff --git a/src/ioslaves/remote/CMakeLists.txt b/src/ioslaves/remote/CMakeLists.txt -index 36a97cf..9319a61 100644 +index e2b576e2..526551ee 100644 --- a/src/ioslaves/remote/CMakeLists.txt +++ b/src/ioslaves/remote/CMakeLists.txt -@@ -21,4 +21,6 @@ ecm_qt_declare_logging_category(kio_remote +@@ -19,4 +19,6 @@ ecm_qt_declare_logging_category(kio_remote EXPORT KIO ) @@ -95,7 +94,7 @@ index 36a97cf..9319a61 100644 +include_directories(${Iconv_INCLUDE_DIRS}) +target_link_libraries(kio_remote KF5::KIOCore KF5::I18n KF5::ConfigCore Qt5::Network ${Iconv_LIBRARIES}) diff --git a/src/ioslaves/remote/kdedmodule/CMakeLists.txt b/src/ioslaves/remote/kdedmodule/CMakeLists.txt -index 4e40d21..7ba0d91 100644 +index 4e40d214..7ba0d911 100644 --- a/src/ioslaves/remote/kdedmodule/CMakeLists.txt +++ b/src/ioslaves/remote/kdedmodule/CMakeLists.txt @@ -1,7 +1,9 @@ @@ -110,7 +109,7 @@ index 4e40d21..7ba0d91 100644 set_target_properties(remotedirnotify PROPERTIES OUTPUT_NAME "remotenotifier") diff --git a/src/ioslaves/telnet/CMakeLists.txt b/src/ioslaves/telnet/CMakeLists.txt -index ffee12c..0b03c21 100644 +index ffee12c8..0b03c211 100644 --- a/src/ioslaves/telnet/CMakeLists.txt +++ b/src/ioslaves/telnet/CMakeLists.txt @@ -2,10 +2,13 @@ @@ -128,10 +127,10 @@ index ffee12c..0b03c21 100644 install(TARGETS ktelnetservice5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/ioslaves/trash/CMakeLists.txt b/src/ioslaves/trash/CMakeLists.txt -index 80489d9..364ecb4 100644 +index 147b3f3e..0546b8ce 100644 --- a/src/ioslaves/trash/CMakeLists.txt +++ b/src/ioslaves/trash/CMakeLists.txt -@@ -55,6 +55,8 @@ else() +@@ -51,6 +51,8 @@ else() ) endif() @@ -140,7 +139,7 @@ index 80489d9..364ecb4 100644 target_link_libraries(kio_trash KF5::ConfigCore KF5::Solid -@@ -63,6 +65,7 @@ target_link_libraries(kio_trash +@@ -59,6 +61,7 @@ target_link_libraries(kio_trash Qt5::Network KF5::I18n KF5::ConfigCore @@ -148,7 +147,7 @@ index 80489d9..364ecb4 100644 ) if(APPLE) target_link_libraries(kio_trash "-framework DiskArbitration -framework CoreFoundation") -@@ -84,6 +87,7 @@ target_link_libraries(ktrash5 +@@ -78,6 +81,7 @@ target_link_libraries(ktrash5 KF5::KIOCore KF5::I18n KF5::ConfigCore @@ -157,7 +156,7 @@ index 80489d9..364ecb4 100644 install(TARGETS ktrash5 ${KF5_INSTALL_TARGETS_DEFAULT_ARGS}) diff --git a/src/kioexec/CMakeLists.txt b/src/kioexec/CMakeLists.txt -index 92eeafe..8ae8742 100644 +index 92eeafe7..8ae87424 100644 --- a/src/kioexec/CMakeLists.txt +++ b/src/kioexec/CMakeLists.txt @@ -19,7 +19,9 @@ ecm_qt_declare_logging_category(kioexecd @@ -180,7 +179,7 @@ index 92eeafe..8ae8742 100644 if (HAVE_X11) diff --git a/src/kpasswdserver/CMakeLists.txt b/src/kpasswdserver/CMakeLists.txt -index c268e03..c1a562a 100644 +index c268e039..c1a562aa 100644 --- a/src/kpasswdserver/CMakeLists.txt +++ b/src/kpasswdserver/CMakeLists.txt @@ -39,6 +39,8 @@ ecm_qt_export_logging_category( @@ -199,4 +198,4 @@ index c268e03..c1a562a 100644 + ${Iconv_LIBRARIES} ${WALLET_LIB} ) - + diff --git a/ports/kf5kio/libmount_static_dep.diff b/ports/kf5kio/libmount_static_dep.diff new file mode 100644 index 0000000000..6f57261fbd --- /dev/null +++ b/ports/kf5kio/libmount_static_dep.diff @@ -0,0 +1,15 @@ +diff --git a/KF5KIOConfig.cmake.in b/KF5KIOConfig.cmake.in +index 05922f7690986c93ec4ee35e42d68906190f400b..a9f41e30753d1a2451008708ed7665804d41a5ba 100644 +--- a/KF5KIOConfig.cmake.in ++++ b/KF5KIOConfig.cmake.in +@@ -26,6 +26,10 @@ if (NOT @KIOCORE_ONLY@) + find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") + find_dependency(KF5IconThemes "@KF_DEP_VERSION@") + find_dependency(KF5DBusAddons "@KF_DEP_VERSION@") ++ ++ if (@LibMount_FOUND@) ++ find_dependency(LibMount) ++ endif() + endif() + endif() + diff --git a/ports/kf5kio/portfile.cmake b/ports/kf5kio/portfile.cmake index b38e88b6aa..f3d82acf82 100644 --- a/ports/kf5kio/portfile.cmake +++ b/ports/kf5kio/portfile.cmake @@ -1,8 +1,3 @@ -set(PATCHES - fix_dbusmetatypes.patch # https://invent.kde.org/frameworks/kio/-/merge_requests/563 - fix_config_cmake.patch # https://invent.kde.org/frameworks/kio/-/merge_requests/565 -) - if(VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL static) list(APPEND PATCHES fix_libiconv.patch) endif() @@ -10,16 +5,19 @@ endif() vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kio - REF v5.84.0 - SHA512 6c2d57a31e64ff1475b21d7fb2556d37b061dae319ddfe57a36f0bfc9627db624b1ac8fa4b2851681cb90d218255d0444c1403329d88f34a23e8ddffe99ca5b4 + REF v5.87.0 + SHA512 ae16478ea1d4140d8168a87a25017861e5b3b2e4afb280ea01dc6822d3ce880961791ec37d658750fe48d81eccda6327d66ea7de0ca8d4515cec18a3b79f453e HEAD_REF master - PATCHES ${PATCHES} + PATCHES + libmount_static_dep.diff # https://invent.kde.org/frameworks/kio/-/merge_requests/615 + revert_blkid.diff # https://invent.kde.org/frameworks/kio/-/commit/221a94a66c4d2f6e4f2dc938ee8a63a6ca739477 + ${PATCHES} ) vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS - INVERTED_FEATURES - "kf5notifications" CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications - "kf5wallet" CMAKE_DISABLE_FIND_PACKAGE_KF5Wallet + INVERTED_FEATURES + "kf5notifications" CMAKE_DISABLE_FIND_PACKAGE_KF5Notifications + "kf5wallet" CMAKE_DISABLE_FIND_PACKAGE_KF5Wallet ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure @@ -29,6 +27,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON -DCMAKE_VERBOSE_MAKEFILE=ON -DKDE_INSTALL_QTPLUGINDIR=plugins -DKDE_INSTALL_PLUGINDIR=plugins @@ -65,4 +64,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -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/kf5kio/revert_blkid.diff b/ports/kf5kio/revert_blkid.diff new file mode 100644 index 0000000000..793a965c68 --- /dev/null +++ b/ports/kf5kio/revert_blkid.diff @@ -0,0 +1,99 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ca374a4cbc84bb14d138d3dfafbd3fb23e110caa..f1bb1a59b3b00303a1335b8a22e043706dcfd5fc 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -130,8 +130,7 @@ set_package_properties(ACL PROPERTIES DESCRIPTION "LibACL" + # Used by KMountPoint + if (CMAKE_SYSTEM_NAME MATCHES "Linux") + find_package(LibMount REQUIRED) +- find_package(Blkid REQUIRED) +- set(HAVE_LIBS_MOUNT_AND_BLKID ${LibMount_FOUND} AND ${Blkid_FOUND}) ++ set(HAVE_LIB_MOUNT ${LibMount_FOUND}) + endif() + + if (ANDROID) +diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt +index be19e9b623e5ae4b331b2a23f94317807e3df4b9..67a1b1cf72623088f3f1470bf89fe16a705f7ffc 100644 +--- a/src/core/CMakeLists.txt ++++ b/src/core/CMakeLists.txt +@@ -236,9 +236,8 @@ if(ACL_FOUND) + target_link_libraries(KF5KIOCore PRIVATE ${ACL_LIBS}) + endif() + +-if(HAVE_LIBS_MOUNT_AND_BLKID) +- # libmount links against blkid anyway +- target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount Blkid::Blkid) ++if(HAVE_LIB_MOUNT) ++ target_link_libraries(KF5KIOCore PRIVATE LibMount::LibMount) + endif() + + # this should be done by cmake, see bug 371721 +diff --git a/src/core/config-kmountpoint.h.cmake b/src/core/config-kmountpoint.h.cmake +index f824d40426a650ad2054c50bbed7121804a84989..3673eb14181998772f7a85d237aa1f134ed2e913 100644 +--- a/src/core/config-kmountpoint.h.cmake ++++ b/src/core/config-kmountpoint.h.cmake +@@ -1,7 +1,7 @@ + #cmakedefine01 HAVE_GETMNTINFO + #cmakedefine01 GETMNTINFO_USES_STATVFS + +-#cmakedefine01 HAVE_LIBS_MOUNT_AND_BLKID ++#cmakedefine01 HAVE_LIB_MOUNT + + #cmakedefine01 HAVE_SYS_MOUNT_H + #cmakedefine01 HAVE_FSTAB_H +diff --git a/src/core/kmountpoint.cpp b/src/core/kmountpoint.cpp +index e2d32055c669033711b5bd841a6cbd48275ac6cf..f41cff5ee41ee95426c46a64387f0ee34367a79f 100644 +--- a/src/core/kmountpoint.cpp ++++ b/src/core/kmountpoint.cpp +@@ -44,7 +44,7 @@ static const Qt::CaseSensitivity cs = Qt::CaseSensitive; + #endif + + // Linux +-#if HAVE_LIBS_MOUNT_AND_BLKID ++#if HAVE_LIB_MOUNT + #include + #include + #endif +@@ -176,7 +176,7 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded + #ifdef Q_OS_WIN + result = KMountPoint::currentMountPoints(infoNeeded); + +-#elif HAVE_LIBS_MOUNT_AND_BLKID ++#elif HAVE_LIB_MOUNT + if (struct libmnt_table *table = mnt_new_table()) { + // By default parses "/etc/fstab" + if (mnt_table_parse_fstab(table, nullptr) == 0) { +@@ -202,23 +202,13 @@ KMountPoint::List KMountPoint::possibleMountPoints(DetailsNeededFlags infoNeeded + // or some network mount + if (const char *source = mnt_fs_get_source(fs)) { + mp->d->m_mountedFrom = QFile::decodeName(source); +- if (mp->d->m_mountedFrom.startsWith(QLatin1String("UUID")) || mp->d->m_mountedFrom.startsWith(QLatin1String("LABEL"))) { +- // Use blkid to resolve UUID/LABEL to the device file +- if (char *blkSource = blkid_evaluate_spec(source, nullptr)) { +- mp->d->m_mountedFrom = QFile::decodeName(blkSource); +- free(blkSource); +- if ((infoNeeded & KMountPoint::NeedRealDeviceName) // +- && mp->d->m_mountedFrom.startsWith(QLatin1String("/dev/"))) { +- mp->d->m_device = mp->d->m_mountedFrom; +- } +- } +- } + } + + if (infoNeeded & NeedMountOptions) { + mp->d->m_mountOptions = QFile::decodeName(mnt_fs_get_options(fs)).split(QLatin1Char(',')); + } + ++ mp->d->finalizePossibleMountPoint(infoNeeded); + result.append(mp); + } + mnt_free_iter(itr); +@@ -351,7 +341,7 @@ KMountPoint::List KMountPoint::currentMountPoints(DetailsNeededFlags infoNeeded) + } + } + +-#elif HAVE_LIBS_MOUNT_AND_BLKID ++#elif HAVE_LIB_MOUNT + if (struct libmnt_table *table = mnt_new_table()) { + // By default, parses "/proc/self/mountinfo" + if (mnt_table_parse_mtab(table, nullptr) == 0) { diff --git a/ports/kf5kio/vcpkg.json b/ports/kf5kio/vcpkg.json index 5283364d25..c9be3281e0 100644 --- a/ports/kf5kio/vcpkg.json +++ b/ports/kf5kio/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5kio", - "version": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Network transparent access to files and data", "homepage": "https://api.kde.org/frameworks/kio/html/index.html", "dependencies": [ @@ -16,7 +15,7 @@ "kf5archive", { "name": "kf5auth", - "platform": "!windows" + "platform": "!(windows | android)" }, "kf5bookmarks", "kf5completion", @@ -24,7 +23,10 @@ "kf5configwidgets", "kf5coreaddons", "kf5crash", - "kf5dbusaddons", + { + "name": "kf5dbusaddons", + "platform": "!android" + }, "kf5guiaddons", "kf5i18n", "kf5iconthemes", diff --git a/ports/kf5newstuff/fix_static_builds.patch b/ports/kf5newstuff/fix_static_builds.patch deleted file mode 100644 index a8c8e9727b..0000000000 --- a/ports/kf5newstuff/fix_static_builds.patch +++ /dev/null @@ -1,49 +0,0 @@ -diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in -index e4ef2944..063b83ca 100644 ---- a/KF5NewStuffConfig.cmake.in -+++ b/KF5NewStuffConfig.cmake.in -@@ -10,5 +10,25 @@ find_dependency(KF5Service "@KF_DEP_VERSION@") - find_dependency(KF5NewStuffCore "@KF_VERSION@") - find_dependency(KF5NewStuffQuick "@KF_VERSION@") - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(Qt5Qml @REQUIRED_QT_VERSION@) -+ find_dependency(Qt5Quick @REQUIRED_QT_VERSION@) -+ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) -+ -+ find_dependency(KF5KIO "@KF_DEP_VERSION@") -+ find_dependency(KF5Completion "@KF_DEP_VERSION@") -+ find_dependency(KF5I18n "@KF_DEP_VERSION@") -+ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") -+ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") -+ find_dependency(KF5TextWidgets "@KF_DEP_VERSION@") -+ find_dependency(KF5Archive "@KF_DEP_VERSION@") -+ find_dependency(KF5Package "@KF_DEP_VERSION@") -+ find_dependency(KF5Config "@KF_DEP_VERSION@") -+ -+ if(@KF5Syndication_FOUND@) -+ find_dependency(KF5Syndication "@KF_VERSION@") -+ endif() -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c7022663..d2ead74a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ include(KDECMakeSettings) - include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) - - set(REQUIRED_QT_VERSION 5.15.0) --find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Widgets Xml) -+find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE REQUIRED COMPONENTS Gui Widgets Xml) - find_package(Qt5 ${REQUIRED_QT_VERSION} NO_MODULE COMPONENTS Qml Quick) - - find_package(KF5Archive ${KF_DEP_VERSION} REQUIRED) --- -GitLab - diff --git a/ports/kf5newstuff/fix_static_builds2.patch b/ports/kf5newstuff/fix_static_builds2.patch deleted file mode 100644 index 7d29ff7b55..0000000000 --- a/ports/kf5newstuff/fix_static_builds2.patch +++ /dev/null @@ -1,53 +0,0 @@ -diff --git a/KF5NewStuffConfig.cmake.in b/KF5NewStuffConfig.cmake.in -index 063b83ca..1be53741 100644 ---- a/KF5NewStuffConfig.cmake.in -+++ b/KF5NewStuffConfig.cmake.in -@@ -13,7 +13,6 @@ find_dependency(KF5NewStuffQuick "@KF_VERSION@") - if (NOT @BUILD_SHARED_LIBS@) - find_dependency(Qt5Qml @REQUIRED_QT_VERSION@) - find_dependency(Qt5Quick @REQUIRED_QT_VERSION@) -- find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) - - find_dependency(KF5KIO "@KF_DEP_VERSION@") - find_dependency(KF5Completion "@KF_DEP_VERSION@") -@@ -21,13 +20,6 @@ if (NOT @BUILD_SHARED_LIBS@) - find_dependency(KF5ItemViews "@KF_DEP_VERSION@") - find_dependency(KF5IconThemes "@KF_DEP_VERSION@") - find_dependency(KF5TextWidgets "@KF_DEP_VERSION@") -- find_dependency(KF5Archive "@KF_DEP_VERSION@") -- find_dependency(KF5Package "@KF_DEP_VERSION@") -- find_dependency(KF5Config "@KF_DEP_VERSION@") -- -- if(@KF5Syndication_FOUND@) -- find_dependency(KF5Syndication "@KF_VERSION@") -- endif() - endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffTargets.cmake") -diff --git a/KF5NewStuffCoreConfig.cmake.in b/KF5NewStuffCoreConfig.cmake.in -index c65c7c42..b395f8cd 100644 ---- a/KF5NewStuffCoreConfig.cmake.in -+++ b/KF5NewStuffCoreConfig.cmake.in -@@ -3,6 +3,19 @@ - include(CMakeFindDependencyMacro) - find_dependency(KF5Attica "@KF_DEP_VERSION@") - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) -+ -+ find_dependency(KF5I18n "@KF_DEP_VERSION@") -+ find_dependency(KF5Archive "@KF_DEP_VERSION@") -+ find_dependency(KF5Package "@KF_DEP_VERSION@") -+ find_dependency(KF5Config "@KF_DEP_VERSION@") -+ -+ if(@KF5Syndication_FOUND@) -+ find_dependency(KF5Syndication "@KF_VERSION@") -+ endif() -+endif() -+ - set(KDE_INSTALL_KNSRCDIR "@KDE_INSTALL_DATADIR@/knsrcfiles") - - include("${CMAKE_CURRENT_LIST_DIR}/KF5NewStuffCoreTargets.cmake") --- -GitLab - diff --git a/ports/kf5newstuff/portfile.cmake b/ports/kf5newstuff/portfile.cmake index 94ccfb5f1b..d2925c5bd7 100644 --- a/ports/kf5newstuff/portfile.cmake +++ b/ports/kf5newstuff/portfile.cmake @@ -1,16 +1,15 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/knewstuff - REF v5.84.0 - SHA512 107f8c7915f5a7656ed729d03b59e5f53f8751d771487b96e517358f1149801981e27d5cafdf86f759be539305fc8f847c51a28a35947766200cc912072f5c8d + REF v5.87.0 + SHA512 67fe095f6473f9bb7378dda9b591ccdf57503e876cc1f01eb4c02c091dae1ace74f6f6b578c31679c7884076a1019fd21b349a7f4b51dcf1a5278fa6b42c9e5b HEAD_REF master - PATCHES - fix_static_builds.patch # https://invent.kde.org/frameworks/knewstuff/-/merge_requests/139 - fix_static_builds2.patch # https://invent.kde.org/frameworks/knewstuff/-/merge_requests/140 ) +# Prevent KDEClangFormat from writing to source effectively blocking parallel configure +file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") + vcpkg_cmake_configure( - DISABLE_PARALLEL_CONFIGURE SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF @@ -36,4 +35,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -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/kf5newstuff/vcpkg.json b/ports/kf5newstuff/vcpkg.json index 09551fd9e2..e86d9657f5 100644 --- a/ports/kf5newstuff/vcpkg.json +++ b/ports/kf5newstuff/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5newstuff", - "version": "5.84.0", + "version": "5.87.0", "description": "Framework for downloading and sharing additional application data", "homepage": "https://api.kde.org/frameworks/knewstuff/html/index.html", "dependencies": [ diff --git a/ports/kf5notifications/fix_config_cmake.patch b/ports/kf5notifications/fix_config_cmake.patch deleted file mode 100644 index 318881cfbf..0000000000 --- a/ports/kf5notifications/fix_config_cmake.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff --git a/KF5NotificationsConfig.cmake.in b/KF5NotificationsConfig.cmake.in -index eeded42..6b261c0 100644 ---- a/KF5NotificationsConfig.cmake.in -+++ b/KF5NotificationsConfig.cmake.in -@@ -11,5 +11,47 @@ if (@HAVE_DBUS@) - find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) - endif() - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5Config "@KF_DEP_VERSION@") -+ -+ if (@HAVE_KWINDOWSYSTEM@) -+ find_dependency(KF5WindowSystem "@KF_DEP_VERSION@") -+ endif() -+ -+ if (@WITH_SNORETOAST@) -+ find_dependency(LibSnoreToast) -+ find_dependency(Qt5Network @REQUIRED_QT_VERSION@) -+ endif() -+ -+ if (@HAVE_PHONON4QT5@) -+ find_dependency(Phonon4Qt5) -+ endif() -+ -+ if (@Canberra_FOUND@) -+ find_dependency(Canberra) -+ endif() -+ -+ if (@Qt5TextToSpeech_FOUND@) -+ find_dependency(Qt5TextToSpeech @REQUIRED_QT_VERSION@) -+ endif() -+ -+ if(@X11_FOUND@) -+ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) -+ endif() -+ -+ if(APPLE) -+ find_dependency(Qt5MacExtras @REQUIRED_QT_VERSION@) -+ endif() -+ -+ if(@HAVE_DBUSMENUQT@) -+ find_dependency(dbusmenu-qt5) -+ endif() -+ -+ if (ANDROID) -+ find_dependency(Qt5AndroidExtras @REQUIRED_QT_VERSION@) -+ endif() -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/KF5NotificationsTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index afff6c000f..a31ba9339d 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -1,11 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/knotifications - REF v5.84.0 - SHA512 ee8d2d0531df726f3e372983e30c2365aab887e1a3cdf5fb9c1b788e78b490f984018a44934ce62116bf10827fbf9aeeaf23236a7024a0e3757a1da7e90dca6c + REF v5.87.0 + SHA512 8b12a6af3675f54bb494b91c71f4284ec109c381aa92e54c3613c6beca96c5f20ef418e7d35f2bcdec197884ea796c4f1d4ab2937583cd6b78d8ef40204c51cb HEAD_REF master - PATCHES - fix_config_cmake.patch ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure @@ -28,4 +26,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5notifications/vcpkg.json b/ports/kf5notifications/vcpkg.json index f2b920c130..b8066d7b7b 100644 --- a/ports/kf5notifications/vcpkg.json +++ b/ports/kf5notifications/vcpkg.json @@ -1,6 +1,6 @@ { "name": "kf5notifications", - "version": "5.84.0", + "version": "5.87.0", "description": "Desktop notifications", "homepage": "https://api.kde.org/frameworks/knotifications/html/index.html", "dependencies": [ diff --git a/ports/kf5package/portfile.cmake b/ports/kf5package/portfile.cmake index a9661cf07e..6c49d2061e 100644 --- a/ports/kf5package/portfile.cmake +++ b/ports/kf5package/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kpackage - REF v5.84.0 - SHA512 ad6a7083d461b2e782c612a544a8f6c0493c68c98a915e3f8fd4fd7de4ce636002383869476f877ace407fdc5013ad58e297ed3fd46dcac055ce79251704bf95 + REF v5.87.0 + SHA512 254287e424045c357a3833c789e1640f1c2e44ed6884bd51f096d944f1945afac4cb921d2e85296741b119927a94b89cbc9a5e05f62be2831b9c04e7484fe62a HEAD_REF master ) @@ -13,6 +13,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON ) vcpkg_cmake_install() @@ -28,4 +29,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5package/vcpkg.json b/ports/kf5package/vcpkg.json index a874e8db7a..fbb59dcbac 100644 --- a/ports/kf5package/vcpkg.json +++ b/ports/kf5package/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5package", - "version": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Installation and loading of additional content (ex: scripts, images...) as packages", "homepage": "https://api.kde.org/frameworks/kpackage/html/index.html", "dependencies": [ diff --git a/ports/kf5plotting/portfile.cmake b/ports/kf5plotting/portfile.cmake index f2d8ac8778..c5bb1061be 100644 --- a/ports/kf5plotting/portfile.cmake +++ b/ports/kf5plotting/portfile.cmake @@ -1,27 +1,26 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kplotting - REF v5.84.0 - SHA512 4007e90bc2505cfcfb14d5b40d922cf72ffcc6898da3ffed5ce5493484fe36c1f0f697f2b8319a7fd95909aada489d57be7a8dceb66b2cbba2746ed4aa93e5a5 + REF v5.87.0 + SHA512 8437abe43e660b65e5c970039a343fee80c4e9bf1f3e1bf3b1a756fc211aa65192c0b6d7c10e42951a2fc5bec5ca8c45753d1ef009487865bb1e379025305410 HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5Plotting) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Plotting CONFIG_PATH lib/cmake/KF5Plotting) vcpkg_copy_pdbs() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/plugins ${CURRENT_PACKAGES_DIR}/debug/plugins) -file(RENAME ${CURRENT_PACKAGES_DIR}/lib/plugins ${CURRENT_PACKAGES_DIR}/plugins) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/plugins" "${CURRENT_PACKAGES_DIR}/debug/plugins") +file(RENAME "${CURRENT_PACKAGES_DIR}/lib/plugins" "${CURRENT_PACKAGES_DIR}/plugins") -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5plotting/vcpkg.json b/ports/kf5plotting/vcpkg.json index 7513e48fe4..42d316f488 100644 --- a/ports/kf5plotting/vcpkg.json +++ b/ports/kf5plotting/vcpkg.json @@ -1,12 +1,19 @@ { "name": "kf5plotting", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Lightweight plotting framework", "homepage": "https://api.kde.org/frameworks/kplotting/html/index.html", "dependencies": [ "ecm", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5service/portfile.cmake b/ports/kf5service/portfile.cmake index acb0876ed4..460346f830 100644 --- a/ports/kf5service/portfile.cmake +++ b/ports/kf5service/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kservice - REF v5.84.0 - SHA512 3867da989c8f70fccba63d91aeb0038ad6345e66ca7df6003f968628e4a54e076e9686acb501940ef8f540c39d5f1a70a949cbfdd1caa34e6c4d51daebff418d + REF v5.87.0 + SHA512 6f9b71f0038e55ce190feac17231a44ef33815be0722b75d2589ab25d69609ca18140e95910fa58706faa000c897dc690ec04ec4f4c54c627cc80b2cce5870db HEAD_REF master ) @@ -38,10 +38,11 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_KF5DocTools=ON ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Service) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Service CONFIG_PATH lib/cmake/KF5Service) vcpkg_copy_pdbs() vcpkg_copy_tools( @@ -55,4 +56,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5service/vcpkg.json b/ports/kf5service/vcpkg.json index 72136bf204..fdce1f518b 100644 --- a/ports/kf5service/vcpkg.json +++ b/ports/kf5service/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5service", - "version": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Plugin framework for desktop services", "homepage": "https://api.kde.org/frameworks/kservice/html/index.html", "dependencies": [ @@ -15,10 +14,6 @@ }, "kf5config", "kf5coreaddons", - { - "name": "kf5crash", - "platform": "!android" - }, { "name": "kf5dbusaddons", "platform": "!android" diff --git a/ports/kf5solid/fix_config_cmake.patch b/ports/kf5solid/fix_config_cmake.patch deleted file mode 100644 index d099bb082b..0000000000 --- a/ports/kf5solid/fix_config_cmake.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c1e261d57383533a008f0c02689dd0292d4dc75a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Tue, 31 Aug 2021 02:18:42 +0200 -Subject: [PATCH] Add support for static builds - ---- - KF5SolidConfig.cmake.in | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -diff --git a/KF5SolidConfig.cmake.in b/KF5SolidConfig.cmake.in -index b597b3a..0a23f44 100644 ---- a/KF5SolidConfig.cmake.in -+++ b/KF5SolidConfig.cmake.in -@@ -19,6 +19,19 @@ set(SOLID_DBUS_INTERFACES_DIR "@PACKAGE_KDE_INSTALL_DBUSINTERFACEDIR@") - include(CMakeFindDependencyMacro) - find_dependency(Qt5Core @REQUIRED_QT_VERSION@) - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) -+ find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) -+ -+ if (@Qt5DBus_FOUND@) -+ find_dependency(Qt5DBus @REQUIRED_QT_VERSION@) -+ endif() -+ -+ if (@UDev_FOUND@) -+ find_dependency(UDev) -+ endif() -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/KF5SolidTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ - --- -GitLab - diff --git a/ports/kf5solid/portfile.cmake b/ports/kf5solid/portfile.cmake index 09619b5e8a..9c98eb431b 100644 --- a/ports/kf5solid/portfile.cmake +++ b/ports/kf5solid/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/solid - REF v5.84.0 - SHA512 b6452e56c6029289450850c1fcfff96da0005f8dfa03f1817754910945e3ccadd8502e330a4484a5c5e9a8d5525838c8090268bb083639062dfca7176852c159 + REF v5.87.0 + SHA512 e1add78825841c8a87b006a2c1dba31fff7fff5a26af52379769a0851927edead2296aab240c95c11d4d866dfd08e63ee92619f44ea0b8b08a8cc1a827f31e9a HEAD_REF master PATCHES - fix_config_cmake.patch # https://invent.kde.org/frameworks/solid/-/merge_requests/53 fix-libmount.patch ) @@ -46,6 +45,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml ) vcpkg_cmake_install() @@ -53,8 +53,8 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Solid CONFIG_PATH lib/cmake/KF5Solid) vcpkg_copy_pdbs() vcpkg_copy_tools( - TOOL_NAMES solid-hardware5 - AUTO_CLEAN + TOOL_NAMES solid-hardware5 + AUTO_CLEAN ) if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -64,7 +64,5 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/qml" "${CURRENT_PACKAGES_DIR}/debug/qml") -file(RENAME "${CURRENT_PACKAGES_DIR}/lib/qml" "${CURRENT_PACKAGES_DIR}/qml") - file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + diff --git a/ports/kf5solid/vcpkg.json b/ports/kf5solid/vcpkg.json index 480feda104..4c5b998373 100644 --- a/ports/kf5solid/vcpkg.json +++ b/ports/kf5solid/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5solid", - "version": "5.84.0", - "port-version": 4, + "version": "5.87.0", "description": "Desktop hardware abstraction", "homepage": "https://api.kde.org/frameworks/solid/html/index.html", "dependencies": [ diff --git a/ports/kf5sonnet/dont_build_examples.diff b/ports/kf5sonnet/dont_build_examples.diff new file mode 100644 index 0000000000..02f1fe7f94 --- /dev/null +++ b/ports/kf5sonnet/dont_build_examples.diff @@ -0,0 +1,26 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8d490ff73d3ff444e994ccd04fbc7000ce954113..c2c2369ce4622800f21d16d5019e4cfad4d4a9c6 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -4,6 +4,7 @@ set(KF_VERSION "5.88.0") # handled by release scripts + project(Sonnet VERSION ${KF_VERSION}) + + include(FeatureSummary) ++include(CMakeDependentOption) + find_package(ECM 5.87.0 NO_MODULE) + set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") + feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) +@@ -63,11 +64,11 @@ if (BUILD_TESTING) + add_subdirectory(autotests) + endif() + +-if(TARGET Qt5::Widgets) ++cmake_dependent_option(BUILD_EXAMPLES "Whether to build the examples" OFF "SONNET_USE_WIDGETS" OFF) ++if (BUILD_EXAMPLES) + add_subdirectory(examples) + endif() + +- + # create a Config.cmake and a ConfigVersion.cmake file and install them + set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Sonnet") + diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake index 1cda95d5ca..df72c2f428 100644 --- a/ports/kf5sonnet/portfile.cmake +++ b/ports/kf5sonnet/portfile.cmake @@ -1,9 +1,11 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/sonnet - REF v5.84.0 - SHA512 9e7d121f447e3320c27c3708f5d1d4cc735e775749cded268502b593a0b1f6ea703e68ce1d2d4f1806e0adb73aafaedf660586f8ee740f4a9a834e23cb9880e4 + REF v5.87.0 + SHA512 4e4a8d0a31013f617dd6e38f78f56459cbb61fc59c31db0db09ee6a4086bb3913515af502c783a58c6c964168948394063fdabb6906e2cdb99f661dd1f596e4d HEAD_REF master + PATCHES + dont_build_examples.diff # https://invent.kde.org/frameworks/sonnet/-/merge_requests/34 ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure @@ -13,8 +15,8 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DBUILD_EXAMPLES=OFF -DKDE_INSTALL_PLUGINDIR=plugins - -DKDE_INSTALL_DATAROOTDIR=data -DKDE_INSTALL_QTPLUGINDIR=plugins ) @@ -23,14 +25,14 @@ vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/debug/bin") vcpkg_cmake_install() -file(MAKE_DIRECTORY "${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(RENAME "${CURRENT_PACKAGES_DIR}/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") -file(RENAME "${CURRENT_PACKAGES_DIR}/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}" "${CURRENT_PACKAGES_DIR}/tools/${PORT}/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5Sonnet CONFIG_PATH lib/cmake/KF5Sonnet) -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5Sonnet) +vcpkg_copy_tools( + TOOL_NAMES gentrigrams parsetrigrams + AUTO_CLEAN +) -vcpkg_copy_tool_dependencies("${CURRENT_PACKAGES_DIR}/tools/${PORT}") -file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ${VCPKG_ROOT_DIR}/installed/${TARGET_TRIPLET}/data") +file(APPEND "${CURRENT_PACKAGES_DIR}/tools/${PORT}/qt.conf" "Data = ../../share") vcpkg_copy_pdbs() @@ -39,9 +41,9 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/gentrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") file(REMOVE "${CURRENT_PACKAGES_DIR}/debug/bin/parsetrigrams${VCPKG_HOST_EXECUTABLE_SUFFIX}") -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + diff --git a/ports/kf5sonnet/vcpkg.json b/ports/kf5sonnet/vcpkg.json index 52cb029d96..d8ec9407e5 100644 --- a/ports/kf5sonnet/vcpkg.json +++ b/ports/kf5sonnet/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5sonnet", - "version-semver": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Multi-language spell checker", "homepage": "https://api.kde.org/frameworks/sonnet/html/index.html", "dependencies": [ diff --git a/ports/kf5syntaxhighlighting/portfile.cmake b/ports/kf5syntaxhighlighting/portfile.cmake index 9003e60f5e..589bbee9c9 100644 --- a/ports/kf5syntaxhighlighting/portfile.cmake +++ b/ports/kf5syntaxhighlighting/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/syntax-highlighting - REF v5.84.0 - SHA512 7df25f639504392f15dd55ae33de273ef8a32c3d4b4874dcd52fa5aa85e302acf102e31d249a3dc779d84facba0fca5e2196e83d8b4d439c5da96c2ad7b256cd + REF v5.87.0 + SHA512 a5750e6dd3a055531f041a56240fba3cdfb90b2552fad8f1ec9ba6cebbe569a342737bc28a17bc1f738c21afe26208b7d1dd32a81d9d58421a2f3be52e836dce HEAD_REF master ) @@ -13,19 +13,27 @@ vcpkg_add_to_path("${PERL_EXE_PATH}") # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml ) -vcpkg_install_cmake(ADD_BIN_TO_PATH) -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5SyntaxHighlighting) +vcpkg_cmake_install(ADD_BIN_TO_PATH) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5SyntaxHighlighting CONFIG_PATH lib/cmake/KF5SyntaxHighlighting) vcpkg_copy_pdbs() -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +vcpkg_copy_tools( + TOOL_NAMES kate-syntax-highlighter + AUTO_CLEAN +) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") +endif() + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") -file(INSTALL ${SOURCE_PATH}/LICENSES/ DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright) +file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") diff --git a/ports/kf5syntaxhighlighting/vcpkg.json b/ports/kf5syntaxhighlighting/vcpkg.json index d50b0e7139..a95a3d720a 100644 --- a/ports/kf5syntaxhighlighting/vcpkg.json +++ b/ports/kf5syntaxhighlighting/vcpkg.json @@ -1,13 +1,20 @@ { "name": "kf5syntaxhighlighting", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Syntax highlighting engine for Kate syntax definitions", "homepage": "https://github.com/KDE/syntax-highlighting", "dependencies": [ "ecm", "qt5-base", "qt5-tools", - "qt5-xmlpatterns" + "qt5-xmlpatterns", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5textwidgets/portfile.cmake b/ports/kf5textwidgets/portfile.cmake index eb3cced28e..92247eacf8 100644 --- a/ports/kf5textwidgets/portfile.cmake +++ b/ports/kf5textwidgets/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/ktextwidgets - REF v5.84.0 - SHA512 39afc3265c8aed26f78c836691548cafca05f31238e11f6d29e497c78b6e809d9dba5d3f6cbb9425cfe84d2a1d0910165e77c7841d833cccee3c7398e39bfc68 + REF v5.87.0 + SHA512 c01e75d33b5e634600d9982d7b0bf4688d0464f91d3687912e070fb23ed1e065eee7910baca8776c7fb56cae045561ec7c20badd49eb5f696384d5ea73176a4b HEAD_REF master ) @@ -27,4 +27,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5textwidgets/vcpkg.json b/ports/kf5textwidgets/vcpkg.json index dfb7e271de..31da6f2626 100644 --- a/ports/kf5textwidgets/vcpkg.json +++ b/ports/kf5textwidgets/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5textwidgets", - "version": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Text editing widgets", "homepage": "https://api.kde.org/frameworks/ktextwidgets/html/index.html", "dependencies": [ diff --git a/ports/kf5wallet/portfile.cmake b/ports/kf5wallet/portfile.cmake index e7300f744d..d66307e702 100644 --- a/ports/kf5wallet/portfile.cmake +++ b/ports/kf5wallet/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kwallet - REF v5.84.0 - SHA512 5bea4c7f46d127de1bc530e03e1033e9e133197cc36bb6963c9154783ef7bb9920bec62443b5bba9b55d3adcc1f7284ce4376422915d93d6df387587fd7ab8e0 + REF v5.87.0 + SHA512 cb37bbc69aeca97565a133abbc243fdf430726b14cf1305ab6d9078f25cfe2b1dfec7534c7747a511d0ef9c755592845b9f36194601f09be0c5ed6a5e8a6c960 HEAD_REF master ) @@ -28,4 +28,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -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/kf5wallet/vcpkg.json b/ports/kf5wallet/vcpkg.json index 0d4876849a..80f15aa993 100644 --- a/ports/kf5wallet/vcpkg.json +++ b/ports/kf5wallet/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5wallet", - "version-semver": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Safe desktop-wide storage for passwords", "homepage": "https://api.kde.org/frameworks/kwallet/html/index.html", "dependencies": [ diff --git a/ports/kf5widgetsaddons/portfile.cmake b/ports/kf5widgetsaddons/portfile.cmake index dcf65ec6b2..9e7e38d889 100644 --- a/ports/kf5widgetsaddons/portfile.cmake +++ b/ports/kf5widgetsaddons/portfile.cmake @@ -1,35 +1,31 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kwidgetsaddons - REF v5.84.0 - SHA512 2c92eb2eaea1c2ca1ca2acd8ccc95d64d5f91cce4b92d428644adc804e7b97ad19659231667e5d79f5672fe528ae70ca85926192297772d7734d5d72479d2716 + REF v5.87.0 + SHA512 765a906bb0d05b9dcf1fee1c5f9231e7c0974c8f6d30e5b16b4db099805a1d4a7b5d05018ce21f026268d639c70d8172694b2f3b65ec998b121b4e86888ab01f HEAD_REF master ) # Prevent KDEClangFormat from writing to source effectively blocking parallel configure file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") -vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH} - PREFER_NINJA +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DBUILD_DESIGNERPLUGIN=OFF ) -vcpkg_install_cmake() -vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/KF5WidgetsAddons) +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WidgetsAddons CONFIG_PATH lib/cmake/KF5WidgetsAddons) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") endif() -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin/data) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/etc) -file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/etc) +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +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) diff --git a/ports/kf5widgetsaddons/vcpkg.json b/ports/kf5widgetsaddons/vcpkg.json index 4b98e7c004..d3ea6925d7 100644 --- a/ports/kf5widgetsaddons/vcpkg.json +++ b/ports/kf5widgetsaddons/vcpkg.json @@ -1,12 +1,19 @@ { "name": "kf5widgetsaddons", - "version": "5.84.0", - "port-version": 2, + "version": "5.87.0", "description": "Addons to QtWidgets", "homepage": "https://api.kde.org/frameworks/kwidgetsaddons/html/index.html", "dependencies": [ "ecm", "qt5-base", - "qt5-tools" + "qt5-tools", + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } ] } diff --git a/ports/kf5windowsystem/27.patch b/ports/kf5windowsystem/27.patch deleted file mode 100644 index 6ad3917679..0000000000 --- a/ports/kf5windowsystem/27.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2ee7179c17fd9bd6d8e883ea304cc050cb197834 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Thu, 29 Jul 2021 13:47:28 +0200 -Subject: [PATCH] Support static builds - ---- - KF5WindowSystemConfig.cmake.in | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in -index 6c1b4c0..bcb7128 100644 ---- a/KF5WindowSystemConfig.cmake.in -+++ b/KF5WindowSystemConfig.cmake.in -@@ -4,7 +4,13 @@ include(CMakeFindDependencyMacro) - find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) - - if(NOT @KWINDOWSYSTEM_NO_WIDGETS@) --find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) -+ find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) -+endif() -+ -+if(NOT @BUILD_SHARED_LIBS@) -+ if(@WIN32@) -+ find_dependency(Qt5WinExtras @REQUIRED_QT_VERSION@) -+ endif() - endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") --- -GitLab - diff --git a/ports/kf5windowsystem/28.patch b/ports/kf5windowsystem/28.patch deleted file mode 100644 index 9cf88c96cf..0000000000 --- a/ports/kf5windowsystem/28.patch +++ /dev/null @@ -1,27 +0,0 @@ -From b4bf29e297dd75eb2f4af6ed143839e223833b4b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Dawid=20Wro=CC=81bel?= -Date: Mon, 9 Aug 2021 22:45:50 +0000 -Subject: [PATCH] Support static builds on Linux as well - ---- - KF5WindowSystemConfig.cmake.in | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in -index bcb7128..62580e9 100644 ---- a/KF5WindowSystemConfig.cmake.in -+++ b/KF5WindowSystemConfig.cmake.in -@@ -11,6 +11,10 @@ if(NOT @BUILD_SHARED_LIBS@) - if(@WIN32@) - find_dependency(Qt5WinExtras @REQUIRED_QT_VERSION@) - endif() -+ -+ if(@X11_FOUND@) -+ find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) -+ endif() - endif() - - include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") --- -GitLab - diff --git a/ports/kf5windowsystem/portfile.cmake b/ports/kf5windowsystem/portfile.cmake index 45173fe113..1673f5d56e 100644 --- a/ports/kf5windowsystem/portfile.cmake +++ b/ports/kf5windowsystem/portfile.cmake @@ -1,11 +1,10 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kwindowsystem - REF v5.84.0 - SHA512 53491f8576db8ebb48627e098fd8c3d4029c024bb9048d97daa1a8f5c39e594ca05dcd80ecb18ac591af7455457a0f14459c24cf44487727a26e34f977c5b81a + REF v5.87.0 + SHA512 c6b09d2c67902370da3d6cba61aa0b6c13d496332e5ba9694fe43a6571229f60389164024643b9e56c0c1e5cced0d29942b4b7a0ba919dd86b47dbf4602cb74d PATCHES - 27.patch # https://invent.kde.org/frameworks/kwindowsystem/-/merge_requests/27 - 28.patch # https://invent.kde.org/frameworks/kwindowsystem/-/merge_requests/28 + xcb_private_dependency.diff ) if (VCPKG_TARGET_IS_LINUX) @@ -16,14 +15,14 @@ endif() file(WRITE ${SOURCE_PATH}/.clang-format "DisableFormat: true\nSortIncludes: false\n") vcpkg_cmake_configure( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/KF5WindowSystem) +vcpkg_cmake_config_fixup(PACKAGE_NAME KF5WindowSystem CONFIG_PATH lib/cmake/KF5WindowSystem) vcpkg_copy_pdbs() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") @@ -34,3 +33,4 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright") + diff --git a/ports/kf5windowsystem/vcpkg.json b/ports/kf5windowsystem/vcpkg.json index ab42649ada..1f2b602ce8 100644 --- a/ports/kf5windowsystem/vcpkg.json +++ b/ports/kf5windowsystem/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5windowsystem", - "version-semver": "5.84.0", - "port-version": 3, + "version": "5.87.0", "description": "Access to the windowing system", "homepage": "https://api.kde.org/frameworks/kwindowsystem/html/", "dependencies": [ diff --git a/ports/kf5windowsystem/xcb_private_dependency.diff b/ports/kf5windowsystem/xcb_private_dependency.diff new file mode 100644 index 0000000000..592cbb4d50 --- /dev/null +++ b/ports/kf5windowsystem/xcb_private_dependency.diff @@ -0,0 +1,12 @@ +diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in +index b79eb0f4aabe0545493a5ab30be3d1f6299c88d3..5115daced38bdeaf62e70458c7fc58652f41327b 100644 +--- a/KF5WindowSystemConfig.cmake.in ++++ b/KF5WindowSystemConfig.cmake.in +@@ -18,6 +18,7 @@ if(NOT @BUILD_SHARED_LIBS@) + + if(@X11_FOUND@) + find_dependency(Qt5X11Extras @REQUIRED_QT_VERSION@) ++ find_dependency(XCB) + endif() + endif() + diff --git a/ports/kf5xmlgui/add_support_for_static_builds.patch b/ports/kf5xmlgui/add_support_for_static_builds.patch deleted file mode 100644 index fd1aeac66e..0000000000 --- a/ports/kf5xmlgui/add_support_for_static_builds.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/KF5XmlGuiConfig.cmake.in b/KF5XmlGuiConfig.cmake.in -index 6238ab5f..8c249eb1 100644 ---- a/KF5XmlGuiConfig.cmake.in -+++ b/KF5XmlGuiConfig.cmake.in -@@ -12,5 +12,21 @@ find_dependency(Qt5Xml @REQUIRED_QT_VERSION@) - find_dependency(KF5Config "@KF_DEP_VERSION@") - find_dependency(KF5ConfigWidgets "@KF_DEP_VERSION@") - -+if (NOT @BUILD_SHARED_LIBS@) -+ find_dependency(Qt5Network "@REQUIRED_QT_VERSION@") -+ find_dependency(Qt5PrintSupport "@REQUIRED_QT_VERSION@") -+ -+ if (@KF5GlobalAccel_FOUND@) -+ find_dependency(KF5GlobalAccel "@KF_DEP_VERSION@") -+ endif() -+ -+ find_dependency(KF5CoreAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5GuiAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5WidgetsAddons "@KF_DEP_VERSION@") -+ find_dependency(KF5ItemViews "@KF_DEP_VERSION@") -+ find_dependency(KF5I18n "@KF_DEP_VERSION@") -+ find_dependency(KF5IconThemes "@KF_DEP_VERSION@") -+endif() -+ - include("${CMAKE_CURRENT_LIST_DIR}/KF5XmlGuiTargets.cmake") - @PACKAGE_INCLUDE_QCHTARGETS@ --- -GitLab - diff --git a/ports/kf5xmlgui/fix_static_resources.diff b/ports/kf5xmlgui/fix_static_resources.diff deleted file mode 100644 index ae8bcfaad5..0000000000 --- a/ports/kf5xmlgui/fix_static_resources.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/kxmlguiclient.cpp b/src/kxmlguiclient.cpp -index a830ad0fa6b962654a0d1ebb161761a3afafb479..b2c9d0d21dce5f5d9ae4941ae4a909dfa9531155 100644 ---- a/src/kxmlguiclient.cpp -+++ b/src/kxmlguiclient.cpp -@@ -70,6 +70,8 @@ KXMLGUIClient::KXMLGUIClient() - KXMLGUIClient::KXMLGUIClient(KXMLGUIClient *parent) - : d(new KXMLGUIClientPrivate) - { -+ Q_INIT_RESOURCE(kxmlgui); -+ - parent->insertChildClient(this); - } - -diff --git a/src/kxmlguifactory.cpp b/src/kxmlguifactory.cpp -index fc453cb2598dd36f8212cbccb3d4e777ffca4480..5c8dbda2b5700144e9aaf96f877615f874292640 100644 ---- a/src/kxmlguifactory.cpp -+++ b/src/kxmlguifactory.cpp -@@ -172,6 +172,8 @@ KXMLGUIFactory::KXMLGUIFactory(KXMLGUIBuilder *builder, QObject *parent) - : QObject(parent) - , d(new KXMLGUIFactoryPrivate) - { -+ Q_INIT_RESOURCE(kxmlgui); -+ - d->builder = builder; - d->guiClient = nullptr; - if (d->builder) { diff --git a/ports/kf5xmlgui/portfile.cmake b/ports/kf5xmlgui/portfile.cmake index 707d93ea80..0f2aa04d4e 100644 --- a/ports/kf5xmlgui/portfile.cmake +++ b/ports/kf5xmlgui/portfile.cmake @@ -1,13 +1,9 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO KDE/kxmlgui - REF v5.84.0 - SHA512 39657ec545c1463cadec719e7c6dc546fb6d1804b5c2b86904bfffd01be173c3ead1533ec33f749343f5575785394fe659ca0be51af706911e5176d485ef7f20 + REF v5.87.0 + SHA512 1d471ec563533e1043afb985a7f7bb30ab489154d7270a164d5f24127a0e94aeca0c31a418965d97841f9afbda174eb5fd456e41a04225cd50ec213a3139002f HEAD_REF master - PATCHES - remove_explicit_shared_argument.patch # https://invent.kde.org/frameworks/kxmlgui/-/commit/d12e8f6266188ce7e221dc014a56071b8a5ef706 - add_support_for_static_builds.patch # https://invent.kde.org/frameworks/kxmlgui/-/commit/2f1b948ad690942d4ec208c5676c11218f29181a - fix_static_resources.diff # https://invent.kde.org/frameworks/kxmlgui/-/merge_requests/77 ) vcpkg_check_features( @@ -45,4 +41,4 @@ endif() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -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/kf5xmlgui/remove_explicit_shared_argument.patch b/ports/kf5xmlgui/remove_explicit_shared_argument.patch deleted file mode 100644 index 9d70ea3dbd..0000000000 --- a/ports/kf5xmlgui/remove_explicit_shared_argument.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2fac31b7..2f4fc881 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,6 +1,6 @@ - add_subdirectory(ksendbugmail) - --add_library(KF5XmlGui SHARED) -+add_library(KF5XmlGui) - add_library(KF5::XmlGui ALIAS KF5XmlGui) - - if (HAVE_GLOBALACCEL) --- -GitLab - diff --git a/ports/kf5xmlgui/vcpkg.json b/ports/kf5xmlgui/vcpkg.json index 85ccdcae09..4a0e656e4e 100644 --- a/ports/kf5xmlgui/vcpkg.json +++ b/ports/kf5xmlgui/vcpkg.json @@ -1,7 +1,6 @@ { "name": "kf5xmlgui", - "version": "5.84.0", - "port-version": 1, + "version": "5.87.0", "description": "Framework for managing menu and toolbar actions", "homepage": "https://api.kde.org/frameworks/kxmlgui/html/index.html", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 00a2cf9c70..7df57fa745 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1965,8 +1965,8 @@ "port-version": 0 }, "ecm": { - "baseline": "5.84.0", - "port-version": 3 + "baseline": "5.87.0", + "port-version": 0 }, "ecos": { "baseline": "2.0.8", @@ -3033,148 +3033,148 @@ "port-version": 1 }, "kf5archive": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5attica": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5auth": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5bookmarks": { - "baseline": "5.84.0", + "baseline": "5.87.0", "port-version": 0 }, "kf5codecs": { - "baseline": "5.84.0", - "port-version": 3 + "baseline": "5.87.0", + "port-version": 0 }, "kf5completion": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5config": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5configwidgets": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5coreaddons": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5crash": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5dbusaddons": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5declarative": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5diagram": { "baseline": "2.8.0", "port-version": 0 }, "kf5globalaccel": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5guiaddons": { - "baseline": "5.84.0", - "port-version": 3 + "baseline": "5.87.0", + "port-version": 0 }, "kf5holidays": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5i18n": { - "baseline": "5.84.0", - "port-version": 3 + "baseline": "5.87.0", + "port-version": 0 }, "kf5iconthemes": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5itemmodels": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5itemviews": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5jobwidgets": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5kcmutils": { - "baseline": "5.84.0", + "baseline": "5.87.0", "port-version": 0 }, "kf5kio": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5newstuff": { - "baseline": "5.84.0", + "baseline": "5.87.0", "port-version": 0 }, "kf5notifications": { - "baseline": "5.84.0", + "baseline": "5.87.0", "port-version": 0 }, "kf5package": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5plotting": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5service": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5solid": { - "baseline": "5.84.0", - "port-version": 4 + "baseline": "5.87.0", + "port-version": 0 }, "kf5sonnet": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5syntaxhighlighting": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5textwidgets": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5wallet": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kf5widgetsaddons": { - "baseline": "5.84.0", - "port-version": 2 + "baseline": "5.87.0", + "port-version": 0 }, "kf5windowsystem": { - "baseline": "5.84.0", - "port-version": 3 + "baseline": "5.87.0", + "port-version": 0 }, "kf5xmlgui": { - "baseline": "5.84.0", - "port-version": 1 + "baseline": "5.87.0", + "port-version": 0 }, "kfr": { "baseline": "4.2.1", diff --git a/versions/e-/ecm.json b/versions/e-/ecm.json index 8ecaa41f3d..405ac37d50 100644 --- a/versions/e-/ecm.json +++ b/versions/e-/ecm.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "326da23f3132279545c12d753b9f7f22712fe95f", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "edf27dcd688fc8cfd8a1c6dedddc3cfb0cb1556e", "version": "5.84.0", diff --git a/versions/k-/kf5archive.json b/versions/k-/kf5archive.json index 3dd22de1ae..34ff2aa5d4 100644 --- a/versions/k-/kf5archive.json +++ b/versions/k-/kf5archive.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c0df48850c0ede4ccb1d73dbe45f433b625120c8", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "1476ac82c0b38d83211053e22afbac2091dab2e3", "version-semver": "5.84.0", diff --git a/versions/k-/kf5attica.json b/versions/k-/kf5attica.json index 51344eb3f2..9bb2f8a3ad 100644 --- a/versions/k-/kf5attica.json +++ b/versions/k-/kf5attica.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "dd65de5bb02fc6ad70fd3d2a9988d8b8aa2c69f3", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "f0d1c8f2256f2e831a4ba82551de6a55ee4565a6", "version-semver": "5.84.0", diff --git a/versions/k-/kf5auth.json b/versions/k-/kf5auth.json index c3154d0264..74a602ac7b 100644 --- a/versions/k-/kf5auth.json +++ b/versions/k-/kf5auth.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7e4ebe7498963bfde116470731abb72cf9032df", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "54c38c08e5c5af0745650a385a5cea5926748545", "version": "5.84.0", diff --git a/versions/k-/kf5bookmarks.json b/versions/k-/kf5bookmarks.json index b98605df0d..8abe9e88c5 100644 --- a/versions/k-/kf5bookmarks.json +++ b/versions/k-/kf5bookmarks.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d7a2e1993eaad2402f76f743f224231d8fff7e57", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "64191caa589d36090d34e4f699e7c90d836a6726", "version": "5.84.0", diff --git a/versions/k-/kf5codecs.json b/versions/k-/kf5codecs.json index 7731245b67..88c7c3d72c 100644 --- a/versions/k-/kf5codecs.json +++ b/versions/k-/kf5codecs.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6b03af23a2842634523f2a2958d54b2a9aed8c7b", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "54b65a5af21a97ee1a73591b5e83d26cc6898d12", "version": "5.84.0", diff --git a/versions/k-/kf5completion.json b/versions/k-/kf5completion.json index aea864f52f..2359c28589 100644 --- a/versions/k-/kf5completion.json +++ b/versions/k-/kf5completion.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6c8a057cc04ac61bafd18e9d3ef44d08eb10e656", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "a184552295179e5f414d3166d8f6f40ce9c66347", "version": "5.84.0", diff --git a/versions/k-/kf5config.json b/versions/k-/kf5config.json index 13e4c607d6..b7fb14396f 100644 --- a/versions/k-/kf5config.json +++ b/versions/k-/kf5config.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c856c763f07600a010fc88a2ba55ea041ad885e9", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "f36f1f5a124bd2f3123e0dfd9f4d350f1f69e757", "version": "5.84.0", diff --git a/versions/k-/kf5configwidgets.json b/versions/k-/kf5configwidgets.json index db4391585d..e88145c518 100644 --- a/versions/k-/kf5configwidgets.json +++ b/versions/k-/kf5configwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3d64286e19596a3518c2afee2cc882e770dc3ffe", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "9eca836d8da743409afa20dfc372145a7a7e68d6", "version-semver": "5.84.0", diff --git a/versions/k-/kf5coreaddons.json b/versions/k-/kf5coreaddons.json index 5783b0d993..95429d5c35 100644 --- a/versions/k-/kf5coreaddons.json +++ b/versions/k-/kf5coreaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6a08b92d70eb4ad61dc64f207618f1725f133d4b", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "ca84b488ea7914b621bf49006f03f4ce8221052c", "version-semver": "5.84.0", diff --git a/versions/k-/kf5crash.json b/versions/k-/kf5crash.json index cf1ac87e2a..3c6e6dfcf1 100644 --- a/versions/k-/kf5crash.json +++ b/versions/k-/kf5crash.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "cc52d0bb515ffa68e8bcc9a209bc91da339639ac", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "e30fa89728c784663526f9ff9332021507b9ee8e", "version-semver": "5.84.0", diff --git a/versions/k-/kf5dbusaddons.json b/versions/k-/kf5dbusaddons.json index f5cfeade98..9eda8feafe 100644 --- a/versions/k-/kf5dbusaddons.json +++ b/versions/k-/kf5dbusaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "0f61c24cff36aac302c3a9e98b5e10e66d87b405", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "497be7e1959fac395884422632328485883fd433", "version": "5.84.0", diff --git a/versions/k-/kf5declarative.json b/versions/k-/kf5declarative.json index 9e53d64743..0e3a1cc7e5 100644 --- a/versions/k-/kf5declarative.json +++ b/versions/k-/kf5declarative.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "bd3486c169cd99bdc70fb5ee7e65ba3f76591e1f", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "6532f8c66e8d9626315958f2f072c43bf6a117ac", "version": "5.84.0", diff --git a/versions/k-/kf5globalaccel.json b/versions/k-/kf5globalaccel.json index da94a064dd..328f2b3433 100644 --- a/versions/k-/kf5globalaccel.json +++ b/versions/k-/kf5globalaccel.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6d75bafebb665646fc7b714e3f0bba8e968c90a", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "541f3c0b90027dcb3837dec812f896dbc4786f46", "version-semver": "5.84.0", diff --git a/versions/k-/kf5guiaddons.json b/versions/k-/kf5guiaddons.json index c9d4b6fad6..5f4896502d 100644 --- a/versions/k-/kf5guiaddons.json +++ b/versions/k-/kf5guiaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "e5051bdd704585046c184dcc90fd096ef082b82a", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "1dfe4575612c8d7d2bff1d4b1ecf2d5601915060", "version-semver": "5.84.0", diff --git a/versions/k-/kf5holidays.json b/versions/k-/kf5holidays.json index d79071a556..f1f9ac5d97 100644 --- a/versions/k-/kf5holidays.json +++ b/versions/k-/kf5holidays.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "50c5f3ea401e44a4318747aefa0c299350be6508", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "d8b6fefbcb219e7f1de19ffc4b30bc8fd199abc0", "version": "5.84.0", diff --git a/versions/k-/kf5i18n.json b/versions/k-/kf5i18n.json index 637789dffa..3f421f4685 100644 --- a/versions/k-/kf5i18n.json +++ b/versions/k-/kf5i18n.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7d6f42ae158c14ab6b17cd305ac42d6ea3e03af8", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "c866e11343fd709f33dba23075f00f64b62813b5", "version": "5.84.0", diff --git a/versions/k-/kf5iconthemes.json b/versions/k-/kf5iconthemes.json index 6108d3d85e..9661bcb5ec 100644 --- a/versions/k-/kf5iconthemes.json +++ b/versions/k-/kf5iconthemes.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "de7e7e740b10c51da3916a4cbefde630941df428", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "dff2467b2980412adb042e6a9e2474eb5efba9f4", "version": "5.84.0", diff --git a/versions/k-/kf5itemmodels.json b/versions/k-/kf5itemmodels.json index 129da01464..b7c770bca0 100644 --- a/versions/k-/kf5itemmodels.json +++ b/versions/k-/kf5itemmodels.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "68d9be4e09a64f981bb76751ec94319548ad0dc4", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "ccd18253fc31dab2afa493a6150711036138da63", "version": "5.84.0", diff --git a/versions/k-/kf5itemviews.json b/versions/k-/kf5itemviews.json index 00e2cb2031..1fee8d4245 100644 --- a/versions/k-/kf5itemviews.json +++ b/versions/k-/kf5itemviews.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "39e2e18585caf414701168720ab9dc72d58d6b73", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "a89dde646ac62a41ece78c8757964cdd4ceaed60", "version": "5.84.0", diff --git a/versions/k-/kf5jobwidgets.json b/versions/k-/kf5jobwidgets.json index 55544975ea..f8a25bfc44 100644 --- a/versions/k-/kf5jobwidgets.json +++ b/versions/k-/kf5jobwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "46a78abf10e4dce004e27810c02da64f3a261489", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "6772f49b473e205b1f3dadfe97705b178f8e0ef2", "version-semver": "5.84.0", diff --git a/versions/k-/kf5kcmutils.json b/versions/k-/kf5kcmutils.json index 98edb5c2b2..97ee675a0e 100644 --- a/versions/k-/kf5kcmutils.json +++ b/versions/k-/kf5kcmutils.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d29b1c0e6b679becc34e23677a223555053962de", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "7faf8114473ed03a92c1d5537e4c07cbf31b0ef2", "version": "5.84.0", diff --git a/versions/k-/kf5kio.json b/versions/k-/kf5kio.json index 438a09f3fa..f2afc6f60f 100644 --- a/versions/k-/kf5kio.json +++ b/versions/k-/kf5kio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "6dc045a5011291de6e3aad07e60bca2a9699837c", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "624eb17608cec7afe4c30bef29e16e18fe8d973e", "version": "5.84.0", diff --git a/versions/k-/kf5newstuff.json b/versions/k-/kf5newstuff.json index 52226138df..6f7c1c91d4 100644 --- a/versions/k-/kf5newstuff.json +++ b/versions/k-/kf5newstuff.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b817dc1cfc5ca745cb053b7d17ce8569f818b215", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "39c986b0766ffb962beb7022b74e1e1037bdc203", "version": "5.84.0", diff --git a/versions/k-/kf5notifications.json b/versions/k-/kf5notifications.json index b837ed00d0..43e0799525 100644 --- a/versions/k-/kf5notifications.json +++ b/versions/k-/kf5notifications.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "74334d5a13ce5263f6b60510a6193d0453136c93", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "a565cfd79777b605b4e3fc57be5bd2957c498c7f", "version": "5.84.0", diff --git a/versions/k-/kf5package.json b/versions/k-/kf5package.json index 5ad9f60201..2503b85bf3 100644 --- a/versions/k-/kf5package.json +++ b/versions/k-/kf5package.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "06ff2bf277b3038d9b5cd77cefbba6dbb537424d", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "41b59faf036cdcc4d430a8bee7b4f87c4fa4e42f", "version": "5.84.0", diff --git a/versions/k-/kf5plotting.json b/versions/k-/kf5plotting.json index 65073a0b34..0013b2416c 100644 --- a/versions/k-/kf5plotting.json +++ b/versions/k-/kf5plotting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f16da3cc6b411acfff5935c7127ac2fe89cb4b0c", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "866d1f84848c54a924a542fc101895588ff895b0", "version": "5.84.0", diff --git a/versions/k-/kf5service.json b/versions/k-/kf5service.json index eed2af7648..41fffba076 100644 --- a/versions/k-/kf5service.json +++ b/versions/k-/kf5service.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "674b9360b44ffc393f9e757443a68ce96c2ed006", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "8f6fb4f263f0fff296515f569565550c9805e65d", "version": "5.84.0", diff --git a/versions/k-/kf5solid.json b/versions/k-/kf5solid.json index 3e00fd3eb4..d085a12589 100644 --- a/versions/k-/kf5solid.json +++ b/versions/k-/kf5solid.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "db2ba98a0de225239023a9673c7faa4346fbdfd7", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "8b7f9e0e31cd5fd3a2720a8e71b1aa52b123cf98", "version": "5.84.0", diff --git a/versions/k-/kf5sonnet.json b/versions/k-/kf5sonnet.json index 147aa3e8d6..7676ba44e5 100644 --- a/versions/k-/kf5sonnet.json +++ b/versions/k-/kf5sonnet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "54ce5e9ca8c725a2d8a40779ec92a5c35dc2ecf6", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "dab7f45858de89e5cb13bd31875d2ba99bf94365", "version-semver": "5.84.0", diff --git a/versions/k-/kf5syntaxhighlighting.json b/versions/k-/kf5syntaxhighlighting.json index e72b1b31f3..27046ecdd4 100644 --- a/versions/k-/kf5syntaxhighlighting.json +++ b/versions/k-/kf5syntaxhighlighting.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2f3ed58701fe534cf44b9d777a64f7d146b882d6", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "f86af1e17c47fb99ff1f4a662d2cf5c022408025", "version": "5.84.0", diff --git a/versions/k-/kf5textwidgets.json b/versions/k-/kf5textwidgets.json index d5d356c9ad..68c316b901 100644 --- a/versions/k-/kf5textwidgets.json +++ b/versions/k-/kf5textwidgets.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "c37441cf5c99af758ae0d4b6a604bdc59ac5db5c", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "b6c8dad63ee1e48b572b94623152569b1443c20c", "version": "5.84.0", diff --git a/versions/k-/kf5wallet.json b/versions/k-/kf5wallet.json index 6209cf6cfe..f2cc162ef7 100644 --- a/versions/k-/kf5wallet.json +++ b/versions/k-/kf5wallet.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "30362e63081e49a908e3f9bd866e45813f8e86be", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "8e8401b12a23caa46bffec87b7f583771a55170d", "version-semver": "5.84.0", diff --git a/versions/k-/kf5widgetsaddons.json b/versions/k-/kf5widgetsaddons.json index 589de92c8e..4a5b74e256 100644 --- a/versions/k-/kf5widgetsaddons.json +++ b/versions/k-/kf5widgetsaddons.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f1fc662a11109567098e9cd2f50331c9b9809786", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "b8ce78de33b2176f98f97f865494b520cdc37032", "version": "5.84.0", diff --git a/versions/k-/kf5windowsystem.json b/versions/k-/kf5windowsystem.json index 56fe8c32c2..02afbff3ee 100644 --- a/versions/k-/kf5windowsystem.json +++ b/versions/k-/kf5windowsystem.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6387279ae7d002232405241fd46c46f8cf74fb0", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "ce30fb964e57b95c0a6afe4cacff6a28447c7649", "version-semver": "5.84.0", diff --git a/versions/k-/kf5xmlgui.json b/versions/k-/kf5xmlgui.json index 2d454fa839..abbc9a7b90 100644 --- a/versions/k-/kf5xmlgui.json +++ b/versions/k-/kf5xmlgui.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "4d9dc85c5875657bed4598a47ade638dff13a5e0", + "version": "5.87.0", + "port-version": 0 + }, { "git-tree": "4fa462d8e9f3592a9ded89bb25ea21de65932112", "version": "5.84.0",