microsoft · BillyONeal · Nov 26, 2021 · Oct 24, 2021 · Oct 22, 2021 · Oct 22, 2021
diff --git 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
diff --git 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
@@ -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
diff --git a/ports/kf5archive/add_zstd_to_cmake_config.patch b/ports/kf5archive/add_zstd_to_cmake_config.patch
diff --git a/ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch b/ports/kf5archive/only_pkg_check_modules_if_pkgconfig_found.patch
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -1,21 +1,19 @@
 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
 )
 
 # 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
         -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
@@ -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
diff --git 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")
+file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")