[kf5*] Update to 5.88 (#21633)

* [kf5*] Update to 5.88 * [kf5*] Update versions * [kf5*] fix QML plugins location diff --git a/ports/kf5i18n/portfile.cmake b/ports/kf5i18n/portfile.cmake index 610182e49..5a0fd5e21 100644 --- a/ports/kf5i18n/portfile.cmake +++ b/ports/kf5i18n/portfile.cmake @@ -20,6 +20,7 @@ vcpkg_cmake_configure( OPTIONS -DBUILD_TESTING=OFF -DKDE_INSTALL_PLUGINDIR=plugins + -DKDE_INSTALL_QMLDIR=qml -DPYTHON_EXECUTABLE=${PYTHON3} ) diff --git a/ports/kf5notifications/portfile.cmake b/ports/kf5notifications/portfile.cmake index e41fee015..bc93cf6af 100644 --- a/ports/kf5notifications/portfile.cmake +++ b/ports/kf5notifications/portfile.cmake @@ -13,6 +13,7 @@ vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_TESTING=OFF + -DKDE_INSTALL_QMLDIR=qml ) vcpkg_cmake_install() diff --git a/ports/kf5sonnet/portfile.cmake b/ports/kf5sonnet/portfile.cmake index 7e2820ce4..a2d1adfcc 100644 --- a/ports/kf5sonnet/portfile.cmake +++ b/ports/kf5sonnet/portfile.cmake @@ -16,6 +16,7 @@ vcpkg_cmake_configure( -DBUILD_EXAMPLES=OFF -DKDE_INSTALL_PLUGINDIR=plugins -DKDE_INSTALL_QTPLUGINDIR=plugins + -DKDE_INSTALL_QMLDIR=qml ) vcpkg_add_to_path(PREPEND "${CURRENT_INSTALLED_DIR}/bin") * [kf5*] update versions * [ecm] fix ECMGenerateQmlTypes * [ecm] update version
microsoft · Dec 3, 2021 · a868d7e · a868d7e
1 parent a5b6591
commit a868d7e
Show file tree

Hide file tree

