Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[ecm] Update to 6.22.0 (#49705)

This commit is contained in:
SunBlack 2026-01-31 00:17:58 +01:00 committed by GitHub
parent b87383e8bc
commit 6cbaa38027
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 56 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/ecm/fix-wrong-version.patch
View File

@ -1,11 +1,11 @@
diff --git a/modules/ECMSetupVersion.cmake b/modules/ECMSetupVersion.cmake
index 7164c9a0bd..408ef33638 100644
index a40c4484..785c58dd 100644
--- a/modules/ECMSetupVersion.cmake
+++ b/modules/ECMSetupVersion.cmake
@@ -112,7 +112,6 @@ function(ecm_setup_version _version)
@@ -118,7 +118,6 @@ function(ecm_setup_version _version)
set(project_manages_version FALSE)
set(use_project_version FALSE)
cmake_policy(GET CMP0048 project_version_policy)
if(project_version_policy STREQUAL "NEW")
if(CMAKE_MAJOR_VERSION VERSION_GREATER_EQUAL 4)
- set(project_manages_version TRUE)
if(_version STREQUAL "PROJECT")
set(use_project_version TRUE)

2
ports/ecm/portfile.cmake
View File

@ -6,7 +6,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO KDE/extra-cmake-modules
REF "v${VERSION}"
SHA512 d62091185c26c4eec83f7b2e06468c3c3691ae0e71f4d60aafaf32be262677affc686a4e54159f487005854bdf46c4c3a2214775daf850039b733ad02edc3936
SHA512 317300082441ee01d447fd89dc43e858b270d7d645a1286ed9d85dd669eb11c9e66fe44513ce7f0ee4c9ca5bd803d5f168a8847cbe6ad241b3008068679868b0
HEAD_REF master
PATCHES
fix_generateqmltypes.patch # https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/201

3
ports/ecm/vcpkg.json
View File

@ -1,7 +1,6 @@
{
"name": "ecm",
"version": "6.7.0",
"port-version": 2,
"version": "6.22.0",
"description": "Extra CMake Modules (ECM), extra modules and scripts for CMake",
"homepage": "https://invent.kde.org/frameworks/extra-cmake-modules",
"documentation": "https://api.kde.org/ecm/",

13
ports/kf5kio/libmount.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/core/kmountpoint.cpp b/src/core/kmountpoint.cpp
index dac7a68aa..7d760158a 100644
--- a/src/core/kmountpoint.cpp
+++ b/src/core/kmountpoint.cpp
@@ -47,7 +47,7 @@ static const Qt::CaseSensitivity cs = Qt::CaseSensitive;
// Linux
#if HAVE_LIB_MOUNT
-#include <libmount/libmount.h>
+#include <libmount.h>
#endif
static bool isNetfs(const QString &mountType)

2
ports/kf5kio/portfile.cmake
View File

@ -4,6 +4,8 @@ vcpkg_from_github(
REF "v${VERSION}"
SHA512 085eaf467cb70630b1a2fe5024bd45aebe47f15c397388ebd562d0c0fbfd6700c8cc50d2ec136988d9575173aa01a5a73a1550c1b7cbb93d6909941909a31db7
HEAD_REF master
PATCHES
libmount.patch
)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS

2
ports/kf5kio/vcpkg.json
View File

@ -1,7 +1,7 @@
{
"name": "kf5kio",
"version": "5.116.0",
"port-version": 1,
"port-version": 2,
"description": "Network transparent access to files and data",
"homepage": "https://invent.kde.org/frameworks/kio",
"documentation": "https://api.kde.org/kio-index.html ",

13
ports/kf5solid/003_libmount.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
index 1c513ab8..beb41140 100644
--- a/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
+++ b/src/solid/devices/backends/udisks2/udisksstorageaccess.cpp
@@ -18,7 +18,7 @@
#include <config-solid.h>
#if HAVE_LIBMOUNT
-#include <libmount/libmount.h>
+#include <libmount.h>
#endif
using namespace Solid::Backends::UDisks2;

1
ports/kf5solid/portfile.cmake
View File

@ -7,6 +7,7 @@ vcpkg_from_github(
PATCHES
001_fix_libmount.patch
002_fix_imobile.patch
003_libmount.patch
)
# Prevent KDEClangFormat from writing to source effectively blocking parallel configure
file(WRITE "${SOURCE_PATH}/.clang-format" "DisableFormat: true\nSortIncludes: false\n")

1
ports/kf5solid/vcpkg.json
View File

@ -1,6 +1,7 @@
{
"name": "kf5solid",
"version": "5.116.0",
"port-version": 1,
"description": "Desktop hardware abstraction",
"homepage": "https://api.kde.org/solid-index.html",
"dependencies": [

8
versions/baseline.json
View File

@ -2693,8 +2693,8 @@
"port-version": 0
},
"ecm": {
"baseline": "6.7.0",
"port-version": 2
"baseline": "6.22.0",
"port-version": 0
},
"ecos": {
"baseline": "2.0.10",
@ -4366,7 +4366,7 @@
},
"kf5kio": {
"baseline": "5.116.0",
"port-version": 1
"port-version": 2
},
"kf5newstuff": {
"baseline": "5.116.0",
@ -4394,7 +4394,7 @@
},
"kf5solid": {
"baseline": "5.116.0",
"port-version": 0
"port-version": 1
},
"kf5sonnet": {
"baseline": "5.116.0",

5
versions/e-/ecm.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "351eab3f7d5db50bb7f25dbdf92f22654fddf63c",
"version": "6.22.0",
"port-version": 0
},
{
"git-tree": "9ea471b038a6572abea9cd7f343468ee026409f2",
"version": "6.7.0",

5
versions/k-/kf5kio.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "2ed07fb07b270ebc348fc80b8d33eb889a545bef",
"version": "5.116.0",
"port-version": 2
},
{
"git-tree": "a2d1045be719bfbe445c7bcaae85222bd4ceeb21",
"version": "5.116.0",

5
versions/k-/kf5solid.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "d212c96ef366eb4cc196cc43f9a63b18f7ee979f",
"version": "5.116.0",
"port-version": 1
},
{
"git-tree": "1bdd951c06ebafac039965c108befdad8af1ce57",
"version": "5.116.0",