Showing 116 changed files with 400 additions and 431 deletions.
diff --git a/ports/ecm/fix_generateqmltypes.patch b/ports/ecm/fix_generateqmltypes.patch
@@ -0,0 +1,31 @@
+diff --git a/modules/ECMGenerateQmlTypes.cmake b/modules/ECMGenerateQmlTypes.cmake
+index d6e124266308028b8533203da63f572f6e99b308..7d7cecb5201521019764102eba0da2abf8b4d911 100644
+--- a/modules/ECMGenerateQmlTypes.cmake
++++ b/modules/ECMGenerateQmlTypes.cmake
+@@ -1,4 +1,5 @@
+ # SPDX-FileCopyrightText: 2017 Aleix Pol Gonzalez <aleixpol@kde.org>
++# SPDX-FileCopyrightText: 2021 Dawid Wrobel <me@dawidwrobel.com>
+ #
+ # SPDX-License-Identifier: BSD-3-Clause
+
+@@ -18,10 +19,7 @@ our project offers. These files offer introspection upon our plugin and are
+ useful for integrating with IDE language support of our plugin. It offers
+ information about the objects its methods and their argument types.
+
+-The developer will be in charge of making sure that these files are up to date.
+-The plugin.qmltypes file will sit in the source directory. This function will
+-include the code that installs the file in the right place and a small unit
+-test named qmltypes-pluginname-version that makes sure that it doesn't need updating.
++This function installs the file in DESTINATION folder.
+
+
+ Since 5.33.0
+@@ -40,7 +38,7 @@ function(ecm_generate_qmltypes)
+     set(targetname "qmltypes-${ARG_UNPARSED_ARGUMENTS}")
+     string(REPLACE ";" - targetname "${targetname}")
+
+-    set(generatedFile ${CMAKE_CURRENT_SOURCE_DIR}/plugins.qmltypes)
++    set(generatedFile plugins.qmltypes)
+     add_custom_target(${targetname}
+         BYPRODUCTS ${generatedFile}
+         COMMAND qmlplugindump -nonrelocatable ${ARG_UNPARSED_ARGUMENTS} ${KDE_INSTALL_QMLDIR} > ${generatedFile}
diff --git a/ports/ecm/portfile.cmake b/ports/ecm/portfile.cmake
@@ -1,12 +1,13 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/extra-cmake-modules
-    REF v5.87.0
-    SHA512 024dd6631d975228d3a2b681266d84bf336bd3152b88d641761a18f5367e740f968240517040ec0d97135b69fd16f4de607e01e76c2c689f65d96ebd520feed5
+    REF v5.88.0
+    SHA512 976c83b155c92bdab639752ad44046722dbc363b0341533a51b2123a36cdfb82b0ddefa4886e1def9b7f236b8569dc9f9c2b26c0ea83debb631e574d531c30df
     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_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_generateqmltypes.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/201
 )
 
 vcpkg_cmake_configure(
@@ -29,4 +30,3 @@ 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,6 +1,6 @@
 {
   "name": "ecm",
-  "version": "5.87.0",
+  "version": "5.88.0",
   "description": "Extra CMake Modules (ECM), extra modules and scripts for CMake",
   "homepage": "https://github.com/KDE/extra-cmake-modules",
   "dependencies": [

diff --git a/ports/kf5archive/portfile.cmake b/ports/kf5archive/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/karchive
-    REF v5.87.0
-    SHA512 5c4f2a8d4863f9f0c90b9a12aee2dd00d43797a2c2c778bb4cb6f61fe5c7cd49b4e54d4bee0d811da52a8b86d673b23db62f0810b170bd4b2f2bd0ae2ebbb14f
+    REF v5.88.0
+    SHA512 233ea884aafc70a186698fece376727cac5ae79daa6396752a375c8b66c6bbf9ea952ee14cd48b54fcf58af2f931d9c96a83f3d01c8e2c29ab618ee961285762
     HEAD_REF master
     PATCHES
         use_cmake_to_find_zstd.patch # https://invent.kde.org/frameworks/karchive/-/merge_requests/24
@@ -37,3 +37,4 @@ 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,6 +1,6 @@
 {
   "name": "kf5archive",
-  "version": "5.87.0",
+  "version": "5.88.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.87.0
-    SHA512 8d6635e9670713c2ef3101d3c0dbeaab7c34d046010cfef898783eac68980c9bf07d5d09cf00fe3e8862e1e4f5f34b48fd10dfdb69b3744dc5cf13b034522b10
+    REF v5.88.0
+    SHA512 09c04ae1572a165c8208c09db9bc3591584b7f327b56f78fcd7f9beb088a13ae69e41c593d4903b539ae52739a1c649359b668cfe8775bb2c61210152cb7be3f
     HEAD_REF master
 )
 
@@ -28,3 +28,4 @@ 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,6 +1,6 @@
 {
   "name": "kf5attica",
-  "version": "5.87.0",
+  "version": "5.88.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,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kauth
-    REF v5.87.0
-    SHA512 c2e885a6d1db3b5611562768c97e0d2aa50ddef31d99a77e1bcdc13fc760c68b797c0c78ec347ed8b01b573427ac2bd524792fb732e44c60fcef7ec475102f08
+    REF v5.88.0
+    SHA512 f4db5c5ff1f1f72c27fd80ed4f2206fc9f17ac1eaff2486530884be989eaeaae77eff6f536909d961060ee4bed33498ef49ca22b5b22f90cc0bf6c5b8cb5bed0
     HEAD_REF master
 )
 
@@ -29,3 +29,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/kf5auth/vcpkg.json b/ports/kf5auth/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5auth",
-  "version": "5.87.0",
+  "version": "5.88.0",
   "description": "Execute actions as privileged user",
   "homepage": "https://api.kde.org/frameworks/kauth/html/index.html",
   "dependencies": [

diff --git a/ports/kf5bookmarks/portfile.cmake b/ports/kf5bookmarks/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kbookmarks
-    REF v5.87.0
-    SHA512 0ba852d6ce908a61073e048dc1556f20d4e45c2312f2401e57c160f30099fe6f17f5368be2e4b536e7fa41f8a106fbde986dec04d214c3d74ee3029ddc575e44
+    REF v5.88.0
+    SHA512 cb5ed71cf802b0bb9ccc94e65450cc7541fc90e14fe3b07780ffcfc72706fecfa887a41d90d7d56cf9bac7ef4d39cfd803a0d1f6b3bf139f5f09b6c54b88d89b
     HEAD_REF master
 )
 
@@ -27,3 +27,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/kf5bookmarks/vcpkg.json b/ports/kf5bookmarks/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5bookmarks",
-  "version": "5.87.0",
+  "version": "5.88.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
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcodecs
-    REF v5.87.0
-    SHA512 119ada2dfae2a74864c1d2cd7873e5a9c8491a2b7e4592e31bf56157fb5957fb4d4ef6e70f50a976f002c1d87232798ba9695c9773fd841bba59f8fbffa0e815
+    REF v5.88.0
+    SHA512 b7554fa98f98eed76d3b41e15a51e632c90eafb9547969d0394b09315cbed13c43a3e2c50e766d874f28a28df54526de921f70189c054dbb91500ae423931fdf
     HEAD_REF master
 )
 
@@ -31,3 +31,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/kf5codecs/vcpkg.json b/ports/kf5codecs/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5codecs",
-  "version": "5.87.0",
+  "version": "5.88.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
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcompletion
-    REF v5.87.0
-    SHA512 39b8fdb11122c35e97592db84005729fa500b3d0f558573b9f632079f3ce9aef1dff7f62c80f927788e302fc11bb7173589ea5474ea4f4177e43e0aae33e35f9
+    REF v5.88.0
+    SHA512 fc9dc7dde3d515523417308b8c73717c1ae628b3cb6276ac7e229a300ff61231d06bf02caba1d5ac77f2a1a85d21705e2a0830963390870baa58417d124aaa1b
     HEAD_REF master
 )
 
@@ -28,3 +28,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/kf5completion/vcpkg.json b/ports/kf5completion/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5completion",
-  "version": "5.87.0",
+  "version": "5.88.0",
   "description": "Text completion helpers and widgets",
   "homepage": "https://api.kde.org/frameworks/kcompletion/html/index.html",
   "dependencies": [

diff --git a/ports/kf5config/portfile.cmake b/ports/kf5config/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kconfig
-    REF v5.87.0
-    SHA512 b9ad658f75c0ea97e69f203b60e1755cbcc3eadf807b72a9fcd063d1d544bc916a3bee8308a69d45c2f00291376f6ef63565b93d90bc426b171c6ad734016c82
+    REF v5.88.0
+    SHA512 c38d40bf132868ba8e152aba043580cff137db2d752b5d218e29a71defd5a3f8f681aa56ced3873def7423c429377106ff4a049abaa4721a83df2b83c7fbc2a6
     HEAD_REF master
 )
 
@@ -47,3 +47,4 @@ 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
@@ -1,6 +1,6 @@
 {
   "name": "kf5config",
-  "version": "5.87.0",
+  "version": "5.88.0",
   "description": "Configuration system",
   "homepage": "https://api.kde.org/frameworks/kconfig/html/index.html",
   "dependencies": [

diff --git a/ports/kf5configwidgets/portfile.cmake b/ports/kf5configwidgets/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kconfigwidgets
-    REF v5.87.0
-    SHA512 0c7205394d270ca867387c4db01af9517fc9a19a2f134dc0ec53aa78bd49ec645c66aab5f2b6d023b68a1e0b0fbddfe17e85db77b90c26df8d40cffe9e6a61ec
+    REF v5.88.0
+    SHA512 7272510a2df3a74bab5c4defca7dc6a4d7bdde4205ae75f9c22938f9458ad5fc5dbdc71fbe7d536b9dd96404fde5da3dbf098d400e03b48cb9906ec1d7a9bd4d
     HEAD_REF master
 )
 
@@ -37,3 +37,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/kf5configwidgets/vcpkg.json b/ports/kf5configwidgets/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5configwidgets",
-  "version": "5.87.0",
+  "version": "5.88.0",
   "description": "Widgets for configuration dialogs",
   "homepage": "https://api.kde.org/frameworks/kconfigwidgets/html/index.html",
   "dependencies": [

diff --git a/ports/kf5coreaddons/portfile.cmake b/ports/kf5coreaddons/portfile.cmake
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcoreaddons
-    REF v5.87.0
-    SHA512 bbba155cf347add1a364bd8a3d727096afa47bb91b9bdcf87abf9b66de9f5822e301f67531e8de186b3e912c7a20816aab11f31e4b64a0a00f5be1e8ba74f17e
+    REF v5.88.0
+    SHA512 2fd95d3f24341af52338ad8a1b88c53270fe41fce03a5c9f5bba45ba1516ff23fa7adda118d8f231c8d6ef6bb01c34e334da779ae84f16238128acbc9c01e7e8
     PATCHES
         fix_cmake_config.patch # https://invent.kde.org/frameworks/kcoreaddons/-/merge_requests/129
 )
@@ -35,3 +35,4 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
 endif()
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+
diff --git a/ports/kf5coreaddons/vcpkg.json b/ports/kf5coreaddons/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5coreaddons",
-  "version": "5.87.0",
+  "version": "5.88.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
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kcrash
-    REF v5.87.0
-    SHA512 c239419dd1a9a48ef87d901a0d54f8f918782b84a10be9c903d6b6c92490b710ab86c8049d4a950aa452ca2e29f90ce8ada4b3b4b90e57d3504925efa14915e6
+    REF v5.88.0
+    SHA512 1b5a3ed1d0728973ce47a17a5d3ff6d66759dbfffbc000c7f4fcc0bbaded801e7eb89298dce406ca32977c9043d6aa3f870e07194906ea40b8a106287663803a
     HEAD_REF master
 )
 
@@ -28,3 +28,4 @@ endif()
 
 file(INSTALL "${SOURCE_PATH}/LICENSES/" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
 
+
diff --git a/ports/kf5crash/vcpkg.json b/ports/kf5crash/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5crash",
-  "version": "5.87.0",
+  "version": "5.88.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
@@ -1,8 +1,8 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO KDE/kdbusaddons
-    REF v5.87.0
-    SHA512 d37a0e28d6a78bbde3fbf0cb4669711edebc27b295beb7a29f60751cbd21448c3ea6f82e487b889e466908f2217d1477552cd4ae3399b761700f0789edfc02d4
+    REF v5.88.0
+    SHA512 2ec44db614de6c705dbf43915d28afd2f945cb71d12c5a1dac6d2f76592970c067a354b9e81dc5a05a676b5e33ef78172687b3ec0e895041d72d4b7cf06925bb
     HEAD_REF master
     PATCHES
         x11_private_dependency.diff
@@ -33,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/kf5dbusaddons/vcpkg.json b/ports/kf5dbusaddons/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "kf5dbusaddons",
-  "version": "5.87.0",
+  "version": "5.88.0",
   "description": "Convenience classes for D-Bus",
   "homepage": "https://api.kde.org/frameworks/kdbusaddons/html/index.html",
   "dependencies": [